album list, short list, more context menu, zoomable preview

Author: raluaces

Django Files.xcodeproj/project.pbxproj

@@ -79,9 +79,11 @@
 		4CA2E47D2D6D22CA006EF3F0 /* Exceptions for "Django Files" folder in "UploadAndCopy" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
+				API/Albums.swift,
 				API/DFAPI.swift,
 				API/Error.swift,
 				API/Files.swift,
+				API/Gallery.swift,
 				API/Short.swift,
 				API/Stats.swift,
 				API/Upload.swift,

Django Files/API/Albums.swift

@@ -0,0 +1,82 @@
+//
+//  Albums.swift
+//  Django Files
+//
+//  Created by Ralph Luaces on 4/29/25.
+//
+
+import Foundation
+
+// Album model that matches the JSON payload
+struct DFAlbum: Identifiable, Decodable, Hashable {
+    let id: Int
+    let user: Int
+    let name: String
+    let password: String
+    let `private`: Bool
+    let info: String
+    let view: Int
+    let maxv: Int
+    let expr: String
+    let date: String
+    let url: String
+    
+    // Format date for display
+    func formattedDate() -> String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        
+        if let date = dateFormatter.date(from: date) {
+            let displayFormatter = DateFormatter()
+            displayFormatter.dateStyle = .medium
+            displayFormatter.timeStyle = .short
+            return displayFormatter.string(from: date)
+        }
+        
+        return date
+    }
+}
+
+// Response structure for album API call
+struct AlbumsResponse: Decodable {
+    let albums: [DFAlbum]
+    let next: Int?
+    let count: Int
+}
+
+extension DFAPI {
+    // Fetch albums with pagination
+    func getAlbums(page: Int = 1) async -> AlbumsResponse? {
+        guard var components = URLComponents(string: "\(url)/api/albums/") else {
+            return nil
+        }
+        
+        components.queryItems = [URLQueryItem(name: "page", value: "\(page)")]
+        
+        guard let requestURL = components.url else {
+            return nil
+        }
+        
+        var request = URLRequest(url: requestURL)
+        request.httpMethod = "GET"
+        request.addValue("Token \(token)", forHTTPHeaderField: "Authorization")
+        
+        do {
+            let (data, response) = try await URLSession.shared.data(for: request)
+            
+            guard let httpResponse = response as? HTTPURLResponse, 
+                  (200...299).contains(httpResponse.statusCode) else {
+                return nil
+            }
+            
+            let decoder = JSONDecoder()
+            let albumsResponse = try decoder.decode(AlbumsResponse.self, from: data)
+            return albumsResponse
+            
+        } catch {
+            print("Error fetching albums: \(error)")
+            return nil
+        }
+    }
+}
+

Django Files/API/DFAPI.swift

@@ -23,6 +23,7 @@ struct DFAPI {
         case auth_methods = "auth/methods/"
         case login = "auth/token/"
         case files = "files/"
+        case shorts = "shorts/"
     }
 
     let url: URL
@@ -165,6 +166,28 @@ struct DFAPI {
         }
     }
 
+    public func getShorts(amount: Int = 50, start: Int? = nil) async -> ShortsResponse? {
+        var parameters: [String: String] = ["amount": "\(amount)"]
+        if let start = start {
+            parameters["start"] = "\(start)"
+        }
+        
+        do {
+            let responseBody = try await makeAPIRequest(
+                path: getAPIPath(.shorts),
+                parameters: parameters,
+                method: .get
+            )
+            
+            let shorts = try decoder.decode([DFShort].self, from: responseBody)
+            return ShortsResponse(shorts: shorts)
+            
+        } catch {
+            print("Error fetching shorts: \(error)")
+            return nil
+        }
+    }
+    
     public func getAuthMethods() async -> DFAuthMethodsResponse? {
         do {
             let responseBody = try await makeAPIRequest(
@@ -343,10 +366,12 @@ struct DFAPI {
             let specialDecoder = JSONDecoder()
             specialDecoder.keyDecodingStrategy = .convertFromSnakeCase
             return try specialDecoder.decode(DFFilesResponse.self, from: responseBody)
+        } catch let DecodingError.keyNotFound(key, context) {
+            print("Missing key: \(key.stringValue) in context: \(context.debugDescription)")
         } catch {
             print("Request failed \(error)")
-            return nil
         }
+        return nil
     }
 }
 

Django Files/API/Files.swift

@@ -13,8 +13,8 @@ public struct DFFile: Codable, Hashable, Equatable {
     public let size: Int
     public let mime: String
     public let name: String
-    public let userName: String
-    public let userUsername: String
+    public let userName: String? = ""
+    public let userUsername: String? = ""
     public let info: String
     public let expr: String
     public let view: Int

Django Files/API/Gallery.swift

@@ -0,0 +1,8 @@
+//
+//  Gallery.swift
+//  Django Files
+//
+//  Created by Ralph Luaces on 4/29/25.
+//
+
+import Foundation

Django Files/API/Short.swift

@@ -39,3 +39,30 @@ struct DFShortResponse: Codable{
         url = try container.decode(String.self, forKey: .url)
     }
 }
+
+struct DFShort: Identifiable, Codable, Hashable {
+    let id: Int
+    let short: String
+    let url: String
+    let max: Int
+    let views: Int
+    let user: Int
+    let fullUrl: String
+    
+    enum CodingKeys: String, CodingKey {
+        case id, short, url, max, views, user, fullUrl
+    }
+}
+
+// Response structure for shorts API call
+struct ShortsResponse: Codable {
+    let shorts: [DFShort]
+    
+    init(shorts: [DFShort]) {
+        self.shorts = shorts
+    }
+    
+    enum CodingKeys: String, CodingKey {
+        case shorts
+    }
+}