feat: support year-month folder structure for photo backup/folders (fixes #262)

Author: pixelspark

Localizable.xcstrings

@@ -1140,6 +1140,74 @@
         }
       }
     },
+    "2024-08/IMG_2020.HEIC" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/IMG_2020.HEIC"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/IMG_2020.HEIC"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/IMG_2020.HEIC"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/IMG_2020.HEIC"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/IMG_2020.HEIC"
+          }
+        }
+      }
+    },
+    "2024-08/Video/IMG_2020.MOV" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/Video/IMG_2020.MOV"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/Video/IMG_2020.MOV"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/Video/IMG_2020.MOV"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/Video/IMG_2020.MOV"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2024-08/Video/IMG_2020.MOV"
+          }
+        }
+      }
+    },
     "2024/08/11/IMG_2020.HEIC" : {
       "localizations" : {
         "de" : {
@@ -25342,6 +25410,74 @@
         }
       }
     },
+    "Year-month" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jahr-Monat"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Año-mes"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Anno-mese"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jaar-maand"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Рік-місяць"
+          }
+        }
+      }
+    },
+    "Year-month/Type" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jahr-Monat/Typ"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Año-mes/Tipo"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Anno-mese/Tipo"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jaar-maand/Type"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Рік-місяць/Тип"
+          }
+        }
+      }
+    },
     "Year/Month" : {
       "localizations" : {
         "de" : {

Sushitrain/PhotoBackup.swift

@@ -46,6 +46,8 @@ enum PhotoBackupFolderStructure: String, Codable {
 	case byYear = "byYear"
 	case byYearAndType = "byYearAndType"
 	case byYearMonth = "byYearMonth"
+	case byYearDashMonth = "byYearDashMonth"
+	case byYearDashMonthAndType = "byYearDashMonthAndType"
 	case byYearMonthAndType = "byYearMonthAndType"
 	case singleFolder = "singleFolder"
 	case singleFolderDatePrefixed = "singleFolderDatePrefixed"
@@ -60,6 +62,8 @@ enum PhotoBackupFolderStructure: String, Codable {
 		case .byYearAndType: return String(localized: "2024/Video/IMG_2020.MOV")
 		case .byYearMonth: return String(localized: "2024/08/IMG_2020.HEIC")
 		case .byYearMonthAndType: return String(localized: "2024/08/Video/IMG_2020.MOV")
+		case .byYearDashMonth: return String(localized: "2024-08/IMG_2020.HEIC")
+		case .byYearDashMonthAndType: return String(localized: "2024-08/Video/IMG_2020.MOV")
 		case .byType: return String(localized: "Video/IMG_2020.MOV")
 		case .singleFolder: return String(localized: "IMG_2020.MOV")
 		case .singleFolderDatePrefixed: return String(localized: "2024-08-11_IMG_2020.MOV")
@@ -69,7 +73,7 @@ enum PhotoBackupFolderStructure: String, Codable {
 	var usesTimeZone: Bool {
 		switch self {
 		case .byDate, .byDateAndType, .byDateComponent, .byDateComponentAndType, .singleFolderDatePrefixed,
-			.byYear, .byYearMonth, .byYearAndType, .byYearMonthAndType:
+			.byYear, .byYearMonth, .byYearAndType, .byYearMonthAndType, .byYearDashMonth, .byYearDashMonthAndType:
 			return true
 		case .byType, .singleFolder: return false
 		}
@@ -86,6 +90,9 @@ enum PhotoBackupFolderStructure: String, Codable {
 		case .byYearMonth, .byYearMonthAndType:
 			return ["yyyy", "MM"]
 
+		case .byYearDashMonth, .byYearDashMonthAndType:
+			return ["yyyy-MM"]
+
 		case .byType, .singleFolder, .byDate, .byDateAndType, .singleFolderDatePrefixed:
 			return []
 		}
@@ -835,7 +842,8 @@ extension PHAsset {
 				components.append(dateString)
 			}
 
-		case .byDateComponent, .byDateComponentAndType, .byYear, .byYearMonth, .byYearAndType, .byYearMonthAndType:
+		case .byDateComponent, .byDateComponentAndType, .byYear, .byYearMonth, .byYearAndType, .byYearMonthAndType,
+			.byYearDashMonth, .byYearDashMonthAndType:
 			if let creationDate = self.creationDate {
 				let dateComponents = structure.dateComponentsForPath
 				let dateFormatter = self.dateFormatter(timeZone: timeZone)
@@ -851,11 +859,12 @@ extension PHAsset {
 
 		// Postfix media type
 		switch structure {
-		case .byDateAndType, .byType, .byDateComponentAndType, .byYearAndType, .byYearMonthAndType:
+		case .byDateAndType, .byType, .byDateComponentAndType, .byYearAndType, .byYearMonthAndType, .byYearDashMonthAndType:
 			if self.mediaType == .video {
 				components.append("Video")
 			}
-		case .byDate, .singleFolder, .singleFolderDatePrefixed, .byDateComponent, .byYear, .byYearMonth: break
+		case .byDate, .singleFolder, .singleFolderDatePrefixed, .byDateComponent, .byYear, .byYearMonth, .byYearDashMonth:
+			break
 		}
 
 		return components
@@ -868,9 +877,10 @@ extension PHAsset {
 	{
 		var path = self.directoryPathInFolder(structure: structure, subdirectoryPath: subdirectoryPath, timeZone: timeZone)
 		switch structure {
-		case .byDateAndType, .byType, .byDateComponentAndType, .byYearAndType, .byYearMonthAndType:
+		case .byDateAndType, .byType, .byDateComponentAndType, .byYearAndType, .byYearMonthAndType, .byYearDashMonthAndType:
 			path = path.appending("Live", isDirectory: true)
-		case .byDate, .singleFolder, .singleFolderDatePrefixed, .byDateComponent, .byYear, .byYearMonth: break
+		case .byDate, .singleFolder, .singleFolderDatePrefixed, .byDateComponent, .byYear, .byYearMonth, .byYearDashMonth:
+			break
 		}
 		return path
 	}
@@ -888,7 +898,7 @@ extension PHAsset {
 	func fileNameInFolder(structure: PhotoBackupFolderStructure) -> String {
 		switch structure {
 		case .byDate, .byDateAndType, .byDateComponent, .byDateComponentAndType, .singleFolder, .byType, .byYear,
-			.byYearMonth, .byYearAndType, .byYearMonthAndType:
+			.byYearMonth, .byYearAndType, .byYearMonthAndType, .byYearDashMonth, .byYearDashMonthAndType:
 			return self.originalFilename
 
 		case .singleFolderDatePrefixed:

Sushitrain/PhotoBackupView.swift

@@ -379,6 +379,8 @@ struct PhotoFolderStructureView: View {
 			Text("Year/Type").tag(PhotoBackupFolderStructure.byYearAndType)
 			Text("Year/Month").tag(PhotoBackupFolderStructure.byYearMonth)
 			Text("Year/Month/Type").tag(PhotoBackupFolderStructure.byYearMonthAndType)
+			Text("Year-month").tag(PhotoBackupFolderStructure.byYearDashMonth)
+			Text("Year-month/Type").tag(PhotoBackupFolderStructure.byYearDashMonthAndType)
 			Text("Year/Month/Day").tag(PhotoBackupFolderStructure.byDateComponent)
 			Text("Year/Month/Day/Type").tag(PhotoBackupFolderStructure.byDateComponentAndType)
 		}