diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index f2686a65..715d0edc 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.7.716 + 1.7.719 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index ba49ce45..c6cac1e3 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.7.812 + 1.7.816 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix/Extensions.swift b/Kiwix/Extensions.swift index 5cb186c3..cba5bd1d 100644 --- a/Kiwix/Extensions.swift +++ b/Kiwix/Extensions.swift @@ -62,6 +62,12 @@ extension NSFileManager { let url = try? NSFileManager.defaultManager().URLForDirectory(.LibraryDirectory, inDomain: .UserDomainMask, appropriateForURL: nil, create: false) return url! } + + class func getContents(dir dir: NSURL) -> [NSURL] { + let options: NSDirectoryEnumerationOptions = [.SkipsHiddenFiles, .SkipsPackageDescendants, .SkipsSubdirectoryDescendants] + let urls = try? NSFileManager.defaultManager().contentsOfDirectoryAtURL(NSFileManager.docDirURL, includingPropertiesForKeys: nil, options: options) + return urls ?? [NSURL]() + } } diff --git a/Kiwix/Operations/ScanLocalBookOperation.swift b/Kiwix/Operations/ScanLocalBookOperation.swift index 7ddcca3f..b986ac62 100644 --- a/Kiwix/Operations/ScanLocalBookOperation.swift +++ b/Kiwix/Operations/ScanLocalBookOperation.swift @@ -111,15 +111,8 @@ class ScanLocalBookOperation: Operation { // MARK: - Helper - private class func getContentsOfDocDir() -> [NSURL] { - let keys = [NSURLIsDirectoryKey] - let options: NSDirectoryEnumerationOptions = [.SkipsHiddenFiles, .SkipsPackageDescendants, .SkipsHiddenFiles] - let urls = try? NSFileManager.defaultManager().contentsOfDirectoryAtURL(NSFileManager.docDirURL, includingPropertiesForKeys: keys, options: options) - return urls ?? [NSURL]() - } - private class func getCurrentZimFileURLsInDocDir() -> Set { - var urls = getContentsOfDocDir() + var urls = NSFileManager.getContents(dir: NSFileManager.docDirURL) let keys = [NSURLIsDirectoryKey] urls = urls.filter { (url) -> Bool in guard let values = try? url.resourceValuesForKeys(keys), @@ -131,7 +124,7 @@ class ScanLocalBookOperation: Operation { } private class func getCurrentIndexFolderURLsInDocDir() -> Set { - var urls = getContentsOfDocDir() + var urls = NSFileManager.getContents(dir: NSFileManager.docDirURL) let keys = [NSURLIsDirectoryKey] urls = urls.filter { (url) -> Bool in guard let values = try? url.resourceValuesForKeys(keys),