chore: rename instances of photo sync -> backup

Signed-off-by: Tommy van der Vorst <tommy@pixelspark.nl>

Author: pixelspark

Sushitrain/AppState.swift

@@ -487,7 +487,7 @@ struct SyncState {
 	}
 
 	var isFinished: Bool {
-		return !self.client.isDownloading() && !self.client.isUploading() && !self.photoBackup.isSynchronizing
+		return !self.client.isDownloading() && !self.client.isUploading() && !self.photoBackup.isBackingUp
 	}
 
 	func alert(message: String) {

Sushitrain/PhotoBackup.swift

@@ -8,7 +8,7 @@ import SwiftUI
 @preconcurrency import SushitrainCore
 import Photos
 
-enum PhotoSyncCategories: String, Codable {
+enum PhotoBackupCategory: String, Codable {
 	case photo = "photo"
 	case livePhoto = "live"
 	case video = "video"
@@ -102,7 +102,7 @@ enum PhotoBackupFolderStructure: String, Codable {
 	}
 }
 
-enum PhotoSyncProgress {
+enum PhotoBackupProgress {
 	case notStarted
 	case starting
 	case exportingPhotos(index: Int, total: Int, current: String?)
@@ -178,7 +178,7 @@ enum PhotoSyncProgress {
 
 	@AppStorage("photoSyncLastCompletedDate") var lastCompletedDate: Double = -1.0
 	@AppStorage("photoSyncEnableBackgroundCopy") var enableBackgroundCopy: Bool = false
-	@AppStorage("photoSyncCategories") var categories: Set<PhotoSyncCategories> = Set([.photo, .video, .livePhoto])
+	@AppStorage("photoSyncCategories") var categories: Set<PhotoBackupCategory> = Set([.photo, .video, .livePhoto])
 	@AppStorage("photoSyncPurgeEnabled") var purgeEnabled = false
 	@AppStorage("photoSyncPurgeAfterDays") var purgeAfterDays = 7
 	@AppStorage("PhotoBackupFolderStructure") var folderStructure = PhotoBackupFolderStructure.byDateAndType
@@ -190,8 +190,8 @@ enum PhotoSyncProgress {
 	// Whether to replace or append the ".MOV" file extension for live photos
 	@AppStorage("photoBackupLivePhotoReplaceExtension") var livePhotoReplaceExtension: Bool = false
 
-	@Published private(set) var isSynchronizing = false
-	@Published private(set) var progress: PhotoSyncProgress = .notStarted
+	@Published private(set) var isBackingUp = false
+	@Published private(set) var progress: PhotoBackupProgress = .notStarted
 	@Published private(set) var photoBackupTask: Task<(), Error>? = nil
 
 	var selectedAlbumTitle: String? {
@@ -217,7 +217,7 @@ enum PhotoSyncProgress {
 		if !self.isReady { return nil }
 		if self.selectedAlbumID.isEmpty { return nil }
 		if self.photoBackupTask != nil { return nil }
-		self.isSynchronizing = true
+		self.isBackingUp = true
 
 		let selectedAlbumID = self.selectedAlbumID
 		let selectedFolderID = self.selectedFolderID
@@ -230,7 +230,7 @@ enum PhotoSyncProgress {
 			defer {
 				DispatchQueue.main.async {
 					self.photoBackupTask = nil
-					self.isSynchronizing = false
+					self.isBackingUp = false
 				}
 			}
 
@@ -407,7 +407,7 @@ enum PhotoSyncProgress {
 		folderURL: URL,
 		subDirectoryPath: EntryPath,
 		fullExport: Bool,
-		categories: Set<PhotoSyncCategories>,
+		categories: Set<PhotoBackupCategory>,
 		isInBackground: Bool,
 		onlyTheseLocalIdentifiers: Set<String>?
 	) async throws {

Sushitrain/PhotoBackupView.swift

@@ -30,7 +30,7 @@ struct PhotoBackupButton: View {
 			Text(e).foregroundStyle(.red)
 		}
 
-		if photoBackup.isSynchronizing {
+		if photoBackup.isBackingUp {
 			PhotoBackupProgressView(photoBackup: photoBackup)
 
 			Button("Cancel", role: .cancel) {
@@ -47,7 +47,7 @@ struct PhotoBackupButton: View {
 			#if os(macOS)
 				.buttonStyle(.link)
 			#endif
-			.disabled(photoBackup.isSynchronizing || !photoBackup.isReady)
+			.disabled(photoBackup.isBackingUp || !photoBackup.isReady)
 		}
 	}
 }
@@ -64,7 +64,7 @@ struct PhotoBackupStatusView: View {
 
 	var body: some View {
 		VStack(alignment: .leading) {
-			if !photoBackup.isSynchronizing {
+			if !photoBackup.isBackingUp {
 				if photoBackup.lastCompletedDate > 0.0 {
 					let lastDate = Date(timeIntervalSinceReferenceDate: photoBackup.lastCompletedDate)
 					Text("Last completed \(dateFormatter.localizedString(for: lastDate, relativeTo: Date())).")
@@ -130,7 +130,7 @@ struct PhotoBackupSettingsView: View {
 						}
 					}
 					.pickerStyle(.menu)
-					.disabled(photoBackup.isSynchronizing)
+					.disabled(photoBackup.isBackingUp)
 					.onChange(of: photoBackup.selectedAlbumID) { _, _ in photoBackup.resetLastSuccessfulChangeToken() }
 				}
 				else if authorizationStatus == .denied || authorizationStatus == .restricted {
@@ -156,7 +156,7 @@ struct PhotoBackupSettingsView: View {
 						}
 					}
 					.pickerStyle(.menu)
-					.disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
+					.disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
 					.onChange(of: photoBackup.selectedFolderID) { _, _ in photoBackup.resetLastSuccessfulChangeToken() }
 				}
 			} header: {
@@ -174,7 +174,7 @@ struct PhotoBackupSettingsView: View {
 					Toggle(
 						"Copy photos periodically in the background",
 						isOn: photoBackup.$enableBackgroundCopy
-					).disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
+					).disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
 				}
 			#endif
 
@@ -187,7 +187,7 @@ struct PhotoBackupSettingsView: View {
 							photoBackup.categories.toggle(.photo, s)
 						})
 				)
-				.disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
+				.disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
 				.onChange(of: photoBackup.categories) { _, _ in photoBackup.resetLastSuccessfulChangeToken() }
 
 				Toggle(
@@ -197,7 +197,7 @@ struct PhotoBackupSettingsView: View {
 						set: { s in
 							photoBackup.categories.toggle(.livePhoto, s)
 						})
-				).disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
+				).disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
 
 				Toggle(
 					"Videos",
@@ -206,7 +206,7 @@ struct PhotoBackupSettingsView: View {
 						set: { s in
 							photoBackup.categories.toggle(.video, s)
 						})
-				).disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
+				).disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
 			}
 
 			Section {
@@ -224,7 +224,7 @@ struct PhotoBackupSettingsView: View {
 				}
 
 				PhotoFolderStructureView(folderStructure: photoBackup.$folderStructure)
-					.disabled(photoBackup.isSynchronizing)
+					.disabled(photoBackup.isBackingUp)
 					.onChange(of: photoBackup.folderStructure) { _, _ in photoBackup.resetLastSuccessfulChangeToken() }
 
 				Text("Example file location in folder: ")
@@ -240,7 +240,7 @@ struct PhotoBackupSettingsView: View {
 			if photoBackup.folderStructure.usesTimeZone {
 				Section {
 					PhotoBackupTimeZoneView(timeZone: photoBackup.$timeZone)
-						.disabled(photoBackup.isSynchronizing)
+						.disabled(photoBackup.isBackingUp)
 						.onChange(of: photoBackup.timeZone) { _, _ in photoBackup.resetLastSuccessfulChangeToken() }
 				} footer: {
 					PhotoBackupTimeZoneExplainerView(timeZone: photoBackup.timeZone)
@@ -256,7 +256,7 @@ struct PhotoBackupSettingsView: View {
 				}
 				.pickerStyle(.menu)
 				.disabled(
-					photoBackup.isSynchronizing || self.authorizationStatus != .authorized
+					photoBackup.isBackingUp || self.authorizationStatus != .authorized
 						|| photoBackup.selectedAlbumID.isEmpty
 				)
 				.onChange(of: photoBackup.savedAlbumID) { _, _ in photoBackup.resetLastSuccessfulChangeToken() }
@@ -288,7 +288,7 @@ struct PhotoBackupSettingsView: View {
 						)
 					}
 				#endif
-			}.disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
+			}.disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
 
 			Section {
 				Toggle(
@@ -304,8 +304,8 @@ struct PhotoBackupSettingsView: View {
 				Text(
 					"If you delete photos from the folder, this will be remembered for six months, so they will not be saved to the folder again during this time. Enable this setting to prevent these photos from being exported again after six months."
 				)
-			}.disabled(photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty)
-			
+			}.disabled(photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty)
+
 			// Live photo extension selector
 			Section {
 				Picker("Live photo file extension", selection: $photoBackup.livePhotoReplaceExtension) {
@@ -314,7 +314,7 @@ struct PhotoBackupSettingsView: View {
 				}
 				.pickerStyle(.menu)
 				.disabled(
-					photoBackup.isSynchronizing || photoBackup.selectedAlbumID.isEmpty || !photoBackup.categories.contains(.livePhoto))
+					photoBackup.isBackingUp || photoBackup.selectedAlbumID.isEmpty || !photoBackup.categories.contains(.livePhoto))
 			}
 
 			// Action buttons
@@ -328,7 +328,7 @@ struct PhotoBackupSettingsView: View {
 				Button("Re-copy all photos", systemImage: "photo.badge.arrow.down.fill") {
 					photoBackup.backup(appState: self.appState, fullExport: true, isInBackground: false)
 				}
-				.disabled(photoBackup.isSynchronizing || !photoBackup.isReady)
+				.disabled(photoBackup.isBackingUp || !photoBackup.isReady)
 				#if os(macOS)
 					.buttonStyle(.link)
 				#endif

Sushitrain/StartView.swift

@@ -27,7 +27,7 @@ import SwiftUI
 						VStack(alignment: .leading, spacing: 10) {
 							OverallStatusView().frame(maxWidth: .infinity)
 
-							if appState.photoBackup.isSynchronizing {
+							if appState.photoBackup.isBackingUp {
 								PhotoBackupProgressView(photoBackup: appState.photoBackup)
 							}