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

Refresh package managers after setup (#4397)

Browse Source 
* Refresh package managers after setup
* Fix default plugins/scrapers paths
This commit is contained in:
DingDongSoLong4
2023-12-27 01:57:10 +02:00
committed by GitHub
parent 9bd36408ee
commit 6ee7e6112b
3 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/manager/manager.go
View File

@@ -4,9 +4,11 @@ import (
"context"
"errors"
"fmt"
"net/http"
"os"
"path/filepath"
"runtime"
"time"
"github.com/stashapp/stash/internal/dlna"
"github.com/stashapp/stash/internal/log"
@@ -145,12 +147,31 @@ func (s *Manager) RefreshDLNA() {
}
}
func createPackageManager(localPath string, srcPathGetter pkg.SourcePathGetter) *pkg.Manager {
const timeout = 10 * time.Second
httpClient := &http.Client{
Transport: &http.Transport{
Proxy: http.ProxyFromEnvironment,
},
Timeout: timeout,
}
return &pkg.Manager{
Local: &pkg.Store{
BaseDir: localPath,
ManifestFile: pkg.ManifestFile,
},
PackagePathGetter: srcPathGetter,
Client: httpClient,
}
}
func (s *Manager) RefreshScraperSourceManager() {
s.ScraperPackageManager = initialisePackageManager(s.Config.GetScrapersPath(), s.Config.GetScraperPackagePathGetter())
s.ScraperPackageManager = createPackageManager(s.Config.GetScrapersPath(), s.Config.GetScraperPackagePathGetter())
}
func (s *Manager) RefreshPluginSourceManager() {
s.PluginPackageManager = initialisePackageManager(s.Config.GetPluginsPath(), s.Config.GetPluginPackagePathGetter())
s.PluginPackageManager = createPackageManager(s.Config.GetPluginsPath(), s.Config.GetPluginPackagePathGetter())
}
func setSetupDefaults(input *SetupInput) {
@@ -179,10 +200,6 @@ func (s *Manager) Setup(ctx context.Context, input SetupInput) error {
setSetupDefaults(&input)
cfg := s.Config
if err := cfg.SetInitialConfig(); err != nil {
return fmt.Errorf("error setting initial configuration: %v", err)
}
// create the config directory if it does not exist
// don't do anything if config is already set in the environment
if !config.FileEnvSet() {
@@ -207,6 +224,10 @@ func (s *Manager) Setup(ctx context.Context, input SetupInput) error {
s.Config.SetConfigFile(configFile)
}
if err := cfg.SetInitialConfig(); err != nil {
return fmt.Errorf("error setting initial configuration: %v", err)
}
// create the generated directory if it does not exist
if !cfg.HasOverride(config.Generated) {
if exists, _ := fsutil.DirExists(input.GeneratedLocation); !exists {