From 0dd2e269eeaaf93bf893bcb71ecb37111b77c9b8 Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Tue, 2 Feb 2021 20:32:37 +1100 Subject: [PATCH] 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 --- pkg/manager/manager.go | 7 +++++-- pkg/manager/paths/paths_generated.go | 2 +- ui/v2.5/src/components/Changelog/versions/v050.md | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index 65deba48b..acd23f8bd 100644 --- 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 index 91bbabed7..25aef7f45 100644 --- 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 index d2d6c7a99..2ba575d72 100644 --- 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