Skip to content

Defer accessing fetchResults settings #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Defer accessing fetchResults settings #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e41826
change fetchResults from a var to a function
natecraft1 Dec 3, 2020
7dda237
call fetchResults as a function
natecraft1 Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Controller/ImagePickerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import Photos
let fetchOptions = settings.fetch.assets.options.copy() as! PHFetchOptions
fetchOptions.fetchLimit = 1

return settings.fetch.album.fetchResults.filter {
return settings.fetch.album.fetchResults().filter {
$0.count > 0
}.flatMap {
$0.objects(at: IndexSet(integersIn: 0..<$0.count))
Expand Down
8 changes: 5 additions & 3 deletions Sources/Model/Settings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,11 @@ import Photos
/// PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumSelfPortraits, options: options),
/// PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumPanoramas, options: options),
/// PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumVideos, options: options),
public lazy var fetchResults: [PHFetchResult<PHAssetCollection>] = [
PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumUserLibrary, options: options),
]
public lazy var fetchResults: () -> [PHFetchResult<PHAssetCollection>] = { [options] in
Copy link

@tinder-owenthomas tinder-owenthomas Dec 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public lazy var fetchResults: () -> [PHFetchResult<PHAssetCollection>] = { [options] in
public lazy var fetchResults: () -> [PHFetchResult<PHAssetCollection>] = {

return [
Copy link

@tinder-owenthomas tinder-owenthomas Dec 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return [
[

PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumUserLibrary, options: options),
]
}
}

@objc(BSImagePickerAssets)
Expand Down