From b59741766b68fe2381e9d168b920f412abd9d658 Mon Sep 17 00:00:00 2001 From: Roy Marmelstein Date: Sun, 17 Jan 2016 07:14:23 +0100 Subject: [PATCH] Moving documents url away from the Zip class --- Zip/QuickZip.swift | 2 ++ Zip/Zip.swift | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Zip/QuickZip.swift b/Zip/QuickZip.swift index 0bdd311..4eb226e 100644 --- a/Zip/QuickZip.swift +++ b/Zip/QuickZip.swift @@ -40,6 +40,7 @@ extension Zip { throw ZipError.UnzipFail } let directoryName = fileName.stringByReplacingOccurrencesOfString(".\(fileExtension)", withString: "") + let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL let destinationUrl = documentsUrl.URLByAppendingPathComponent(directoryName, isDirectory: true) try self.unzipFile(path, destination: destinationUrl, overwrite: true, password: nil, progress: progress) return destinationUrl @@ -73,6 +74,7 @@ extension Zip { - returns: NSURL of the destination folder. */ public func quickZipFiles(paths: [NSURL], fileName: String, progress: ((progress: Double) -> ())?) throws -> NSURL { + let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL let destinationUrl = documentsUrl.URLByAppendingPathComponent("\(fileName).zip") try self.zipFiles(paths, zipFilePath: destinationUrl, password: nil, progress: progress) return destinationUrl diff --git a/Zip/Zip.swift b/Zip/Zip.swift index ad034cf..c4696e0 100644 --- a/Zip/Zip.swift +++ b/Zip/Zip.swift @@ -31,9 +31,6 @@ public class Zip { // File manager let fileManager = NSFileManager.defaultManager() - // Documents folder - let documentsUrl = NSFileManager.defaultManager().URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL - // MARK: Lifecycle /** -- 2.26.2