Merge pull request #165 from tettoffensive/master

Add Package.swift for server side swift support

Author: onmyway133

.gitignore

@@ -31,3 +31,4 @@ Pods
 
 # Carthage
 Carthage
+/.build

.swift-version

@@ -1 +1 @@
-4.0
+4.0.2

Package.resolved

@@ -0,0 +1,29 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Cache",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "Cache",
+            targets: ["Cache"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "Cache",
+            path: "Source/Shared",
+            exclude: ["Library/ImageWrapper.swift"]), // relative to the target path
+        .testTarget(
+            name: "CacheTests",
+            dependencies: ["Cache"],
+            path: "Tests"),
+    ]
+)

Package.swift

@@ -10,6 +10,7 @@ public struct DiskConfig {
   public let maxSize: UInt
   /// A folder to store the disk cache contents. Defaults to a prefixed directory in Caches if nil
   public let directory: URL?
+  #if os(iOS) || os(tvOS)
   /// Data protection is used to store files in an encrypted format on disk and to decrypt them on demand.
   /// Support only on iOS and tvOS.
   public let protectionType: FileProtectionType?
@@ -23,4 +24,13 @@ public struct DiskConfig {
     self.directory = directory
     self.protectionType = protectionType
   }
+  #else
+  public init(name: String, expiry: Expiry = .never,
+              maxSize: UInt = 0, directory: URL? = nil) {
+    self.name = name
+    self.expiry = expiry
+    self.maxSize = maxSize
+    self.directory = directory
+  }
+  #endif
 }

Source/Shared/Configuration/DiskConfig.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Dispatch
 
 /// Manipulate storage in a "all async" manner.
 /// The completion closure will be called when operation completes.

Source/Shared/Storage/AsyncStorage.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Dispatch
 
 /// A protocol used for saving and loading from storage in async manner.
 public protocol AsyncStorageAware: class {

Source/Shared/Storage/AsyncStorageAware.swift

@@ -69,7 +69,7 @@ extension DiskStorage: StorageAware {
     let expiry = expiry ?? config.expiry
     let data = try DataSerializer.serialize(object: object)
     let filePath = makeFilePath(for: key)
-    fileManager.createFile(atPath: filePath, contents: data, attributes: nil)
+    _ = fileManager.createFile(atPath: filePath, contents: data, attributes: nil)
     try fileManager.setAttributes([.modificationDate: expiry.date], ofItemAtPath: filePath)
   }
 
@@ -104,18 +104,18 @@ extension DiskStorage: StorageAware {
     }
 
     for url in urlArray {
-      let resourceValues = try (url as NSURL).resourceValues(forKeys: resourceKeys)
-      guard (resourceValues[.isDirectoryKey] as? NSNumber)?.boolValue == false else {
+      let resourceValues = try url.resourceValues(forKeys: Set(resourceKeys))
+      guard resourceValues.isDirectory != true else {
         continue
       }
 
-      if let expiryDate = resourceValues[.contentModificationDateKey] as? Date, expiryDate.inThePast {
+      if let expiryDate = resourceValues.contentModificationDate, expiryDate.inThePast {
         filesToDelete.append(url)
         continue
       }
 
-      if let fileSize = resourceValues[.totalFileAllocatedSizeKey] as? NSNumber {
-        totalSize += fileSize.uintValue
+      if let fileSize = resourceValues.totalFileAllocatedSize {
+        totalSize += UInt(fileSize)
         resourceObjects.append((url: url, resourceValues: resourceValues))
       }
     }
@@ -135,12 +135,12 @@ extension DiskStorage {
    Sets attributes on the disk cache folder.
    - Parameter attributes: Directory attributes
    */
-  func setDirectoryAttributes(_ attributes: [FileAttributeKey : Any]) throws {
+  func setDirectoryAttributes(_ attributes: [FileAttributeKey: Any]) throws {
     try fileManager.setAttributes(attributes, ofItemAtPath: path)
   }
 }
 
-typealias ResourceObject = (url: Foundation.URL, resourceValues: [AnyHashable: Any])
+typealias ResourceObject = (url: Foundation.URL, resourceValues: URLResourceValues)
 
 extension DiskStorage {
   /**
@@ -166,7 +166,7 @@ extension DiskStorage {
     var size: UInt64 = 0
     let contents = try fileManager.contentsOfDirectory(atPath: path)
     for pathComponent in contents {
-      let filePath = (path as NSString).appendingPathComponent(pathComponent)
+      let filePath = NSString(string: path).appendingPathComponent(pathComponent)
       let attributes = try fileManager.attributesOfItem(atPath: filePath)
       if let fileSize = attributes[.size] as? UInt64 {
         size += fileSize
@@ -198,9 +198,8 @@ extension DiskStorage {
     let targetSize = config.maxSize / 2
 
     let sortedFiles = objects.sorted {
-      let key = URLResourceKey.contentModificationDateKey
-      if let time1 = ($0.resourceValues[key] as? Date)?.timeIntervalSinceReferenceDate,
-        let time2 = ($1.resourceValues[key] as? Date)?.timeIntervalSinceReferenceDate {
+      if let time1 = $0.resourceValues.contentModificationDate?.timeIntervalSinceReferenceDate,
+        let time2 = $1.resourceValues.contentModificationDate?.timeIntervalSinceReferenceDate {
         return time1 > time2
       } else {
         return false
@@ -209,8 +208,8 @@ extension DiskStorage {
 
     for file in sortedFiles {
       try fileManager.removeItem(at: file.url)
-      if let fileSize = file.resourceValues[URLResourceKey.totalFileAllocatedSizeKey] as? NSNumber {
-        totalSize -= fileSize.uintValue
+      if let fileSize = file.resourceValues.totalFileAllocatedSize {
+        totalSize -= UInt(fileSize)
       }
       if totalSize < targetSize {
         break

Source/Shared/Storage/DiskStorage.swift

@@ -20,7 +20,7 @@ final class MemoryStorage {
 
 extension MemoryStorage: StorageAware {
   func entry<T: Codable>(ofType type: T.Type, forKey key: String) throws -> Entry<T> {
-    guard let capsule = cache.object(forKey: key as NSString) else {
+    guard let capsule = cache.object(forKey: NSString(string: key)) else {
       throw StorageError.notFound
     }
 
@@ -32,13 +32,13 @@ extension MemoryStorage: StorageAware {
   }
 
   func removeObject(forKey key: String) {
-    cache.removeObject(forKey: key as NSString)
+    cache.removeObject(forKey: NSString(string: key))
     keys.remove(key)
   }
 
   func setObject<T: Codable>(_ object: T, forKey key: String, expiry: Expiry? = nil) {
     let capsule = MemoryCapsule(value: object, expiry: expiry ?? config.expiry)
-    cache.setObject(capsule, forKey: key as NSString)
+    cache.setObject(capsule, forKey: NSString(string: key))
     keys.insert(key)
   }
 
@@ -61,7 +61,7 @@ extension MemoryStorage {
    - Parameter key: Unique key to identify the object in the cache
    */
   func removeObjectIfExpired(forKey key: String) {
-    if let capsule = cache.object(forKey: key as NSString), capsule.expiry.isExpired {
+    if let capsule = cache.object(forKey: NSString(string: key)), capsule.expiry.isExpired {
       removeObject(forKey: key)
     }
   }

Source/Shared/Storage/MemoryStorage.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Dispatch
 
 /// Manage storage. Use memory storage if specified.
 /// Synchronous by default. Use `async` for asynchronous operations.