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

Load TLS config files from config path before stash home (#1678)

Browse Source 
* Load tls files from config or home directory
* Update README
* Require both ssl files if either present
This commit is contained in:
WithoutPants
2021-08-31 19:37:45 +10:00
committed by GitHub
parent 1774a3600c
commit 709d7ce1cc
8 changed files with 84 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/ffmpeg/downloader.go
View File

@@ -16,17 +16,6 @@ import (
"github.com/stashapp/stash/pkg/utils"
)
func findInPaths(paths []string, baseName string) string {
for _, p := range paths {
filePath := filepath.Join(p, baseName)
if exists, _ := utils.FileExists(filePath); exists {
return filePath
}
}
return ""
}
func GetPaths(paths []string) (string, string) {
var ffmpegPath, ffprobePath string
@@ -38,10 +27,10 @@ func GetPaths(paths []string) (string, string) {
// Check if ffmpeg exists in the config directory
if ffmpegPath == "" {
ffmpegPath = findInPaths(paths, getFFMPEGFilename())
ffmpegPath = utils.FindInPaths(paths, getFFMPEGFilename())
}
if ffprobePath == "" {
ffprobePath = findInPaths(paths, getFFProbeFilename())
ffprobePath = utils.FindInPaths(paths, getFFProbeFilename())
}
return ffmpegPath, ffprobePath