mirror of
https://github.com/stashapp/stash.git
synced 2025-12-08 17:35:40 +01:00
87709fd018
* Avoid redundant logging in migrations
Return the error and let the caller handle the logging of the error if
needed.
While here, defer m.Close() to the function boundary.
* Treat errors as values
Use %v rather than %s and pass the errors directly.
* Generate a wrapped error on stat-failure
* Log 3 unchecked errors
Rather than ignore errors, log them at
the WARNING log level.
The server has been functioning without these, so assume they are not at
the ERROR level.
* Propagate errors upward
Failure in path generation was ignored. Propagate the errors upward the
call stack, so it can be handled at the level of orchestration.
* Warn on errors
Log errors rather than quenching them.
Errors are logged at the Warn-level for now.
* Check error when creating test databases
Use the builtin log package and stop the program fatally on error.
* Add warnings to uncheck task errors
Focus on the task system in a single commit, logging unchecked
errors as warnings.
* Warn-on-error in API routes
Look through the API routes, and make sure errors are being logged if
they occur. Prefer the Warn-log-level because none of these has proven
to be fatal in the system up until now.
* Propagate error when adding Util API
* Propagate error on adding util API
* Return unhandled error
* JS log API: propagate and log errors
* JS Plugins: log GQL addition failures.
* Warn on failure to write to stdin
* Warn on failure to stop task
* Wrap viper.BindEnv
The current viper code only errors if no name is provided, so it should
never fail. Rewrite the code flow to factor through a panic-function.
This removes error warnings from this part of the code.
* Log errors in concurrency test
If we can't initialize the configuration, treat the test as a failure.
* Warn on errors in configuration code
* Plug an unchecked error in gallery zip walking
* Warn on screenshot serving failure
* Warn on encoder screenshot failure
* Warn on errors in path-handling code
* Undo the errcheck on configurations for now.
* Use one-line initializers where applicable
rather than using
err := f()
if err!= nil { ..
prefer the shorter
if err := f(); err != nil { ..
If f() isn't too long of a name, or wraps a function with a body.
99 lines
2.9 KiB
Go
99 lines
2.9 KiB
Go
package paths
|
|
|
|
import (
|
|
"path/filepath"
|
|
|
|
"github.com/stashapp/stash/pkg/logger"
|
|
"github.com/stashapp/stash/pkg/utils"
|
|
)
|
|
|
|
type JSONPaths struct {
|
|
Metadata string
|
|
|
|
MappingsFile string
|
|
ScrapedFile string
|
|
|
|
Performers string
|
|
Scenes string
|
|
Images string
|
|
Galleries string
|
|
Studios string
|
|
Tags string
|
|
Movies string
|
|
}
|
|
|
|
func newJSONPaths(baseDir string) *JSONPaths {
|
|
jp := JSONPaths{}
|
|
jp.Metadata = baseDir
|
|
jp.MappingsFile = filepath.Join(baseDir, "mappings.json")
|
|
jp.ScrapedFile = filepath.Join(baseDir, "scraped.json")
|
|
jp.Performers = filepath.Join(baseDir, "performers")
|
|
jp.Scenes = filepath.Join(baseDir, "scenes")
|
|
jp.Images = filepath.Join(baseDir, "images")
|
|
jp.Galleries = filepath.Join(baseDir, "galleries")
|
|
jp.Studios = filepath.Join(baseDir, "studios")
|
|
jp.Movies = filepath.Join(baseDir, "movies")
|
|
jp.Tags = filepath.Join(baseDir, "tags")
|
|
return &jp
|
|
}
|
|
|
|
func GetJSONPaths(baseDir string) *JSONPaths {
|
|
jp := newJSONPaths(baseDir)
|
|
return jp
|
|
}
|
|
|
|
func EnsureJSONDirs(baseDir string) {
|
|
jsonPaths := GetJSONPaths(baseDir)
|
|
if err := utils.EnsureDir(jsonPaths.Metadata); err != nil {
|
|
logger.Warnf("couldn't create directories for Metadata: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Scenes); err != nil {
|
|
logger.Warnf("couldn't create directories for Scenes: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Images); err != nil {
|
|
logger.Warnf("couldn't create directories for Images: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Galleries); err != nil {
|
|
logger.Warnf("couldn't create directories for Galleries: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Performers); err != nil {
|
|
logger.Warnf("couldn't create directories for Performers: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Studios); err != nil {
|
|
logger.Warnf("couldn't create directories for Studios: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Movies); err != nil {
|
|
logger.Warnf("couldn't create directories for Movies: %v", err)
|
|
}
|
|
if err := utils.EnsureDir(jsonPaths.Tags); err != nil {
|
|
logger.Warnf("couldn't create directories for Tags: %v", err)
|
|
}
|
|
}
|
|
|
|
func (jp *JSONPaths) PerformerJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Performers, checksum+".json")
|
|
}
|
|
|
|
func (jp *JSONPaths) SceneJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Scenes, checksum+".json")
|
|
}
|
|
|
|
func (jp *JSONPaths) ImageJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Images, checksum+".json")
|
|
}
|
|
|
|
func (jp *JSONPaths) GalleryJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Galleries, checksum+".json")
|
|
}
|
|
|
|
func (jp *JSONPaths) StudioJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Studios, checksum+".json")
|
|
}
|
|
|
|
func (jp *JSONPaths) TagJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Tags, checksum+".json")
|
|
}
|
|
|
|
func (jp *JSONPaths) MovieJSONPath(checksum string) string {
|
|
return filepath.Join(jp.Movies, checksum+".json")
|
|
}
|