Add image-count sorting, and image deletion on gallery deletion (#853)

pkg/api/resolver_mutation_gallery.go

@@ -411,10 +411,13 @@ func adjustGalleryTagIDs(tx *sqlx.Tx, galleryID int, ids models.BulkUpdateIds) (
 
 func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.GalleryDestroyInput) (bool, error) {
 	qb := models.NewGalleryQueryBuilder()
+	iqb := models.NewImageQueryBuilder()
 	tx := database.DB.MustBeginTx(ctx, nil)
 
 	var galleries []*models.Gallery
 	var imgsToPostProcess []*models.Image
+	var imgsToDelete []*models.Image
+
 	for _, id := range input.Ids {
 		galleryID, _ := strconv.Atoi(id)
 
@@ -430,8 +433,7 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 		}
 
 		// if this is a zip-based gallery, delete the images as well
-		if gallery.Path.Valid {
-			iqb := models.NewImageQueryBuilder()
+		if gallery.Zip {
 			imgs, err := iqb.FindByGalleryID(galleryID)
 			if err != nil {
 				tx.Rollback()
@@ -439,7 +441,7 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 			}
 
 			for _, img := range imgs {
-				err = qb.Destroy(img.ID, tx)
+				err = iqb.Destroy(img.ID, tx)
 				if err != nil {
 					tx.Rollback()
 					return false, err
@@ -447,6 +449,32 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 
 				imgsToPostProcess = append(imgsToPostProcess, img)
 			}
+		} else if input.DeleteFile != nil && *input.DeleteFile {
+			// Delete image if it is only attached to this gallery
+			imgs, err := iqb.FindByGalleryID(galleryID)
+			if err != nil {
+				tx.Rollback()
+				return false, err
+			}
+
+			for _, img := range imgs {
+				imgGalleries, err := qb.FindByImageID(img.ID, tx)
+				if err != nil {
+					tx.Rollback()
+					return false, err
+				}
+
+				if len(imgGalleries) == 0 {
+					err = iqb.Destroy(img.ID, tx)
+					if err != nil {
+						tx.Rollback()
+						return false, err
+					}
+
+					imgsToDelete = append(imgsToDelete, img)
+					imgsToPostProcess = append(imgsToPostProcess, img)
+				}
+			}
 		}
 	}
 
@@ -460,6 +488,10 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 		for _, gallery := range galleries {
 			manager.DeleteGalleryFile(gallery)
 		}
+
+		for _, img := range imgsToDelete {
+			manager.DeleteImageFile(img)
+		}
 	}
 
 	// if delete generated is true, then delete the generated files

pkg/models/querybuilder_gallery.go

@@ -181,6 +181,8 @@ func (qb *GalleryQueryBuilder) Query(galleryFilter *GalleryFilterType, findFilte
 		left join performers_galleries as performers_join on performers_join.gallery_id = galleries.id
 		left join studios as studio on studio.id = galleries.studio_id
 		left join galleries_tags as tags_join on tags_join.gallery_id = galleries.id
+		left join galleries_images as images_join on images_join.gallery_id = galleries.id
+		left join images on images_join.image_id = images.id
 	`
 
 	if q := findFilter.Q; q != nil && *q != "" {

ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx

@@ -76,11 +76,13 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
       </p>
       <Form>
         <Form.Check
+          id="delete-file"
           checked={deleteFile}
-          label="Delete zip file (if applicable)"
+          label="Delete zip file and any images not attached to any other gallery."
           onChange={() => setDeleteFile(!deleteFile)}
         />
         <Form.Check
+          id="delete-generated"
           checked={deleteGenerated}
           label="Delete generated supporting files"
           onChange={() => setDeleteGenerated(!deleteGenerated)}

ui/v2.5/src/components/Shared/Modal.tsx

@@ -56,6 +56,7 @@ const ModalComponent: React.FC<IModal> = ({
           disabled={isRunning || disabled}
           variant={accept?.variant ?? "primary"}
           onClick={accept?.onClick}
+          className="ml-2"
         >
           {isRunning ? (
             <Spinner animation="border" role="status" size="sm" />

ui/v2.5/src/models/list-filter/filter.ts

@@ -222,7 +222,7 @@ export class ListFilterModel {
         break;
       case FilterMode.Galleries:
         this.sortBy = "path";
-        this.sortByOptions = ["path"];
+        this.sortByOptions = ["path", "images_count"];
         this.displayModeOptions = [DisplayMode.Grid, DisplayMode.List];
         this.criterionOptions = [
           new NoneCriterionOption(),