Merge branch 'version_3'

Dependencies/Sources/DownloadManager/Download/DownloadPublisher.swift

@@ -6,10 +6,7 @@
 //
 
 import Combine
-
-#if canImport(Log)
 import Log
-#endif
 
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
@@ -33,7 +30,7 @@ public struct DownloadPublisher: Publisher {
         self.manager = manager
     }
 
-    private unowned let manager: DownloadManager
+    private let manager: DownloadManager
 }
 
 

Dependencies/Sources/DownloadManager/DownloadManager.swift

@@ -15,10 +15,7 @@ public final class DownloadManager {
     let coordinator: URLSessionCoordinator
 
     public init() {
-        let configuration = URLSessionConfiguration.default
-        configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
-
-        coordinator = URLSessionCoordinator(urlSessionConfiguration: configuration)
+        coordinator = URLSessionCoordinator(urlSessionConfiguration: .default)
     }
 
     public typealias DownloadTaskPublisher = Publishers.Share<DownloadPublisher>

Dependencies/Sources/DownloadManager/URLSession/URLSessionCoordinator.swift

@@ -7,10 +7,7 @@
 
 import Foundation
 import Combine
-
-#if canImport(Log)
 import Log
-#endif
 
 
 /// `URLSessionCoordinator` manages `URLSession` instance and forwards callbacks to responding `DownloadController` instances.

Dependencies/Sources/DownloadManager/URLSession/URLSessionDelegate.swift

@@ -6,10 +6,7 @@
 //
 
 import Foundation
-
-#if canImport(Log)
 import Log
-#endif
 
 
 final class URLSessionDelegate : NSObject {

Dependencies/Sources/FileIndex/File.swift

@@ -7,10 +7,7 @@
 
 import Foundation
 import CoreData
-
-#if canImport(PlainDatabase)
 import PlainDatabase
-#endif
 
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)

Dependencies/Sources/FileIndex/FileIndex.swift

@@ -7,18 +7,9 @@
 
 import Foundation
 import CoreData
-
-#if canImport(PlainDatabase)
 import PlainDatabase
-#endif
-
-#if canImport(Log)
 import Log
-#endif
-
-#if canImport(Common)
-import Common
-#endif
+import Model
 
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)

Sources/URLImage/Model/ImageInfo.swift → Dependencies/Sources/Model/ImageInfo.swift

@@ -8,13 +8,23 @@
 import CoreGraphics
 
 
+@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
 public struct ImageInfo {
 
     /// Decoded image
-    public var cgImage: CGImage
+    public var cgImage: CGImage {
+        proxy.cgImage
+    }
 
     /// Image size in pixels.
     ///
     /// This is the real size, that can be different from decoded image size.
     public var size: CGSize
+
+    init(proxy: CGImageProxy, size: CGSize) {
+        self.proxy = proxy
+        self.size = size
+    }
+
+    private let proxy: CGImageProxy
 }

Dependencies/Sources/Model/TransientImage+ImageDecoder.swift

@@ -0,0 +1,50 @@
+//
+//  TransientImage+ImageDecoder.swift
+//  
+//
+//  Created by Dmytro Anokhin on 11/01/2021.
+//
+
+import Foundation
+import CoreGraphics
+import ImageIO
+import ImageDecoder
+
+
+@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
+public extension TransientImage {
+
+    init?(data: Data, maxPixelSize: CGSize?) {
+        let decoder = ImageDecoder()
+        decoder.setData(data, allDataReceived: true)
+
+        self.init(decoder: decoder, maxPixelSize: maxPixelSize)
+    }
+
+    init?(location: URL, maxPixelSize: CGSize?) {
+        guard let decoder = ImageDecoder(url: location) else {
+            return nil
+        }
+
+        self.init(decoder: decoder, maxPixelSize: maxPixelSize)
+    }
+
+    init?(decoder: ImageDecoder, maxPixelSize: CGSize?) {
+        guard let uti = decoder.uti else {
+            // Not an image
+            return nil
+        }
+
+        guard let size = decoder.frameSize(at: 0) else {
+            // Can not decode an image
+            return nil
+        }
+
+        let proxy = CGImageProxy(decoder: decoder, maxPixelSize: maxPixelSize)
+
+        let info = ImageInfo(proxy: proxy, size: size)
+        let cgOrientation: CGImagePropertyOrientation = decoder.frameOrientation(at: 0) ?? .up
+
+        self.init(proxy: proxy, info: info, uti: uti, cgOrientation: cgOrientation)
+    }
+}

Dependencies/Sources/Model/TransientImage.swift

@@ -0,0 +1,72 @@
+//
+//  TransientImage.swift
+//  
+//
+//  Created by Dmytro Anokhin on 08/01/2021.
+//
+
+import Foundation
+import ImageIO
+import ImageDecoder
+
+
+/// Temporary representation used after decoding an image from data or file on disk and before creating an image object for display.
+@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
+public struct TransientImage {
+
+    public var cgImage: CGImage {
+        proxy.cgImage
+    }
+
+    public let info: ImageInfo
+
+    /// The uniform type identifier (UTI) of the source image.
+    ///
+    /// See [Uniform Type Identifier Concepts](https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_conc/understand_utis_conc.html#//apple_ref/doc/uid/TP40001319-CH202) for a list of system-declared and third-party UTIs.
+    public let uti: String
+
+    public let cgOrientation: CGImagePropertyOrientation
+
+    init(proxy: CGImageProxy, info: ImageInfo, uti: String, cgOrientation: CGImagePropertyOrientation) {
+        self.proxy = proxy
+        self.info = info
+        self.uti = uti
+        self.cgOrientation = cgOrientation
+    }
+
+    private let proxy: CGImageProxy
+}
+
+
+/// Proxy used to decode image lazily
+@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
+final class CGImageProxy {
+
+    let decoder: ImageDecoder
+
+    let maxPixelSize: CGSize?
+
+    init(decoder: ImageDecoder, maxPixelSize: CGSize?) {
+        self.decoder = decoder
+        self.maxPixelSize = maxPixelSize
+    }
+
+    var cgImage: CGImage {
+        if decodedCGImage == nil {
+            decodeImage()
+        }
+
+        return decodedCGImage!
+    }
+
+    private var decodedCGImage: CGImage?
+
+    private func decodeImage() {
+        if let sizeForDrawing = maxPixelSize {
+            let decodingOptions = ImageDecoder.DecodingOptions(mode: .asynchronous, sizeForDrawing: sizeForDrawing)
+            decodedCGImage = decoder.createFrameImage(at: 0, decodingOptions: decodingOptions)!
+        } else {
+            decodedCGImage = decoder.createFrameImage(at: 0)!
+        }
+    }
+}