Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Rename marker folders when hash changes (#3988)

Browse source
This commit is contained in:
WithoutPants 2023-08-02 16:15:37 +10:00 committed by GitHub
parent bd28aa6fd9
commit 107d1113e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/models/paths/paths_scene_markers.go
View file

@ -16,14 +16,18 @@ func newSceneMarkerPaths(p Paths) *sceneMarkerPaths {
return &sp
}
func (sp *sceneMarkerPaths) GetFolderPath(checksum string) string {
return filepath.Join(sp.Markers, checksum)
}
func (sp *sceneMarkerPaths) GetVideoPreviewPath(checksum string, seconds int) string {
return filepath.Join(sp.Markers, checksum, strconv.Itoa(seconds)+".mp4")
return filepath.Join(sp.GetFolderPath(checksum), strconv.Itoa(seconds)+".mp4")
}
func (sp *sceneMarkerPaths) GetWebpPreviewPath(checksum string, seconds int) string {
return filepath.Join(sp.Markers, checksum, strconv.Itoa(seconds)+".webp")
return filepath.Join(sp.GetFolderPath(checksum), strconv.Itoa(seconds)+".webp")
}
func (sp *sceneMarkerPaths) GetScreenshotPath(checksum string, seconds int) string {
return filepath.Join(sp.Markers, checksum, strconv.Itoa(seconds)+".jpg")
return filepath.Join(sp.GetFolderPath(checksum), strconv.Itoa(seconds)+".jpg")
}

21
pkg/scene/migrate_hash.go
View file

@ -40,6 +40,12 @@ func MigrateHash(p *paths.Paths, oldHash string, newHash string) {
oldPath = scenePaths.GetInteractiveHeatmapPath(oldHash)
newPath = scenePaths.GetInteractiveHeatmapPath(newHash)
migrateSceneFiles(oldPath, newPath)
// #3986 - migrate scene marker files
markerPaths := p.SceneMarkers
oldPath = markerPaths.GetFolderPath(oldHash)
newPath = markerPaths.GetFolderPath(newHash)
migrateSceneFolder(oldPath, newPath)
}
func migrateSceneFiles(oldName, newName string) {
@ -75,3 +81,18 @@ func migrateVttFile(vttPath, oldSpritePath, newSpritePath string) {
return
}
}
func migrateSceneFolder(oldName, newName string) {
oldExists, err := fsutil.DirExists(oldName)
if err != nil && !os.IsNotExist(err) {
logger.Errorf("Error checking existence of %s: %s", oldName, err.Error())
return
}
if oldExists {
logger.Infof("renaming %s to %s", oldName, newName)
if err := os.Rename(oldName, newName); err != nil {
logger.Errorf("error renaming %s to %s: %s", oldName, newName, err.Error())
}
}
}