mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 12:24:38 +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:
@@ -23,7 +23,7 @@ type GenerateTranscodeTask struct {
|
||||
}
|
||||
|
||||
func (t *GenerateTranscodeTask) GetDescription() string {
|
||||
return fmt.Sprintf("Generating transcode for %s", t.Scene.Path)
|
||||
return fmt.Sprintf("Generating transcode for %s", t.Scene.Path())
|
||||
}
|
||||
|
||||
func (t *GenerateTranscodeTask) Start(ctc context.Context) {
|
||||
@@ -42,10 +42,15 @@ func (t *GenerateTranscodeTask) Start(ctc context.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
videoCodec := t.Scene.VideoCodec.String
|
||||
var videoCodec string
|
||||
|
||||
if t.Scene.VideoCodec() != "" {
|
||||
videoCodec = t.Scene.VideoCodec()
|
||||
}
|
||||
|
||||
audioCodec := ffmpeg.MissingUnsupported
|
||||
if t.Scene.AudioCodec.Valid {
|
||||
audioCodec = ffmpeg.ProbeAudioCodec(t.Scene.AudioCodec.String)
|
||||
if t.Scene.AudioCodec() != "" {
|
||||
audioCodec = ffmpeg.ProbeAudioCodec(t.Scene.AudioCodec())
|
||||
}
|
||||
|
||||
if !t.Force && ffmpeg.IsStreamable(videoCodec, audioCodec, container) == nil {
|
||||
@@ -54,7 +59,7 @@ func (t *GenerateTranscodeTask) Start(ctc context.Context) {
|
||||
|
||||
// TODO - move transcode generation logic elsewhere
|
||||
|
||||
videoFile, err := ffprobe.NewVideoFile(t.Scene.Path)
|
||||
videoFile, err := ffprobe.NewVideoFile(t.Scene.Path())
|
||||
if err != nil {
|
||||
logger.Errorf("[transcode] error reading video file: %s", err.Error())
|
||||
return
|
||||
@@ -104,15 +109,18 @@ func (t *GenerateTranscodeTask) isTranscodeNeeded() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
videoCodec := t.Scene.VideoCodec.String
|
||||
var videoCodec string
|
||||
if t.Scene.VideoCodec() != "" {
|
||||
videoCodec = t.Scene.VideoCodec()
|
||||
}
|
||||
container := ""
|
||||
audioCodec := ffmpeg.MissingUnsupported
|
||||
if t.Scene.AudioCodec.Valid {
|
||||
audioCodec = ffmpeg.ProbeAudioCodec(t.Scene.AudioCodec.String)
|
||||
if t.Scene.AudioCodec() != "" {
|
||||
audioCodec = ffmpeg.ProbeAudioCodec(t.Scene.AudioCodec())
|
||||
}
|
||||
|
||||
if t.Scene.Format.Valid {
|
||||
container = t.Scene.Format.String
|
||||
if t.Scene.Format() != "" {
|
||||
container = t.Scene.Format()
|
||||
}
|
||||
|
||||
if ffmpeg.IsStreamable(videoCodec, audioCodec, ffmpeg.Container(container)) == nil {
|
||||
|
||||
Reference in New Issue
Block a user