Upstream
/
CloverBootloader
mirror of https://github.com/CloverHackyColor/CloverBootloader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected get File/Directories functions in Clover.app

This commit is contained in:
vectorsigma72 2020-06-04 20:35:41 +02:00
parent 18b35c87f4
commit cb5e225509
5 changed files with 71 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CloverApp/Clover/Extensions.swift
View File

@ -192,7 +192,6 @@ extension String {
s = s.replacingOccurrences(of: "'", with: "'")
s = s.replacingOccurrences(of: "<", with: "&lt;")
s = s.replacingOccurrences(of: ">", with: "&gt;")
print(s)
return s
}
}

65
CloverApp/Clover/Installer/Installer.swift
View File

@ -157,7 +157,7 @@ final class InstallerViewController: NSViewController {
self.spinner.stopAnimation(nil)
var path : String = Cloverv2Path.addPath("Bootloaders/x64")
var files = getFiles(at: path).sorted()
var files = gGetFiles(at: path).sorted()
var isDir : ObjCBool = false
for f in files {
@ -170,7 +170,7 @@ final class InstallerViewController: NSViewController {
}
path = Cloverv2Path.addPath("BootSectors")
files = getFiles(at: path).sorted()
files = gGetFiles(at: path).sorted()
for f in files {
let fp = path.addPath(f)
@ -224,46 +224,6 @@ final class InstallerViewController: NSViewController {
}
}
// MARK: file scanner
func getFiles(at path: String) -> [String] {
var isDir : ObjCBool = false
var files : [String] = [String]()
if fm.fileExists(atPath: path, isDirectory: &isDir) {
if isDir.boolValue {
do { files = try fm.contentsOfDirectory(atPath: path) } catch { }
}
for i in 0..<files.count {
if fm.fileExists(atPath: path.addPath(files[i]), isDirectory: &isDir) {
if isDir.boolValue {
files.remove(at: i)
}
}
}
}
return files.sorted()
}
// MARK: directories scanner
func getDirs(at path: String) -> [String] {
var isDir : ObjCBool = false
var dirs : [String] = [String]()
if fm.fileExists(atPath: path, isDirectory: &isDir) {
if isDir.boolValue {
do { dirs = try fm.contentsOfDirectory(atPath: path) } catch { }
}
for i in 0..<dirs.count {
if fm.fileExists(atPath: path.addPath(dirs[i]), isDirectory: &isDir) {
if !isDir.boolValue {
dirs.remove(at: i)
}
}
}
}
return dirs.sorted()
}
// MARK: populate drivers
func populateDrivers() {
self.driversUEFI = [[EFIDriver]]()
@ -272,7 +232,7 @@ final class InstallerViewController: NSViewController {
// MARK: get UEFI default drivers
var path = Cloverv2Path.addPath(kUEFIRelativeDir)
var drivers : [EFIDriver] = [EFIDriver]()
var files : [String] = self.getFiles(at: path)
var files : [String] = gGetFiles(at: path)
var destDir : String = self.targetVol.addPath(kUEFIRelativeDir)
let isFresh : Bool = !fm.fileExists(atPath: self.targetVol.addPath("EFI/CLOVER"))
let isLegacy = self.cloverEFICheck.state == .on
@ -303,8 +263,8 @@ final class InstallerViewController: NSViewController {
var ApfsDriverLoader : Bool = false
path = Cloverv2Path.addPath(kUEFIRelativeOptionDir)
for dir in self.getDirs(at: path) {
files = self.getFiles(at: path.addPath(dir))
for dir in gGetDirs(at: path) {
files = gGetFiles(at: path.addPath(dir))
sectionName = "UEFI/\(dir)"
drivers = [EFIDriver]()
for file in files {
@ -357,7 +317,7 @@ final class InstallerViewController: NSViewController {
// MARK: check users UEFI drivers
sectionName = "UEFI, but not from this installer"
path = self.targetVol.addPath(kUEFIRelativeDir)
files = self.getFiles(at: path)
files = gGetFiles(at: path)
drivers = [EFIDriver]()
for file in files {
if file.fileExtension == "efi" && !driversList.contains(file) {
@ -381,7 +341,7 @@ final class InstallerViewController: NSViewController {
path = Cloverv2Path.addPath(kBIOSRelativeDir)
destDir = self.targetVol.addPath(kBIOSRelativeDir)
drivers = [EFIDriver]()
files = self.getFiles(at: path)
files = gGetFiles(at: path)
sectionName = "BIOS mandatory"
for file in files {
@ -408,9 +368,9 @@ final class InstallerViewController: NSViewController {
path = Cloverv2Path.addPath(kBIOSRelativeOptionDir)
HFSPlus = false
ApfsDriverLoader = false
for dir in self.getDirs(at: path) {
for dir in gGetDirs(at: path) {
sectionName = "BIOS/\(dir)"
files = self.getFiles(at: path.addPath(dir))
files = gGetFiles(at: path.addPath(dir))
drivers = [EFIDriver]()
for file in files {
if file.fileExtension == "efi" {
@ -457,7 +417,7 @@ final class InstallerViewController: NSViewController {
// MARK: check users BIOS drivers
path = self.targetVol.addPath(kBIOSRelativeDir)
files = self.getFiles(at: path)
files = gGetFiles(at: path)
drivers = [EFIDriver]()
sectionName = "BIOS, but not from this installer"
@ -536,7 +496,7 @@ final class InstallerViewController: NSViewController {
}
// MARK: actions
@IBAction func targetSelected(_ sender: FWPopUpButton?) {
@IBAction func targetSelected(_ sender: FWPopUpButton) {
self.targetVol = ""
self.installButton.isEnabled = false
self.driversUEFI = [[EFIDriver]]()
@ -553,7 +513,8 @@ final class InstallerViewController: NSViewController {
self.boot2Pop.isEnabled = false
self.altBootCheck.isEnabled = false
self.altBootCheck.state = .off
if let disk = sender?.selectedItem?.representedObject as? String {
if let disk = sender.selectedItem?.representedObject as? String {
if !isMountPoint(path: disk) {
DispatchQueue.global(priority: .background).async(execute: { () -> Void in
let cmd = "diskutil mount \(disk)"

60
CloverApp/Clover/Installer/InstallerOutline.swift
View File

@ -127,7 +127,7 @@ final class InstallerOutViewController: NSViewController {
self.spinner.stopAnimation(nil)
var path : String = Cloverv2Path.addPath("Bootloaders/x64")
var files = getFiles(at: path).sorted()
var files = gGetFiles(at: path).sorted()
var isDir : ObjCBool = false
for f in files {
@ -140,7 +140,7 @@ final class InstallerOutViewController: NSViewController {
}
path = Cloverv2Path.addPath("BootSectors")
files = getFiles(at: path).sorted()
files = gGetFiles(at: path).sorted()
for f in files {
let fp = path.addPath(f)
@ -171,46 +171,6 @@ final class InstallerOutViewController: NSViewController {
}
}
// MARK: file scanner
func getFiles(at path: String) -> [String] {
var isDir : ObjCBool = false
var files : [String] = [String]()
if fm.fileExists(atPath: path, isDirectory: &isDir) {
if isDir.boolValue {
do { files = try fm.contentsOfDirectory(atPath: path) } catch { }
}
for i in 0..<files.count {
if fm.fileExists(atPath: path.addPath(files[i]), isDirectory: &isDir) {
if isDir.boolValue {
files.remove(at: i)
}
}
}
}
return files.sorted()
}
// MARK: directories scanner
func getDirs(at path: String) -> [String] {
var isDir : ObjCBool = false
var dirs : [String] = [String]()
if fm.fileExists(atPath: path, isDirectory: &isDir) {
if isDir.boolValue {
do { dirs = try fm.contentsOfDirectory(atPath: path) } catch { }
}
for i in 0..<dirs.count {
if fm.fileExists(atPath: path.addPath(dirs[i]), isDirectory: &isDir) {
if !isDir.boolValue {
dirs.remove(at: i)
}
}
}
}
return dirs.sorted()
}
// MARK: populate drivers
func populateDrivers() {
self.driversUEFI = [[EFIDriver]]()
@ -219,7 +179,7 @@ final class InstallerOutViewController: NSViewController {
// MARK: get UEFI default drivers
var path = Cloverv2Path.addPath(kUEFIRelativeDir)
var drivers : [EFIDriver] = [EFIDriver]()
var files : [String] = self.getFiles(at: path)
var files : [String] = gGetFiles(at: path)
var destDir : String = self.targetVol.addPath(kUEFIRelativeDir)
let isFresh : Bool = !fm.fileExists(atPath: self.targetVol.addPath("EFI/CLOVER"))
let isLegacy = self.cloverEFICheck.state == .on
@ -250,8 +210,8 @@ final class InstallerOutViewController: NSViewController {
var ApfsDriverLoader : Bool = false
path = Cloverv2Path.addPath(kUEFIRelativeOptionDir)
for dir in self.getDirs(at: path) {
files = self.getFiles(at: path.addPath(dir))
for dir in gGetDirs(at: path) {
files = gGetFiles(at: path.addPath(dir))
sectionName = "UEFI/\(dir)"
drivers = [EFIDriver]()
for file in files {
@ -304,7 +264,7 @@ final class InstallerOutViewController: NSViewController {
// MARK: check users UEFI drivers
sectionName = "UEFI, but not from this installer"
path = self.targetVol.addPath(kUEFIRelativeDir)
files = self.getFiles(at: path)
files = gGetFiles(at: path)
drivers = [EFIDriver]()
for file in files {
if file.fileExtension == "efi" && !driversList.contains(file) {
@ -328,7 +288,7 @@ final class InstallerOutViewController: NSViewController {
path = Cloverv2Path.addPath(kBIOSRelativeDir)
destDir = self.targetVol.addPath(kBIOSRelativeDir)
drivers = [EFIDriver]()
files = self.getFiles(at: path)
files = gGetFiles(at: path)
sectionName = "BIOS mandatory"
for file in files {
@ -355,9 +315,9 @@ final class InstallerOutViewController: NSViewController {
path = Cloverv2Path.addPath(kBIOSRelativeOptionDir)
HFSPlus = false
ApfsDriverLoader = false
for dir in self.getDirs(at: path) {
for dir in gGetDirs(at: path) {
sectionName = "BIOS/\(dir)"
files = self.getFiles(at: path.addPath(dir))
files = gGetFiles(at: path.addPath(dir))
drivers = [EFIDriver]()
for file in files {
if file.fileExtension == "efi" {
@ -404,7 +364,7 @@ final class InstallerOutViewController: NSViewController {
// MARK: check users BIOS drivers
path = self.targetVol.addPath(kBIOSRelativeDir)
files = self.getFiles(at: path)
files = gGetFiles(at: path)
drivers = [EFIDriver]()
sectionName = "BIOS, but not from this installer"

47
CloverApp/Clover/Shared.swift
View File

@ -115,3 +115,50 @@ func getCoreTypeImage(named: String, isTemplate: Bool) -> NSImage? {
return image
}
// MARK: file scanner
func gGetFiles(at path: String) -> [String] {
var isDir : ObjCBool = false
var files : [String] = [String]()
if fm.fileExists(atPath: path, isDirectory: &isDir) {
if isDir.boolValue {
do {
let temp = try fm.contentsOfDirectory(atPath: path)
for i in 0..<temp.count {
let file = temp[i]
isDir = false
if fm.fileExists(atPath: path.addPath(file), isDirectory: &isDir) {
if !isDir.boolValue {
files.append(file)
}
}
}
} catch { }
}
}
return files.sorted()
}
// MARK: directories scanner
func gGetDirs(at path: String) -> [String] {
var isDir : ObjCBool = false
var dirs : [String] = [String]()
if fm.fileExists(atPath: path, isDirectory: &isDir) {
if isDir.boolValue {
do {
let temp = try fm.contentsOfDirectory(atPath: path)
for i in 0..<temp.count {
let dir = temp[i]
isDir = false
if fm.fileExists(atPath: path.addPath(dir), isDirectory: &isDir) {
if isDir.boolValue {
dirs.append(dir)
}
}
}
} catch { }
}
}
return dirs.sorted()
}

2
CloverApp/Lang.bundle/Contents/Resources/ru.strings
View File

@ -319,7 +319,7 @@ boot0ss (boot0 Signature Scanning) ищет первый раздел типа E
"Keep editing" = "Продолжить";
"Duplicate key in the Dictionary!" = "Дубликат ключа в словаре!";
"'%@' is already present in the Dictionary. Do you want to undo the editing or replace the existing key?" = "'%@' уже присутствует в словаре. Отменить редактирование или заменить существующий ключ?";
"Replace existing key" = "Replace existing key";
"Replace existing key" = "Заменить существующий";
"Invalid value detected!" = "Неверное значение!";
"Your edit is not valid. Do you want to restore last valid value or keep editing?" = "Ваша правка неверна. Восстановить предыдущее значение или продолжить правку?";