fix some crappy naming choices
- ID
5db1c53- date
2023-06-11 05:08:52+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
758e3ec- message
fix some crappy naming choices- changed files
Changed files
BlinkReviewer/BlinkReviewer/Photos/PhotosLibrary.swift (6877) → BlinkReviewer/BlinkReviewer/Photos/PhotosLibrary.swift (6873)
diff --git a/BlinkReviewer/BlinkReviewer/Photos/PhotosLibrary.swift b/BlinkReviewer/BlinkReviewer/Photos/PhotosLibrary.swift
index 3a631d8..fa7fae5 100644
--- a/BlinkReviewer/BlinkReviewer/Photos/PhotosLibrary.swift
+++ b/BlinkReviewer/BlinkReviewer/Photos/PhotosLibrary.swift
@@ -12,7 +12,7 @@ class PhotosLibrary: NSObject, ObservableObject, PHPhotoLibraryChangeObserver {
@Published var isPhotoLibraryAuthorized = false
- @Published var assets2: PHFetchResult<PHAsset> = PHFetchResult()
+ @Published var assets: PHFetchResult<PHAsset> = PHFetchResult()
@Published var approvedAssets: PHFetchResult<PHAsset> = PHFetchResult()
@Published var rejectedAssets: PHFetchResult<PHAsset> = PHFetchResult()
@@ -69,8 +69,8 @@ class PhotosLibrary: NSObject, ObservableObject, PHPhotoLibraryChangeObserver {
let options = PHFetchOptions()
options.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
- if let assetsChangeDetails = changeInstance.changeDetails(for: self.assets2) {
- self.assets2 = assetsChangeDetails.fetchResultAfterChanges
+ if let assetsChangeDetails = changeInstance.changeDetails(for: self.assets) {
+ self.assets = assetsChangeDetails.fetchResultAfterChanges
self.latestChangeDetails = assetsChangeDetails
}
@@ -114,7 +114,7 @@ class PhotosLibrary: NSObject, ObservableObject, PHPhotoLibraryChangeObserver {
self.isPhotoLibraryAuthorized = PHPhotoLibrary.authorizationStatus() == .authorized
if (self.isPhotoLibraryAuthorized) {
- self.assets2 = PHAsset.fetchAssets(with: PHAssetMediaType.image, options: options)
+ self.assets = PHAsset.fetchAssets(with: PHAssetMediaType.image, options: options)
self.approvedAssets = PHAsset.fetchAssets(in: self.approved, options: nil)
self.rejectedAssets = PHAsset.fetchAssets(in: self.rejected, options: nil)
BlinkReviewer/BlinkReviewer/Views/Info/Statistics.swift (728) → BlinkReviewer/BlinkReviewer/Views/Info/Statistics.swift (727)
diff --git a/BlinkReviewer/BlinkReviewer/Views/Info/Statistics.swift b/BlinkReviewer/BlinkReviewer/Views/Info/Statistics.swift
index ed0444f..b69813e 100644
--- a/BlinkReviewer/BlinkReviewer/Views/Info/Statistics.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/Info/Statistics.swift
@@ -8,7 +8,7 @@ struct Statistics: View {
@EnvironmentObject var photosLibrary: PhotosLibrary
var body: some View {
- Text("\(photosLibrary.assets2.count) photos, \(photosLibrary.approvedAssets.count) approved, \(photosLibrary.rejectedAssets.count) rejected, \(photosLibrary.needsActionAssets.count) need action")
+ Text("\(photosLibrary.assets.count) photos, \(photosLibrary.approvedAssets.count) approved, \(photosLibrary.rejectedAssets.count) rejected, \(photosLibrary.needsActionAssets.count) need action")
.font(.title)
.padding(10)
.foregroundColor(.white)
BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift (14325) → BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift (14313)
diff --git a/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift b/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
index 4a96772..f0b3fd7 100644
--- a/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
@@ -26,7 +26,7 @@ struct PhotoReviewer: View {
@State var _focusedAsset: PHAsset? = nil
var focusedAsset: PHAsset {
- return photosLibrary.assets2.object(at: focusedAssetIndex)
+ return photosLibrary.assets.object(at: focusedAssetIndex)
}
@State var showStatistics: Bool = false
@@ -40,7 +40,7 @@ struct PhotoReviewer: View {
var body: some View {
if !photosLibrary.isPhotoLibraryAuthorized {
Text("Waiting for Photos Library authorization…")
- } else if photosLibrary.assets2.count == 0 {
+ } else if photosLibrary.assets.count == 0 {
Text("Waiting for Photos Library data…")
} else {
ZStack {
@@ -126,7 +126,7 @@ struct PhotoReviewer: View {
//
// e.g. the change is about album data, or all the changes are further
// along than the focused asset.
- if photosLibrary.assets2.object(at: focusedAssetIndex) == self._focusedAsset {
+ if photosLibrary.assets.object(at: focusedAssetIndex) == self._focusedAsset {
logger.debug("Focused asset is in the same place as before, nothing to do [\(changeId, privacy: .public)]")
return
}
@@ -175,7 +175,7 @@ struct PhotoReviewer: View {
// If we've got a delta, check to see if it points us to the right asset.
//
// If it does, we're done!
- if photosLibrary.assets2.object(at: focusedAssetIndex + (delta ?? 0)) == self._focusedAsset {
+ if photosLibrary.assets.object(at: focusedAssetIndex + (delta ?? 0)) == self._focusedAsset {
logger.debug("Incremental changes found the new position of the asset [\(changeId, privacy: .public)]")
focusedAssetIndex += delta ?? 0
return
@@ -194,9 +194,9 @@ struct PhotoReviewer: View {
// This is potentially quite slow, especially if we've already gone a long way
// into the Photos Library, which is why we leave it for last.
let matchingAssetInUpdatedLibrary =
- (0..<photosLibrary.assets2.count)
+ (0..<photosLibrary.assets.count)
.first(where: {
- photosLibrary.assets2.object(at: $0).localIdentifier ==
+ photosLibrary.assets.object(at: $0).localIdentifier ==
self._focusedAsset?.localIdentifier
})
@@ -223,7 +223,7 @@ struct PhotoReviewer: View {
switch event {
case let e where e.specialKey == NSEvent.SpecialKey.leftArrow:
print("to the left!")
- if focusedAssetIndex < photosLibrary.assets2.count - 1 {
+ if focusedAssetIndex < photosLibrary.assets.count - 1 {
focusedAssetIndex += 1
}
@@ -274,7 +274,7 @@ struct PhotoReviewer: View {
}
}
- if focusedAssetIndex < photosLibrary.assets2.count - 1 {
+ if focusedAssetIndex < photosLibrary.assets.count - 1 {
focusedAssetIndex += 1
}
@@ -301,8 +301,8 @@ struct PhotoReviewer: View {
case let e where e.characters == "u":
if photosLibrary.state(of: focusedAsset) != nil {
- if let lastUnreviewed = (focusedAssetIndex..<photosLibrary.assets2.count).first(where: { index in
- photosLibrary.state(of: photosLibrary.assets2.object(at: index)) == nil
+ if let lastUnreviewed = (focusedAssetIndex..<photosLibrary.assets.count).first(where: { index in
+ photosLibrary.state(of: photosLibrary.assets.object(at: index)) == nil
}) {
focusedAssetIndex = lastUnreviewed
}
@@ -310,9 +310,9 @@ struct PhotoReviewer: View {
case let e where e.characters == "?":
while true {
- let randomIndex = (0..<photosLibrary.assets2.count).randomElement()!
+ let randomIndex = (0..<photosLibrary.assets.count).randomElement()!
- if photosLibrary.state(of: photosLibrary.assets2.object(at: randomIndex)) == nil {
+ if photosLibrary.state(of: photosLibrary.assets.object(at: randomIndex)) == nil {
focusedAssetIndex = randomIndex
break
}
BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift (1085) → BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift (1083)
diff --git a/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift b/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift
index d420c96..29c228c 100644
--- a/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift
@@ -13,7 +13,7 @@ struct ThumbnailList: View {
var body: some View {
ScrollViewReader { proxy in
- PHAssetHStack(photosLibrary.assets2) { asset, index in
+ PHAssetHStack(photosLibrary.assets) { asset, index in
ThumbnailImage(
assetImage: photosLibrary.getThumbnail(for: asset),
state: photosLibrary.state(of: asset),
@@ -26,7 +26,7 @@ struct ThumbnailList: View {
.onChange(of: focusedAssetIndex, perform: { newIndex in
withAnimation {
proxy.scrollTo(
- photosLibrary.assets2.object(at: newIndex).localIdentifier,
+ photosLibrary.assets.object(at: newIndex).localIdentifier,
anchor: .center
)
}