clean up some old code
- ID
035b996- date
2023-06-09 23:52:52+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
afd6660- message
clean up some old code- changed files
1 file, 96 additions, 152 deletions
Changed files
BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift (12176) → BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift (9729)
diff --git a/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift b/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
index 9c6a5d5..55e7fe9 100644
--- a/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
@@ -25,8 +25,6 @@ struct PhotoReviewer: View {
photosLibrary.assets2.object(at: focusedAssetIndex)
}
- @State var selectedAssetIndex: Int = -1
-
@State var showStatistics: Bool = false
@State var showDebug: Bool = true
@@ -63,58 +61,6 @@ struct PhotoReviewer: View {
.onChange(of: focusedAsset) { newFocusedAsset in
focusedAssetImage.asset = newFocusedAsset
}
-//
-// VStack {
-// let binding = Binding {
-// selectedAssetIndex == -1 ? photosLibrary.assets2.count - 1 : selectedAssetIndex
-// } set: {
-// self.selectedAssetIndex = $0
-// }
-//
-// ThumbnailList(selectedAssetIndex: binding)
-// .environmentObject(photosLibrary)
-// .background(.gray.opacity(0.3))
-//
-// FullSizeImage(image: fullSizeImage)
-// .background(.black)
-// }
-// .background(.black)
-// .onAppear {
-// selectedAssetIndex = photosLibrary.assets2.count - 1
-//
-// fullSizeImage.asset = photosLibrary.assets2.object(at: photosLibrary.assets2.count - 1 - selectedAssetIndex)
-//
-// NSEvent.addLocalMonitorForEvents(matching: .keyDown) { event in
-// handleKeyEvent(event)
-// return event
-// }
-// }.onChange(of: selectedAssetIndex, perform: { newIndex in
-// fullSizeImage.asset = photosLibrary.assets2.object(at: photosLibrary.assets2.count - 1 - newIndex)
-// })
-//
-// HStack {
-// Spacer()
-//
-// VStack {
-// Spacer()
-//
-// if showStatistics {
-// Statistics().environmentObject(photosLibrary)
-// }
-//
-// if showDebug {
-// Text("\(fullSizeImage.asset?.localIdentifier ?? "(none)")")
-// .font(.title)
-// .padding(10)
-// .foregroundColor(.white)
-// .background(.black.opacity(0.7))
-// .cornerRadius(7.0)
-// .shadow(radius: 2.0)
-// }
-// }
-// .padding()
-// }.padding()
-// }
} else {
Text("Waiting for Photos Library authorization…")
}
@@ -172,7 +118,7 @@ struct PhotoReviewer: View {
}
}
- if selectedAssetIndex < photosLibrary.assets2.count - 1 {
+ if focusedAssetIndex < photosLibrary.assets2.count - 1 {
focusedAssetIndex += 1
}
@@ -184,8 +130,6 @@ struct PhotoReviewer: View {
}
case let e where e.characters == "f":
- let crossStitch = getAlbum(withName: "Cross stitch")
-
try! PHPhotoLibrary.shared().performChangesAndWait {
PHAssetChangeRequest(for: focusedAsset).isFavorite = !focusedAsset.isFavorite
}
@@ -195,103 +139,103 @@ struct PhotoReviewer: View {
break
}
}
-
- private func handleKeyEvent(_ event: NSEvent) {
- let asset = photosLibrary.assets2.object(at: photosLibrary.assets2.count - 1 - selectedAssetIndex)
-
- switch event.keyCode {
- case 123: // Left arrow key
- if selectedAssetIndex > 0 {
- selectedAssetIndex -= 1
- }
-
- case 124: // Right arrow key
- if selectedAssetIndex < photosLibrary.assets2.count - 1 {
- selectedAssetIndex += 1
- }
-
- case 18, 19, 20: // "1", "2", "3"
- let state = photosLibrary.state(for: asset)
-
- let approved = getAlbum(withName: "Approved")
- let rejected = getAlbum(withName: "Rejected")
- let needsAction = getAlbum(withName: "Needs Action")
-
- try! PHPhotoLibrary.shared().performChangesAndWait {
- // Strictly speaking, the first condition is a combination of two:
- //
- // 1. The action is `toggle-approved` and the photo is approved,
- // in which case toggling means un-approving it.
- // 2. The action is anything else and the photo is approved, in
- // which case setting the new status means removing approved.
- //
- // Similar logic applies for all three conditions.
- if state == .Approved {
- print("removing asset \(asset.localIdentifier) from approved")
- asset.remove(fromAlbum: approved)
- } else if event.keyCode == 18 {
- print("adding asset \(asset.localIdentifier) to approved")
- asset.add(toAlbum: approved)
- }
-
- if state == .Rejected {
- asset.remove(fromAlbum: rejected)
- } else if event.keyCode == 19 {
- asset.add(toAlbum: rejected)
- }
-
- if state == .NeedsAction {
- asset.remove(fromAlbum: needsAction)
- } else if event.keyCode == 20 {
- asset.add(toAlbum: needsAction)
- }
- }
-
- photosLibrary.updateAsset(atIndex: selectedAssetIndex)
-
- if selectedAssetIndex > 0 {
- selectedAssetIndex -= 1
- }
-
- case 3: // "f"
- try! PHPhotoLibrary.shared().performChangesAndWait {
- PHAssetChangeRequest(for: asset).isFavorite = !asset.isFavorite
- }
-
- photosLibrary.updateAsset(atIndex: selectedAssetIndex)
-
- case 8: // "c"
- let crossStitch = getAlbum(withName: "Cross stitch")
-
- try! PHPhotoLibrary.shared().performChangesAndWait {
- asset.toggle(inAlbum: crossStitch)
- }
-
- photosLibrary.updateAsset(atIndex: selectedAssetIndex)
-
- case 32: // "u"
- print("not implemented yet!")
-// if photosLibrary.state(for: asset) != nil {
-// let lastUnreviewed = photosLibrary.assets2
//
-// [0..<selectedAssetIndex].lastIndex(where: { asset in
-// photosLibrary.state(for: asset) == nil
-// })
+// private func handleKeyEvent(_ event: NSEvent) {
+// let asset = photosLibrary.assets2.object(at: photosLibrary.assets2.count - 1 - selectedAssetIndex)
//
-// if let theIndex = lastUnreviewed {
-// selectedAssetIndex = theIndex
+// switch event.keyCode {
+// case 123: // Left arrow key
+// if selectedAssetIndex > 0 {
+// selectedAssetIndex -= 1
+// }
+//
+// case 124: // Right arrow key
+// if selectedAssetIndex < photosLibrary.assets2.count - 1 {
+// selectedAssetIndex += 1
+// }
+//
+// case 18, 19, 20: // "1", "2", "3"
+// let state = photosLibrary.state(for: asset)
+//
+// let approved = getAlbum(withName: "Approved")
+// let rejected = getAlbum(withName: "Rejected")
+// let needsAction = getAlbum(withName: "Needs Action")
+//
+// try! PHPhotoLibrary.shared().performChangesAndWait {
+// // Strictly speaking, the first condition is a combination of two:
+// //
+// // 1. The action is `toggle-approved` and the photo is approved,
+// // in which case toggling means un-approving it.
+// // 2. The action is anything else and the photo is approved, in
+// // which case setting the new status means removing approved.
+// //
+// // Similar logic applies for all three conditions.
+// if state == .Approved {
+// print("removing asset \(asset.localIdentifier) from approved")
+// asset.remove(fromAlbum: approved)
+// } else if event.keyCode == 18 {
+// print("adding asset \(asset.localIdentifier) to approved")
+// asset.add(toAlbum: approved)
+// }
+//
+// if state == .Rejected {
+// asset.remove(fromAlbum: rejected)
+// } else if event.keyCode == 19 {
+// asset.add(toAlbum: rejected)
+// }
+//
+// if state == .NeedsAction {
+// asset.remove(fromAlbum: needsAction)
+// } else if event.keyCode == 20 {
+// asset.add(toAlbum: needsAction)
// }
// }
-
- case 1: // "s"
- showStatistics.toggle()
-
- case 2: // "d"
- showDebug.toggle()
-
- default:
- print(event)
- break
- }
- }
+//
+// photosLibrary.updateAsset(atIndex: selectedAssetIndex)
+//
+// if selectedAssetIndex > 0 {
+// selectedAssetIndex -= 1
+// }
+//
+// case 3: // "f"
+// try! PHPhotoLibrary.shared().performChangesAndWait {
+// PHAssetChangeRequest(for: asset).isFavorite = !asset.isFavorite
+// }
+//
+// photosLibrary.updateAsset(atIndex: selectedAssetIndex)
+//
+// case 8: // "c"
+// let crossStitch = getAlbum(withName: "Cross stitch")
+//
+// try! PHPhotoLibrary.shared().performChangesAndWait {
+// asset.toggle(inAlbum: crossStitch)
+// }
+//
+// photosLibrary.updateAsset(atIndex: selectedAssetIndex)
+//
+// case 32: // "u"
+// print("not implemented yet!")
+//// if photosLibrary.state(for: asset) != nil {
+//// let lastUnreviewed = photosLibrary.assets2
+////
+//// [0..<selectedAssetIndex].lastIndex(where: { asset in
+//// photosLibrary.state(for: asset) == nil
+//// })
+////
+//// if let theIndex = lastUnreviewed {
+//// selectedAssetIndex = theIndex
+//// }
+//// }
+//
+// case 1: // "s"
+// showStatistics.toggle()
+//
+// case 2: // "d"
+// showDebug.toggle()
+//
+// default:
+// print(event)
+// break
+// }
+// }
}