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

Fix moveFiles for zip files (#3608)

Browse Source
This commit is contained in:
DingDongSoLong4
2023-03-29 00:28:11 +02:00
committed by GitHub
parent 046fd1c0be
commit a8f9310c0f
5 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/api/resolver_mutation_file.go
View File

@@ -13,8 +13,9 @@ import (
func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput) (bool, error) {
if err := r.withTxn(ctx, func(ctx context.Context) error {
qb := r.repository.File
mover := file.NewMover(qb)
fileStore := r.repository.File
folderStore := r.repository.Folder
mover := file.NewMover(fileStore, folderStore)
mover.RegisterHooks(ctx, r.txnManager)
var (
@@ -36,7 +37,7 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
return fmt.Errorf("invalid folder id %s: %w", *input.DestinationFolderID, err)
}
folder, err = r.repository.Folder.Find(ctx, file.FolderID(folderID))
folder, err = folderStore.Find(ctx, file.FolderID(folderID))
if err != nil {
return fmt.Errorf("finding destination folder: %w", err)
}
@@ -44,6 +45,10 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
if folder == nil {
return fmt.Errorf("folder with id %d not found", input.DestinationFolderID)
}
if folder.ZipFileID != nil {
return fmt.Errorf("cannot move to %s, is in a zip file", folder.Path)
}
case input.DestinationFolder != nil:
folderPath := *input.DestinationFolder
@@ -54,7 +59,7 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
// get or create folder hierarchy
var err error
folder, err = file.GetOrCreateFolderHierarchy(ctx, r.repository.Folder, folderPath)
folder, err = file.GetOrCreateFolderHierarchy(ctx, folderStore, folderPath)
if err != nil {
return fmt.Errorf("getting or creating folder hierarchy: %w", err)
}
@@ -78,7 +83,7 @@ func (r *mutationResolver) MoveFiles(ctx context.Context, input MoveFilesInput)
for _, fileIDInt := range fileIDs {
fileID := file.ID(fileIDInt)
f, err := qb.Find(ctx, fileID)
f, err := fileStore.Find(ctx, fileID)
if err != nil {
return fmt.Errorf("finding file %d: %w", fileID, err)
}

2
internal/manager/repository.go
View File

@@ -35,7 +35,6 @@ type SceneReaderWriter interface {
type FileReaderWriter interface {
file.Store
file.Finder
Query(ctx context.Context, options models.FileQueryOptions) (*models.FileQueryResult, error)
GetCaptions(ctx context.Context, fileID file.ID) ([]*models.VideoCaption, error)
IsPrimary(ctx context.Context, fileID file.ID) (bool, error)
@@ -43,7 +42,6 @@ type FileReaderWriter interface {
type FolderReaderWriter interface {
file.FolderStore
Find(ctx context.Context, id file.FolderID) (*file.Folder, error)
}
type Repository struct {