mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 20:34:37 +03:00
File storage rewrite (#2676)
* Restructure data layer part 2 (#2599) * Refactor and separate image model * Refactor image query builder * Handle relationships in image query builder * Remove relationship management methods * Refactor gallery model/query builder * Add scenes to gallery model * Convert scene model * Refactor scene models * Remove unused methods * Add unit tests for gallery * Add image tests * Add scene tests * Convert unnecessary scene value pointers to values * Convert unnecessary pointer values to values * Refactor scene partial * Add scene partial tests * Refactor ImagePartial * Add image partial tests * Refactor gallery partial update * Add partial gallery update tests * Use zero/null package for null values * Add files and scan system * Add sqlite implementation for files/folders * Add unit tests for files/folders * Image refactors * Update image data layer * Refactor gallery model and creation * Refactor scene model * Refactor scenes * Don't set title from filename * Allow galleries to freely add/remove images * Add multiple scene file support to graphql and UI * Add multiple file support for images in graphql/UI * Add multiple file for galleries in graphql/UI * Remove use of some deprecated fields * Remove scene path usage * Remove gallery path usage * Remove path from image * Move funscript to video file * Refactor caption detection * Migrate existing data * Add post commit/rollback hook system * Lint. Comment out import/export tests * Add WithDatabase read only wrapper * Prepend tasks to list * Add 32 pre-migration * Add warnings in release and migration notes
This commit is contained in:
@@ -13,18 +13,13 @@ import (
|
||||
"github.com/stashapp/stash/pkg/job"
|
||||
"github.com/stashapp/stash/pkg/logger"
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
"github.com/stashapp/stash/pkg/scene"
|
||||
)
|
||||
|
||||
func isGallery(pathname string) bool {
|
||||
func isZip(pathname string) bool {
|
||||
gExt := config.GetInstance().GetGalleryExtensions()
|
||||
return fsutil.MatchExtension(pathname, gExt)
|
||||
}
|
||||
|
||||
func isCaptions(pathname string) bool {
|
||||
return fsutil.MatchExtension(pathname, scene.CaptionExts)
|
||||
}
|
||||
|
||||
func isVideo(pathname string) bool {
|
||||
vidExt := config.GetInstance().GetVideoExtensions()
|
||||
return fsutil.MatchExtension(pathname, vidExt)
|
||||
@@ -36,13 +31,15 @@ func isImage(pathname string) bool {
|
||||
}
|
||||
|
||||
func getScanPaths(inputPaths []string) []*config.StashConfig {
|
||||
stashPaths := config.GetInstance().GetStashPaths()
|
||||
|
||||
if len(inputPaths) == 0 {
|
||||
return config.GetInstance().GetStashPaths()
|
||||
return stashPaths
|
||||
}
|
||||
|
||||
var ret []*config.StashConfig
|
||||
for _, p := range inputPaths {
|
||||
s := getStashFromDirPath(p)
|
||||
s := getStashFromDirPath(stashPaths, p)
|
||||
if s == nil {
|
||||
logger.Warnf("%s is not in the configured stash paths", p)
|
||||
continue
|
||||
@@ -84,7 +81,7 @@ func (s *Manager) Scan(ctx context.Context, input ScanMetadataInput) (int, error
|
||||
}
|
||||
|
||||
scanJob := ScanJob{
|
||||
txnManager: s.Repository,
|
||||
scanner: s.Scanner,
|
||||
input: input,
|
||||
subscriptions: s.scanSubs,
|
||||
}
|
||||
@@ -237,9 +234,12 @@ type CleanMetadataInput struct {
|
||||
|
||||
func (s *Manager) Clean(ctx context.Context, input CleanMetadataInput) int {
|
||||
j := cleanJob{
|
||||
txnManager: s.Repository,
|
||||
input: input,
|
||||
scanSubs: s.scanSubs,
|
||||
cleaner: s.Cleaner,
|
||||
txnManager: s.Repository,
|
||||
sceneService: s.SceneService,
|
||||
imageService: s.ImageService,
|
||||
input: input,
|
||||
scanSubs: s.scanSubs,
|
||||
}
|
||||
|
||||
return s.JobManager.Add(ctx, "Cleaning...", &j)
|
||||
|
||||
Reference in New Issue
Block a user