passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify filemanager extension

This commit is contained in:
Jason A. Donenfeld 2018-12-13 23:25:18 +01:00
parent b4348a33d2
commit 628ba73aa3
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
WireGuard/Shared/FileManager+Extension.swift
View File

@ -5,43 +5,38 @@ import Foundation
import os.log import os.log
extension FileManager { extension FileManager {
static var networkExtensionLogFileURL: URL? { private static var sharedFolderURL: URL? {
guard let appGroupId = Bundle.main.object(forInfoDictionaryKey: "com.wireguard.ios.app_group_id") as? String else { guard let appGroupId = Bundle.main.object(forInfoDictionaryKey: "com.wireguard.ios.app_group_id") as? String else {
os_log("Cannot obtain app group id from bundle", log: OSLog.default, type: .error) os_log("Cannot obtain app group ID from bundle", log: OSLog.default, type: .error)
return nil return nil
} }
guard let sharedFolderURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupId) else { guard let sharedFolderURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupId) else {
os_log("Cannot obtain shared folder URL", log: OSLog.default, type: .error) wg_log(.error, message: "Cannot obtain shared folder URL")
return nil return nil
} }
return sharedFolderURL.appendingPathComponent("tunnel-log.txt") return sharedFolderURL
}
static var networkExtensionLogFileURL: URL? {
return sharedFolderURL?.appendingPathComponent("tunnel-log.bin")
} }
static var networkExtensionLastErrorFileURL: URL? { static var networkExtensionLastErrorFileURL: URL? {
guard let appGroupId = Bundle.main.object(forInfoDictionaryKey: "com.wireguard.ios.app_group_id") as? String else { return sharedFolderURL?.appendingPathComponent("last-error.txt")
os_log("Cannot obtain app group id from bundle", log: OSLog.default, type: .error)
return nil
}
guard let sharedFolderURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupId) else {
os_log("Cannot obtain shared folder URL", log: OSLog.default, type: .error)
return nil
}
return sharedFolderURL.appendingPathComponent("last-error.txt")
} }
static var appLogFileURL: URL? { static var appLogFileURL: URL? {
guard let documentDirURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first else { guard let documentDirURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else {
os_log("Cannot obtain app documents folder URL", log: OSLog.default, type: .error) wg_log(.error, message: "Cannot obtain app documents folder URL")
return nil return nil
} }
return documentDirURL.appendingPathComponent("app-log.txt") return documentDirURL.appendingPathComponent("app-log.bin")
} }
static func deleteFile(at url: URL) -> Bool { static func deleteFile(at url: URL) -> Bool {
do { do {
try FileManager.default.removeItem(at: url) try FileManager.default.removeItem(at: url)
} catch let error { } catch {
wg_log(.info, message: "Failed to delete file '\(url.path)': \(error)")
return false return false
} }
return true return true