Use directory folder

3lvis · Sep 28, 2016 · 8904a88 · 8904a88
1 parent ca86903
commit 8904a88
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/Sources/Networking.swift b/Sources/Networking.swift
@@ -207,7 +207,12 @@ public class Networking {
         let finalPath = "\(folderPath)/\(normalizedResourcesPath)"
 
         if let url = URL(string: finalPath) {
-            if let cachesURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first {
+            #if os(tvOS)
+                let directory = FileManager.SearchPathDirectory.cachesDirectory
+            #else
+                let directory = TestCheck.isTesting ? FileManager.SearchPathDirectory.cachesDirectory : FileManager.SearchPathDirectory.documentDirectory
+            #endif
+            if let cachesURL = FileManager.default.urls(for: directory, in: .userDomainMask).first {
                 try (cachesURL as NSURL).setResourceValue(true, forKey: URLResourceKey.isExcludedFromBackupKey)
                 let folderURL = cachesURL.appendingPathComponent(URL(string: folderPath)!.absoluteString)
 
@@ -328,7 +333,12 @@ public class Networking {
      Deletes the downloaded/cached files.
      */
     public static func deleteCachedFiles() {
-        if let cachesURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first {
+        #if os(tvOS)
+            let directory = FileManager.SearchPathDirectory.cachesDirectory
+        #else
+            let directory = TestCheck.isTesting ? FileManager.SearchPathDirectory.cachesDirectory : FileManager.SearchPathDirectory.documentDirectory
+        #endif
+        if let cachesURL = FileManager.default.urls(for: directory, in: .userDomainMask).first {
             let folderURL = cachesURL.appendingPathComponent(URL(string: Networking.domain)!.absoluteString)
 
             if FileManager.default.exists(at: folderURL) {

diff --git a/Tests/NetworkingTests.swift b/Tests/NetworkingTests.swift
@@ -183,7 +183,12 @@ class NetworkingTests: XCTestCase {
     func testDeleteDownloadedFiles() {
         let networking = Networking(baseURL: self.baseURL)
         networking.downloadImage("/image/png") { image, error in
-            let cachesURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
+            #if os(tvOS)
+                let directory = FileManager.SearchPathDirectory.cachesDirectory
+            #else
+                let directory = TestCheck.isTesting ? FileManager.SearchPathDirectory.cachesDirectory : FileManager.SearchPathDirectory.documentDirectory
+            #endif
+            let cachesURL = FileManager.default.urls(for: directory, in: .userDomainMask).first!
             let folderURL = cachesURL.appendingPathComponent(URL(string: Networking.domain)!.absoluteString)
             XCTAssertTrue(FileManager.default.exists(at: folderURL))
             Networking.deleteCachedFiles()