Merge pull request #41 from mensadilabs/dev

merge

Author: mensadilabs

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: zzpr69dnqtr # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -1,4 +1,5 @@
 # macOS metadata files
 ._* 
 CLAUDE.local.md
-.vscode/**
+.vscode/**
+.kiro/**

CHNAGELOG.md renamed to CHANGELOG.md

@@ -1,4 +1,13 @@
-version 1.0.7 Build 1
+# VERSION|1.0.11
+
+BUFFIX| Fix bugs
+  - Top shef portraits no longer do unexpected headstands or cartwheels. I Hope. 
+  - Hopefully it also won't crash. But you may see reduced image quality in top shelf. 
+  - Better error handling.
+  - Changed color gradient, this is much better on the eyes, I think. 
+
+
+# version 1.0.7 Build 1
 
 🎬 Animated Thumbnails
 

Immich Gallery.xcodeproj/project.pbxproj

@@ -547,7 +547,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 1.0.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.sanketh.dev.Immich-Gallery";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -576,7 +576,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 1.0.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.sanketh.dev.Immich-Gallery";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -673,7 +673,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.1;
+				MARKETING_VERSION = 0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.sanketh.dev.Immich-Gallery.TopShelfExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -699,7 +699,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.1;
+				MARKETING_VERSION = 0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.sanketh.dev.Immich-Gallery.TopShelfExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Immich Gallery/ContentView.swift

@@ -43,6 +43,10 @@ extension Notification.Name {
 }
 
 struct ContentView: View {
+    // Auto slideshow state
+    @AppStorage(UserDefaultsKeys.autoSlideshowTimeout) private var autoSlideshowTimeout: Int = 0
+    @State private var inactivityTimer: Timer? = nil
+    @State private var lastInteractionDate = Date()
     @StateObject private var networkService = NetworkService()
     @StateObject private var authService: AuthenticationService
     @StateObject private var assetService: AssetService
@@ -71,7 +75,7 @@ struct ContentView: View {
     }
 
     var body: some View {
-        NavigationView {
+    NavigationView {
             ZStack {
                 if !authService.isAuthenticated {
                     // Show sign-in view
@@ -130,14 +134,19 @@ struct ContentView: View {
                             }
                             .tag(TabName.settings.rawValue)
                     }
-            .onAppear {
+                    .onAppear {
                         setDefaultTab()
                         checkForAppUpdate()
+                        startInactivityTimer()
                     }
                     .onChange(of: selectedTab) { oldValue, newValue in
                         searchTabHighlighted = false
-                        print("Tab changed from \(oldValue) to \(newValue)")
-                    }                    .id(refreshTrigger) // Force refresh when user switches
+                        resetInactivityTimer()
+                    }
+                    .onChange(of: autoSlideshowTimeout) { _, _ in
+                        startInactivityTimer()
+                    }
+                    .id(refreshTrigger) // Force refresh when user switches
                     // .accentColor(.blue)
                 }
             }
@@ -163,6 +172,10 @@ struct ContentView: View {
                 }
             }
         }
+        .contentShape(Rectangle())
+        .simultaneousGesture(
+            TapGesture().onEnded { resetInactivityTimer() }
+        )
        .sheet(isPresented: $showWhatsNew) {
            WhatsNewView(onDismiss: {
                showWhatsNew = false
@@ -171,6 +184,27 @@ struct ContentView: View {
        }
     }
 
+    // MARK: - Inactivity Timer Logic
+    private func startInactivityTimer() {
+        inactivityTimer?.invalidate()
+        inactivityTimer = nil
+        if autoSlideshowTimeout > 0 {
+            inactivityTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
+                let elapsed = Date().timeIntervalSince(lastInteractionDate)
+                if elapsed > Double(autoSlideshowTimeout * 60) {
+                    inactivityTimer?.invalidate()
+                    inactivityTimer = nil
+                    // Post notification to start auto slideshow
+                    NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.startAutoSlideshow), object: nil)
+                }
+            }
+        }
+    }
+
+    private func resetInactivityTimer() {
+        lastInteractionDate = Date()
+    }
+
     private func setDefaultTab() {
         switch defaultStartupTab {
         case "albums":

Immich Gallery/Services/AssetService.swift

@@ -63,7 +63,7 @@ class AssetService: ObservableObject {
     }
 
     func loadVideoURL(asset: ImmichAsset) async throws -> URL {
-        guard asset.type == .video else { throw ImmichError.serverError }
+        guard asset.type == .video else { throw ImmichError.clientError(400) }
         let endpoint = "/api/assets/\(asset.id)/video/playback"
         guard let url = URL(string: "\(networkService.baseURL)\(endpoint)") else {
             throw ImmichError.invalidURL

Immich Gallery/Services/AuthenticationService.swift

@@ -161,15 +161,32 @@ class AuthenticationService: ObservableObject {
     }
 
     private func validateTokenIfNeeded() {
-        guard isAuthenticated && !networkService.baseURL.isEmpty else { return }
+        guard isAuthenticated && !networkService.baseURL.isEmpty else { 
+            print("AuthenticationService: Skipping token validation - not authenticated or no baseURL")
+            return 
+        }
 
         Task {
             do {
                 try await fetchUserInfo()
-            } catch {
-                DispatchQueue.main.async {
-                    self.signOut()
+                print("AuthenticationService: Token validation successful")
+            } catch let error as ImmichError {
+                print("AuthenticationService: Token validation failed with ImmichError: \(error)")
+                
+                if error.shouldLogout {
+                    print("AuthenticationService: Logging out user due to authentication error: \(error)")
+                    DispatchQueue.main.async {
+                        self.signOut()
+                    }
+                } else {
+                    print("AuthenticationService: Preserving authentication state despite error: \(error)")
+                    // For server/network errors, preserve authentication state
+                    // The user will see error messages in the UI but won't be logged out
                 }
+            } catch {
+                print("AuthenticationService: Token validation failed with unexpected error: \(error)")
+                // Handle unexpected errors conservatively - don't logout
+                // This preserves user authentication state for unknown error types
             }
         }
     }

Immich Gallery/Services/NetworkService.swift

@@ -10,7 +10,7 @@ import Foundation
 /// Base networking service that handles HTTP requests and authentication
 class NetworkService: ObservableObject {
     // MARK: - Configuration
-    @Published var baseURL: String = ""
+    @Published var baseURL: String = "http://localhost:2283"
     @Published var accessToken: String?
 
     private let session = URLSession.shared
@@ -114,21 +114,42 @@ class NetworkService: ObservableObject {
             }
         }
 
-        let (data, response) = try await session.data(for: request)
+        let (data, response): (Data, URLResponse)
+        do {
+            (data, response) = try await session.data(for: request)
+        } catch {
+            print("NetworkService: Network error occurred: \(error)")
+            // Handle network connectivity issues (timeouts, connection refused, DNS failures, etc.)
+            throw ImmichError.networkError
+        }
 
         guard let httpResponse = response as? HTTPURLResponse else {
             print("NetworkService: Invalid HTTP response")
-            throw ImmichError.serverError
+            throw ImmichError.networkError
         }
 
         print("NetworkService: Response status code: \(httpResponse.statusCode)")
 
         guard httpResponse.statusCode == 200 else {
-            print("NetworkService: Server error with status \(httpResponse.statusCode)")
+            print("NetworkService: HTTP error with status \(httpResponse.statusCode)")
             if let responseString = String(data: data, encoding: .utf8) {
                 print("NetworkService: Response body: \(responseString)")
             }
-            throw ImmichError.serverError
+            
+            // Classify HTTP status codes into appropriate ImmichError types
+            switch httpResponse.statusCode {
+            case 401:
+                throw ImmichError.notAuthenticated
+            case 403:
+                throw ImmichError.forbidden
+            case 500...599:
+                throw ImmichError.serverError(httpResponse.statusCode)
+            case 400...499:
+                throw ImmichError.clientError(httpResponse.statusCode)
+            default:
+                // For any other status codes, treat as server error
+                throw ImmichError.serverError(httpResponse.statusCode)
+            }
         }
 
         do {
@@ -157,11 +178,37 @@ class NetworkService: ObservableObject {
         var request = URLRequest(url: url)
         request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
 
-        let (data, response) = try await session.data(for: request)
+        let (data, response): (Data, URLResponse)
+        do {
+            (data, response) = try await session.data(for: request)
+        } catch {
+            print("NetworkService: Network error occurred in makeDataRequest: \(error)")
+            // Handle network connectivity issues (timeouts, connection refused, DNS failures, etc.)
+            throw ImmichError.networkError
+        }
+        
+        guard let httpResponse = response as? HTTPURLResponse else {
+            print("NetworkService: Invalid HTTP response in makeDataRequest")
+            throw ImmichError.networkError
+        }
 
-        guard let httpResponse = response as? HTTPURLResponse,
-              httpResponse.statusCode == 200 else {
-            throw ImmichError.serverError
+        guard httpResponse.statusCode == 200 else {
+            print("NetworkService: HTTP error in makeDataRequest with status \(httpResponse.statusCode)")
+            
+            // Classify HTTP status codes into appropriate ImmichError types
+            switch httpResponse.statusCode {
+            case 401:
+                throw ImmichError.notAuthenticated
+            case 403:
+                throw ImmichError.forbidden
+            case 500...599:
+                throw ImmichError.serverError(httpResponse.statusCode)
+            case 400...499:
+                throw ImmichError.clientError(httpResponse.statusCode)
+            default:
+                // For any other status codes, treat as server error
+                throw ImmichError.serverError(httpResponse.statusCode)
+            }
         }
 
         return data
@@ -178,21 +225,36 @@ enum HTTPMethod: String {
 }
 
 enum ImmichError: Error, LocalizedError {
-    case notAuthenticated
-    case invalidURL
-    case serverError
-    case networkError
+    case notAuthenticated           // 401 - Invalid/expired token
+    case forbidden                  // 403 - Access denied
+    case invalidURL                 // Malformed URL
+    case serverError(Int)          // 5xx - Server issues
+    case networkError              // Network connectivity issues
+    case clientError(Int)          // 4xx (except 401/403)
+    
+    var shouldLogout: Bool {
+        switch self {
+        case .notAuthenticated, .forbidden:
+            return true
+        case .serverError, .networkError, .invalidURL, .clientError:
+            return false
+        }
+    }
 
     var errorDescription: String? {
         switch self {
         case .notAuthenticated:
             return "Not authenticated. Please log in."
+        case .forbidden:
+            return "Access forbidden. Please check your permissions."
         case .invalidURL:
             return "Invalid URL"
-        case .serverError:
-            return "Server error occurred"
+        case .serverError(let statusCode):
+            return "Server error occurred (HTTP \(statusCode))"
         case .networkError:
             return "Network error occurred"
+        case .clientError(let statusCode):
+            return "Client error occurred (HTTP \(statusCode))"
         }
     }
-} 
+} 

Immich Gallery/Views/AssetGridView.swift

@@ -248,6 +248,9 @@ struct AssetGridView: View {
                 }
             }
         }
+        .onReceive(NotificationCenter.default.publisher(for: NSNotification.Name(NotificationNames.startAutoSlideshow))) { _ in
+                startSlideshow()
+        }
     }
 
     private func loadAssets() {

Immich Gallery/Views/Settings/AutoSlideshowTimeoutPicker.swift

@@ -0,0 +1,27 @@
+import SwiftUI
+
+struct AutoSlideshowTimeoutPicker: View {
+    @Binding var timeout: Int
+    let options: [Int] = [0, 1, 3, 5, 10, 15, 30, 60] // 0 = Off
+    
+    var body: some View {
+        Picker("Auto-Start After", selection: $timeout) {
+            ForEach(options, id: \.self) { value in
+                if value == 0 {
+                    Text("Off").tag(0)
+                } else {
+                    Text("\(value) min").tag(value)
+                }
+            }
+        }
+        .pickerStyle(.menu)
+        .frame(width: 300, alignment: .trailing)
+    }
+}
+
+
+#Preview {
+    @Previewable
+    @State var timeout = 10
+    return AutoSlideshowTimeoutPicker(timeout: $timeout)
+}