Cleanup

Author: kean

ios/Sources/GutenbergKit/Sources/Service/EditorService.swift

@@ -42,11 +42,14 @@ actor EditorService {
         self.siteURL = siteURL
         self.urlSession = urlSession
 
-        self.storeURL = URL.applicationDirectory
-            .appendingPathComponent("GutenbergKit", isDirectory: true)
+        self.storeURL = EditorService.rootURL
             .appendingPathComponent(siteURL.sha1, isDirectory: true)
     }
 
+    private static var rootURL: URL {
+        URL.applicationDirectory.appendingPathComponent("GutenbergKit", isDirectory: true)
+    }
+
     /// Set up the editor for the given site.
     ///
     /// - warning: The request make take a significant amount of time the first
@@ -309,15 +312,18 @@ actor EditorService {
             return (true, size ?? 0)
         }
 
+        let startTime = CFAbsoluteTimeGetCurrent()
         let (downloadedURL, response) = try await urlSession.download(from: url)
+        let downloadTime = CFAbsoluteTimeGetCurrent() - startTime
+
         if let status = (response as? HTTPURLResponse)?.statusCode, (200..<300).contains(status) {
             let size = try? FileManager.default.attributesOfItem(atPath: downloadedURL.path)[.size] as? Int64 ?? 0
             do {
                 try FileManager.default.moveItem(at: downloadedURL, to: localURL)
             } catch {
                 log(.error, "Failed to move downloaded assets \(downloadedURL) \(localURL)")
             }
-            log(.debug, "Downloaded asset: \(url.lastPathComponent) (\(size ?? 0) bytes)")
+            log(.debug, "Downloaded asset: \(url.lastPathComponent) (\(size ?? 0) bytes) in \(String(format: "%.2f", downloadTime))s")
             return (false, size ?? 0)
         } else {
             log(.error, "Received unexpected HTTP response for URL: \(url)")
@@ -347,11 +353,9 @@ actor EditorService {
 
     /// Deletes all cached editor data for all sites
     static func deleteAllData() throws {
-        let rootURL = URL.documentsDirectory.appendingPathComponent("GutenbergKit", isDirectory: true)
-        guard FileManager.default.fileExists(atPath: rootURL.path) else {
-            return
+        if FileManager.default.fileExists(atPath: EditorService.rootURL.path()) {
+            try FileManager.default.removeItem(at: EditorService.rootURL)
         }
-        try FileManager.default.removeItem(at: rootURL)
     }
 
     /// Generates a cached filename from an asset URL using SHA256 hash