Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correctly delete files when specified (#2804)

Browse Source
This commit is contained in:
WithoutPants
2022-08-08 10:48:02 +10:00
parent 5843fdcecc
commit c825cf5d09
6 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/file/delete.go
View File

@@ -181,7 +181,7 @@ func Destroy(ctx context.Context, destroyer Destroyer, f File, fileDeleter *Dele
}
// don't delete files in zip files
if deleteFile && f.Base().ZipFileID != nil {
if deleteFile && f.Base().ZipFileID == nil {
if err := fileDeleter.Files([]string{f.Base().Path}); err != nil {
return err
}
@@ -190,17 +190,24 @@ func Destroy(ctx context.Context, destroyer Destroyer, f File, fileDeleter *Dele
return nil
}
type FolderGetterDestroyer interface {
FolderGetter
FolderDestroyer
}
type ZipDestroyer struct {
FileDestroyer Destroyer
FileDestroyer GetterDestroyer
FolderDestroyer FolderGetterDestroyer
}
func (d *ZipDestroyer) DestroyZip(ctx context.Context, f File, fileDeleter *Deleter, deleteFile bool) error {
// destroy contained files
files, err := d.FileDestroyer.FindByZipFileID(ctx, f.Base().ID)
if err != nil {
return err
}
for _, ff := range files {
if err := d.FileDestroyer.Destroy(ctx, ff.Base().ID); err != nil {
return err
}
}
// destroy contained folders
folders, err := d.FolderDestroyer.FindByZipFileID(ctx, f.Base().ID)
if err != nil {

5
pkg/file/file.go
View File

@@ -177,6 +177,11 @@ type Destroyer interface {
Destroy(ctx context.Context, id ID) error
}
type GetterDestroyer interface {
Getter
Destroyer
}
// Store provides methods to find, create and update Files.
type Store interface {
Getter

5
pkg/file/folder.go
View File

@@ -56,6 +56,11 @@ type FolderDestroyer interface {
Destroy(ctx context.Context, id FolderID) error
}
type FolderGetterDestroyer interface {
FolderGetter
FolderDestroyer
}
// FolderStore provides methods to find, create and update Folders.
type FolderStore interface {
FolderGetter

21
ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
View File

@@ -7,7 +7,6 @@ import { useToast } from "src/hooks";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
import { galleryPath } from "src/core/galleries";
interface IDeleteGalleryDialogProps {
selected: GQL.SlimGalleryDataFragment[];
@@ -74,8 +73,14 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
return;
}
const fsGalleries = props.selected.filter((g) => galleryPath(g));
if (fsGalleries.length === 0) {
const deletedFiles: string[] = [];
props.selected.forEach((s) => {
const paths = s.files.map((f) => f.path);
deletedFiles.push(...paths);
});
if (deletedFiles.length === 0) {
return;
}
@@ -84,7 +89,7 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
<p className="font-weight-bold">
<FormattedMessage
values={{
count: fsGalleries.length,
count: deletedFiles.length,
singularEntity: intl.formatMessage({ id: "file" }),
pluralEntity: intl.formatMessage({ id: "files" }),
}}
@@ -92,13 +97,13 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
/>
</p>
<ul>
{fsGalleries.slice(0, 5).map((s) => (
<li key={galleryPath(s)}>{galleryPath(s)}</li>
{deletedFiles.slice(0, 5).map((s) => (
<li key={s}>{s}</li>
))}
{fsGalleries.length > 5 && (
{deletedFiles.length > 5 && (
<FormattedMessage
values={{
count: fsGalleries.length - 5,
count: deletedFiles.length - 5,
singularEntity: intl.formatMessage({ id: "file" }),
pluralEntity: intl.formatMessage({ id: "files" }),
}}

18
ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
View File

@@ -7,7 +7,6 @@ import { useToast } from "src/hooks";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
import { objectPath } from "src/core/files";
interface IDeleteImageDialogProps {
selected: GQL.SlimImageDataFragment[];
@@ -74,12 +73,19 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
return;
}
const deletedFiles: string[] = [];
props.selected.forEach((s) => {
const paths = s.files.map((f) => f.path);
deletedFiles.push(...paths);
});
return (
<div className="delete-dialog alert alert-danger text-break">
<p className="font-weight-bold">
<FormattedMessage
values={{
count: props.selected.length,
count: deletedFiles.length,
singularEntity: intl.formatMessage({ id: "file" }),
pluralEntity: intl.formatMessage({ id: "files" }),
}}
@@ -87,13 +93,13 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
/>
</p>
<ul>
{props.selected.slice(0, 5).map((s) => (
<li key={objectPath(s)}>{objectPath(s)}</li>
{deletedFiles.slice(0, 5).map((s) => (
<li key={s}>{s}</li>
))}
{props.selected.length > 5 && (
{deletedFiles.length > 5 && (
<FormattedMessage
values={{
count: props.selected.length - 5,
count: deletedFiles.length - 5,
singularEntity: intl.formatMessage({ id: "file" }),
pluralEntity: intl.formatMessage({ id: "files" }),
}}

2
ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
View File

@@ -99,7 +99,7 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
<p className="font-weight-bold">
<FormattedMessage
values={{
count: props.selected.length,
count: deletedFiles.length,
singularEntity: intl.formatMessage({ id: "file" }),
pluralEntity: intl.formatMessage({ id: "files" }),
}}