Skip to content

Commit 1999082

Browse files
committed
Remove saved-files toggle handlers
Remove legacy selection toggle and persistence logic for saved files. Deleted CullingModel.verifytoggleSelectionSavedFiles and CullingModel.toggleSelectionSavedFiles (which added/removed FileRecord entries and wrote savedFiles JSON) and removed RawCullViewModel.toggleTag that invoked the model toggle. This cleans up the culling selection/persistence code (presumably refactored or centralized elsewhere).
1 parent f46c1b9 commit 1999082

2 files changed

Lines changed: 0 additions & 72 deletions

File tree

RawCull/Model/ViewModels/CullingModel.swift

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,70 +22,6 @@ final class CullingModel {
2222
}
2323
}
2424

25-
private func verifytoggleSelectionSavedFiles(in arwcatalog: URL, toggledfilename: String) -> Bool {
26-
if let index = savedFiles.firstIndex(where: { $0.catalog == arwcatalog }) {
27-
if savedFiles[index].filerecords == nil { return false
28-
} else {
29-
let verify = savedFiles[index].filerecords?.filter { $0.fileName == toggledfilename }
30-
if verify?.isEmpty == false {
31-
// Existing photo, remove photo
32-
return true
33-
}
34-
}
35-
}
36-
return false
37-
}
38-
39-
func toggleSelectionSavedFiles(in fileurl: URL?, toggledfilename: String) async {
40-
if let fileurl {
41-
let arwcatalog = fileurl.deletingLastPathComponent()
42-
43-
if verifytoggleSelectionSavedFiles(in: arwcatalog, toggledfilename: toggledfilename) {
44-
// Remove item
45-
if let index = savedFiles.firstIndex(where: { $0.catalog == arwcatalog }) {
46-
savedFiles[index].filerecords?.removeAll { record in
47-
record.fileName == toggledfilename
48-
}
49-
}
50-
} else {
51-
// New item
52-
let newrecord = FileRecord(
53-
fileName: toggledfilename,
54-
dateTagged: Date().en_string_from_date(),
55-
dateCopied: nil,
56-
rating: 3,
57-
)
58-
59-
if savedFiles.isEmpty {
60-
let savedfiles = SavedFiles(
61-
catalog: arwcatalog,
62-
dateStart: Date().en_string_from_date(),
63-
filerecord: newrecord,
64-
)
65-
savedFiles.append(savedfiles)
66-
} else {
67-
// Check if arw catalog exists in data structure
68-
if let index = savedFiles.firstIndex(where: { $0.catalog == arwcatalog }) {
69-
if savedFiles[index].filerecords == nil {
70-
savedFiles[index].filerecords = [newrecord]
71-
} else {
72-
savedFiles[index].filerecords?.append(newrecord)
73-
}
74-
} else {
75-
// If not append a new one
76-
let savedfiles = SavedFiles(
77-
catalog: arwcatalog,
78-
dateStart: Date().en_string_from_date(),
79-
filerecord: newrecord,
80-
)
81-
savedFiles.append(savedfiles)
82-
}
83-
}
84-
}
85-
await WriteSavedFilesJSON.write(savedFiles)
86-
}
87-
}
88-
8925
func countSelectedFiles(in catalog: URL) -> Int {
9026
if let index = savedFiles.firstIndex(where: { $0.catalog == catalog }) {
9127
if let filerecords = savedFiles[index].filerecords {

RawCull/Model/ViewModels/RawCullViewModel+Culling.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,4 @@ extension RawCullViewModel {
176176
}
177177
rebuildRatingCache()
178178
}
179-
180-
func toggleTag(for file: FileItem) async {
181-
await cullingModel.toggleSelectionSavedFiles(
182-
in: file.url,
183-
toggledfilename: file.name,
184-
)
185-
rebuildRatingCache()
186-
}
187179
}

0 commit comments

Comments
 (0)