Skip to content
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

Jump to bottom

Change handlerRequiredFilter to check for .forcegallery #4627

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Change handlerRequiredFilter to check for .forcegallery #4627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions internal/manager/task_scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ func (f *handlerRequiredFilter) Accept(ctx context.Context, ff models.File) bool
// if create galleries from folder is enabled and the file is not in a zip
// file, then check if there is a folder-based gallery for the file's
// directory
if isImageFile && instance.Config.GetCreateGalleriesFromFolders() && ff.Base().ZipFileID == nil {
// #4611 - also check for .forcegallery
if isImageFile && ff.Base().ZipFileID == nil {
// only do this for the first time it encounters the folder
// the first instance should create the gallery
_, found := f.FolderCache.Get(ctx, ff.Base().ParentFolderID.String())
Expand All @@ -185,9 +186,23 @@ func (f *handlerRequiredFilter) Accept(ctx context.Context, ff models.File) bool
return false
}

g, _ := f.GalleryFinder.FindByFolderID(ctx, ff.Base().ParentFolderID)
f.FolderCache.Add(ctx, ff.Base().ParentFolderID.String(), true)

createGallery := instance.Config.GetCreateGalleriesFromFolders()
if !createGallery {
// check for presence of .forcegallery
forceGalleryPath := filepath.Join(filepath.Dir(path), ".forcegallery")
if exists, _ := fsutil.FileExists(forceGalleryPath); exists {
createGallery = true
}
}

if !createGallery {
return false
}

g, _ := f.GalleryFinder.FindByFolderID(ctx, ff.Base().ParentFolderID)

if len(g) == 0 {
// no folder gallery. Return true so that it creates one.
return true
Expand Down
Loading