Throw error when a showstopper error happens while reading a remote s…

…ong in nextcloud backend This way we stop enumeration and tell the application that the container is not, in fact, fully scanned Signed-off-by: Claudio Cambra <[email protected]>
claucambra · Jun 25, 2024 · b425858 · b425858
1 parent 39be708
commit b425858
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/HarmonyKit/Backend/Backend.swift b/HarmonyKit/Backend/Backend.swift
@@ -12,6 +12,7 @@ public let BackendNewScanRequiredNotification = Notification.Name("BackendNewSca
 
 public enum ScanError: Error {
     case generalError(String)
+    case remoteReadError(String)
 }
 
 public protocol Backend: Identifiable, Hashable, ObservableObject {

diff --git a/HarmonyKit/Backend/Nextcloud/NextcloudBackend.swift b/HarmonyKit/Backend/Nextcloud/NextcloudBackend.swift
@@ -434,12 +434,11 @@ public class NextcloudBackend: NSObject, Backend, NKCommonDelegate, URLSessionWe
     ) async throws -> Song? {
         // Process received file
         guard let songUrl = URL(string: receivedFileUrl) else {
-            logger.error("Received serverUrl for \(receivedFileUrl) is invalid")
-            return nil
+            throw ScanError.remoteReadError("Received invalid song URL \(receivedFileUrl)")
         }
 
         guard fileHasPlayableExtension(fileURL: songUrl) else {
-            logger.info("File at \(songUrl) is not a playable song file, skip")
+            logger.info("File at \(songUrl) is not a playable song file, skipping.")
             return nil
         }
 
@@ -463,8 +462,7 @@ public class NextcloudBackend: NSObject, Backend, NKCommonDelegate, URLSessionWe
             fetchSession: ncKit.sessionManager,
             fetchHeaders: ncKit.nkCommonInstance.getStandardHeaders(options: .init())
         ) else {
-            logger.error("Could not create song from \(receivedFileUrl)")
-            return nil
+            throw ScanError.remoteReadError("Could not create song from \(receivedFileUrl)")
         }
 
         logger.debug("Acquired valid song: \(songUrl)")