feat: add option to export camera roll, and group albums/smart albums

Author: pixelspark

Localizable.xcstrings

@@ -5172,6 +5172,46 @@
         }
       }
     },
+    "Camera roll" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Kamerarolle"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Carrete"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rullino foto"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Fotorol"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Плівка"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "相机胶卷"
+          }
+        }
+      }
+    },
     "Cancel" : {
       "localizations" : {
         "de" : {
@@ -24156,6 +24196,46 @@
         }
       }
     },
+    "Smart albums" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Intelligente Alben"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Álbumes inteligentes"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Album intelligenti"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Slimme albums"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Розумні альбоми"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "智能相册"
+          }
+        }
+      }
+    },
     "Start" : {
       "localizations" : {
         "de" : {

Sushitrain/PhotoBackup.swift

@@ -164,6 +164,8 @@ enum PhotoSyncProgress {
 }
 
 @MainActor class PhotoBackup: ObservableObject {
+	static nonisolated let allPhotosAlbumIdentifier = "_SUSHITRAIN_ALL_PHOTOS"
+
 	// These settings are prefixed 'photoSync' because that is what the feature used to be called
 	@AppStorage("photoSyncSelectedAlbumID") var selectedAlbumID: String = ""
 	@AppStorage("photoSyncFolderID") var selectedFolderID: String = ""
@@ -315,7 +317,14 @@ enum PhotoSyncProgress {
 			}
 
 			let folderURL = URL(fileURLWithPath: folderPath)
-			let fetchResult = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [selectedAlbumID], options: nil)
+			let fetchResult: PHFetchResult<PHAssetCollection>
+			if selectedAlbumID == PhotoBackup.allPhotosAlbumIdentifier {
+				fetchResult = PHAssetCollection.fetchAssetCollections(
+					with: .smartAlbum, subtype: .smartAlbumUserLibrary, options: nil)
+			}
+			else {
+				fetchResult = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [selectedAlbumID], options: nil)
+			}
 			guard let album = fetchResult.firstObject else {
 				DispatchQueue.main.async { self.progress = .error(String(localized: "Could not find selected album")) }
 				return

Sushitrain/PhotoBackupView.swift

@@ -87,22 +87,33 @@ struct PhotoBackupStatusView: View {
 
 struct PhotoBackupSettingsView: View {
 	@Environment(AppState.self) private var appState
+
+	@ObservedObject var photoBackup: PhotoBackup
+
 	@State private var authorizationStatus: PHAuthorizationStatus = .notDetermined
 	@State private var albumPickerShown = false
-	@ObservedObject var photoBackup: PhotoBackup
 	@State private var folders: [SushitrainFolder] = []
+	@State private var albums: [PHAssetCollection] = []
+	@State private var smartAlbums: [PHAssetCollection] = []
 
 	var body: some View {
-		let albums = self.authorizationStatus == .authorized ? self.loadAlbums() : []
-
 		Form {
 			Section {
 				if authorizationStatus == .authorized {
 					Picker("From album", selection: $photoBackup.selectedAlbumID) {
 						Text("None").tag("")
-						ForEach(albums, id: \.localIdentifier) { album in
-							Text(album.localizedTitle ?? "Unknown album").tag(
-								album.localIdentifier)
+						Text("Camera roll").tag(PhotoBackup.allPhotosAlbumIdentifier)
+
+						Section("Albums") {
+							ForEach(albums, id: \.localIdentifier) { album in
+								Text(album.localizedTitle ?? "Unknown album").tag(album.localIdentifier)
+							}
+						}
+
+						Section("Smart albums") {
+							ForEach(smartAlbums, id: \.localIdentifier) { album in
+								Text(album.localizedTitle ?? "Unknown album").tag(album.localIdentifier)
+							}
 						}
 					}
 					.pickerStyle(.menu)
@@ -322,12 +333,23 @@ struct PhotoBackupSettingsView: View {
 			.navigationBarTitleDisplayMode(.inline)
 		#endif
 		.task {
-			authorizationStatus = PHPhotoLibrary.authorizationStatus()
-			self.folders = await appState.folders().filter({ $0.isSuitablePhotoBackupDestination }).sorted()
+			await self.update()
+		}
+	}
+
+	private func update() async {
+		authorizationStatus = PHPhotoLibrary.authorizationStatus()
+		self.folders = await appState.folders().filter({ $0.isSuitablePhotoBackupDestination }).sorted()
+		if self.authorizationStatus == .authorized {
+			self.loadAlbums()
+		}
+		else {
+			self.albums = []
+			self.smartAlbums = []
 		}
 	}
 
-	func loadAlbums() -> [PHAssetCollection] {
+	private func loadAlbums() {
 		var albums: [PHAssetCollection] = []
 		let options = PHFetchOptions()
 		options.sortDescriptors = [NSSortDescriptor(key: "localizedTitle", ascending: true)]
@@ -336,15 +358,17 @@ struct PhotoBackupSettingsView: View {
 		userAlbums.enumerateObjects { (collection, _, _) in
 			albums.append(collection)
 		}
+		self.albums = albums
 
 		// Fetch system albums, including 'Recents'
+		var smartAlbums: [PHAssetCollection] = []
 		let systemAlbumsOptions = PHFetchOptions()
 		let systemAlbums = PHAssetCollection.fetchAssetCollections(
 			with: .smartAlbum, subtype: .any, options: systemAlbumsOptions)
 		systemAlbums.enumerateObjects { (collection, _, _) in
-			albums.append(collection)
+			smartAlbums.append(collection)
 		}
-		return albums
+		self.smartAlbums = smartAlbums
 	}
 
 	#if os(iOS)