Don't delete downloads directory at startup if generated not set (#1098)

* Don't empty directories if generated not set * Rename downloads to download_stage
stashapp · Feb 2, 2021 · 0dd2e26 · 0dd2e26
1 parent 6d48cd1
commit 0dd2e26
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
@@ -67,8 +67,11 @@ func Initialize() *singleton {
 		instance.RefreshConfig()
 
 		// clear the downloads and tmp directories
-		utils.EmptyDir(instance.Paths.Generated.Downloads)
-		utils.EmptyDir(instance.Paths.Generated.Tmp)
+		// #1021 - only clear these directories if the generated folder is non-empty
+		if config.GetGeneratedPath() != "" {
+			utils.EmptyDir(instance.Paths.Generated.Downloads)
+			utils.EmptyDir(instance.Paths.Generated.Tmp)
+		}
 
 		initFFMPEG()
 	})

diff --git a/pkg/manager/paths/paths_generated.go b/pkg/manager/paths/paths_generated.go
@@ -29,7 +29,7 @@ func newGeneratedPaths() *generatedPaths {
 	gp.Vtt = filepath.Join(config.GetGeneratedPath(), "vtt")
 	gp.Markers = filepath.Join(config.GetGeneratedPath(), "markers")
 	gp.Transcodes = filepath.Join(config.GetGeneratedPath(), "transcodes")
-	gp.Downloads = filepath.Join(config.GetGeneratedPath(), "downloads")
+	gp.Downloads = filepath.Join(config.GetGeneratedPath(), "download_stage")
 	gp.Tmp = filepath.Join(config.GetGeneratedPath(), "tmp")
 	return &gp
 }

diff --git a/ui/v2.5/src/components/Changelog/versions/v050.md b/ui/v2.5/src/components/Changelog/versions/v050.md
@@ -29,6 +29,7 @@
 * Support configurable number of threads for scanning and generation.
 
 ### 🐛 Bug fixes
+* Fixed stash potentially deleting `downloads` directory when first run.
 * Fix sprite generation when generated path has special characters.
 * Prevent studio from being set as its own parent
 * Fixed performer scraper select overlapping search results