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

makeScreenshots can be called for a new or already existing file

Browse Source
This commit is contained in:
bill
2019-10-17 16:50:30 +03:00
parent 02f485e40e
commit ab1690d5b1
1 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
pkg/manager/task_scan.go
View File

@@ -82,7 +82,7 @@ func (t *ScanTask) scanScene() {
scene, _ := qb.FindByPath(t.FilePath) scene, _ := qb.FindByPath(t.FilePath)
if scene != nil { if scene != nil {
// We already have this item in the database, check for thumbnails,screenshots // We already have this item in the database, check for thumbnails,screenshots
t.checkScreenshots(scene.Checksum) t.makeScreenshots(nil, scene.Checksum)
return return
} }
@@ -103,7 +103,7 @@ func (t *ScanTask) scanScene() {
return return
} }
t.makeScreenshots(*videoFile, checksum) t.makeScreenshots(videoFile, checksum)
scene, _ = qb.FindByChecksum(checksum) scene, _ = qb.FindByChecksum(checksum)
ctx := context.TODO() ctx := context.TODO()
@@ -151,19 +151,43 @@ func (t *ScanTask) scanScene() {
} }
} }
func (t *ScanTask) makeScreenshots(probeResult ffmpeg.VideoFile, checksum string) { func (t *ScanTask) makeScreenshots(probeResult *ffmpeg.VideoFile, checksum string) {
thumbPath := instance.Paths.Scene.GetThumbnailScreenshotPath(checksum) thumbPath := instance.Paths.Scene.GetThumbnailScreenshotPath(checksum)
normalPath := instance.Paths.Scene.GetScreenshotPath(checksum) normalPath := instance.Paths.Scene.GetScreenshotPath(checksum)
thumbExists, _ := utils.FileExists(thumbPath) thumbExists, _ := utils.FileExists(thumbPath)
normalExists, _ := utils.FileExists(normalPath) normalExists, _ := utils.FileExists(normalPath)
if thumbExists && normalExists { if thumbExists && normalExists {
logger.Debug("Screenshots already exist for this path... skipping") logger.Debug("Screenshots already exist for this path... skipping")
return return
} }
t.makeScreenshot(probeResult, thumbPath, 5, 320) if probeResult != nil {
t.makeScreenshot(probeResult, normalPath, 2, probeResult.Width) // makescreenshots is called for a new file
t.makeScreenshot(*probeResult, thumbPath, 5, 320)
t.makeScreenshot(*probeResult, normalPath, 2, probeResult.Width)
} else {
// makescreenshots is called for an already existing file
if !thumbExists || !normalExists {
checkvideoFile, err := ffmpeg.NewVideoFile(instance.FFProbePath, t.FilePath)
if err != nil {
logger.Error(err.Error())
return
}
if !thumbExists {
logger.Infof("Recreating thumbnail for %s", t.FilePath)
t.makeScreenshot(*checkvideoFile, thumbPath, 5, 320)
}
if !normalExists {
logger.Infof("Recreating screenshot for %s", t.FilePath)
t.makeScreenshot(*checkvideoFile, normalPath, 2, checkvideoFile.Width)
}
}
}
} }
func (t *ScanTask) makeScreenshot(probeResult ffmpeg.VideoFile, outputPath string, quality int, width int) { func (t *ScanTask) makeScreenshot(probeResult ffmpeg.VideoFile, outputPath string, quality int, width int) {
@@ -186,33 +210,3 @@ func (t *ScanTask) calculateChecksum() (string, error) {
logger.Debugf("Checksum calculated: %s", checksum) logger.Debugf("Checksum calculated: %s", checksum)
return checksum, nil return checksum, nil
} }
func (t *ScanTask) checkScreenshots(checksum string) {
//check for existance of screenshot or thumbnail and create them if needed
thumbPath := instance.Paths.Scene.GetThumbnailScreenshotPath(checksum)
normalPath := instance.Paths.Scene.GetScreenshotPath(checksum)
thumbExists, _ := utils.FileExists(thumbPath)
normalExists, _ := utils.FileExists(normalPath)
if !thumbExists || !normalExists {
checkvideoFile, err := ffmpeg.NewVideoFile(instance.FFProbePath, t.FilePath)
if err != nil {
logger.Error(err.Error())
return
}
if !thumbExists {
logger.Infof("Recreating thumbnail for %s", t.FilePath)
t.makeScreenshot(*checkvideoFile, thumbPath, 5, 320)
}
if !normalExists {
logger.Infof("Recreating screenshot for %s", t.FilePath)
t.makeScreenshot(*checkvideoFile, normalPath, 2, checkvideoFile.Width)
}
}
return
}