Only refresh images if at least one new image was downloaded

Author: Laurenz Lazarus

BingWallpaper.xcodeproj/project.pbxproj

@@ -587,7 +587,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.4.4;
+				MARKETING_VERSION = 0.4.5b;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -643,7 +643,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.4.4;
+				MARKETING_VERSION = 0.4.5b;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;

BingWallpaper/Controller/MenuController.swift

@@ -23,7 +23,7 @@ class MenuController: NSObject {
         self.menu = createMenu()
         self.statusItem!.menu = menu
 
-        imagesUpdated()
+        showNewestImage()
     }
 
     private func createStatusBarItem() -> NSStatusItem {
@@ -186,16 +186,21 @@ class MenuController: NSObject {
         if description == nil { return "" }
         return description?.split(separator: "(").last?.replacingOccurrences(of: ")", with: "") ?? ""
     }
+    
+    @MainActor
+    private func showNewestImage() {
+        self.descriptors = Database.instance.allImageDescriptors()
+            .filter { $0.image.isOnDisk() }
+        selectedDescriptorIndex = self.descriptors.firstIndex(where: { $0 == self.descriptors.last }) ?? self.descriptors.endIndex
+        updateSelectedImage(newSelectedDescriptorIndex: selectedDescriptorIndex)
+    }
 }
 
 // MARK: - Delegates
 
 extension MenuController: UpdateManagerDelegate {
-    func imagesUpdated() {
-        self.descriptors = Database.instance.allImageDescriptors()
-            .filter { $0.image.isOnDisk() }
-        selectedDescriptorIndex = self.descriptors.firstIndex(where: { $0 == self.descriptors.last }) ?? self.descriptors.endIndex
-        updateSelectedImage(newSelectedDescriptorIndex: selectedDescriptorIndex)
+    func downloadedNewImage() {
+        showNewestImage()
     }
 }
 

BingWallpaper/Database/Models/Image.swift

@@ -24,11 +24,12 @@ class Image {
         return try Data(contentsOf: downloadPath)
     }
 
-    func download() async throws -> Data {
+    func downloadAndSaveToDisk() async throws {
         guard let descriptor else {
             throw Error.missingDescriptor
         }
-        return try await DownloadManager.downloadBinary(from: descriptor.imageUrl)
+        let imageData = try await DownloadManager.downloadBinary(from: descriptor.imageUrl)
+        try FileHandler.saveImageDataToDisk(imageData: imageData, toUrl: downloadPath)
     }
 
     static func isSavedToDisk(descriptor: ImageDescriptor) -> Bool {
@@ -39,9 +40,4 @@ class Image {
     func isOnDisk() -> Bool {
         return FileManager.default.fileExists(atPath: downloadPath.relativePath)
     }
-    
-    func saveToDisk(imageData: Data) throws {
-        try FileHandler.saveImageDataToDisk(imageData: imageData, toUrl: downloadPath)
-    }
-
 }

BingWallpaper/Manager/UpdateManager.swift

@@ -3,7 +3,7 @@ import AppKit
 
 protocol UpdateManagerDelegate: AnyObject {
     @MainActor
-    func imagesUpdated()
+    func downloadedNewImage()
 }
 
 class UpdateManager {
@@ -84,17 +84,18 @@ class UpdateManager {
 
             for descriptor in newDescriptors {
                 do {
-                    let imageData = try await descriptor.image.download()
-                    try descriptor.image.saveToDisk(imageData: imageData)
+                    try await descriptor.image.downloadAndSaveToDisk()
                 } catch {
-                    print("Failed to download and store image with error: \(error.localizedDescription)")
+                    print("Failed to download and store image \(descriptor.imageUrl) with error: \(error.localizedDescription)")
                 }
             }
 
             await MainActor.run { [weak self] in
                 guard let self = self else { return }
                 self.cleanup()
-                self.delegate?.imagesUpdated()
+                if newDescriptors.isEmpty == false {
+                    self.delegate?.downloadedNewImage()
+                }
                 let fetchInterval = UpdateScheduleManager.nextFetchTimeInterval()
                 print("Update complete, next update at \(Date().addingTimeInterval(fetchInterval))")