mirror of
https://github.com/stashapp/stash.git
synced 2025-12-10 02:15:30 +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.
73 lines
1.5 KiB
Go
73 lines
1.5 KiB
Go
package manager
|
|
|
|
import (
|
|
"archive/zip"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/stashapp/stash/pkg/logger"
|
|
"github.com/stashapp/stash/pkg/models"
|
|
"github.com/stashapp/stash/pkg/utils"
|
|
)
|
|
|
|
// DeleteGeneratedImageFiles deletes generated files for the provided image.
|
|
func DeleteGeneratedImageFiles(image *models.Image) {
|
|
thumbPath := GetInstance().Paths.Generated.GetThumbnailPath(image.Checksum, models.DefaultGthumbWidth)
|
|
exists, _ := utils.FileExists(thumbPath)
|
|
if exists {
|
|
err := os.Remove(thumbPath)
|
|
if err != nil {
|
|
logger.Warnf("Could not delete file %s: %s", thumbPath, err.Error())
|
|
}
|
|
}
|
|
}
|
|
|
|
// DeleteImageFile deletes the image file from the filesystem.
|
|
func DeleteImageFile(image *models.Image) {
|
|
err := os.Remove(image.Path)
|
|
if err != nil {
|
|
logger.Warnf("Could not delete file %s: %s", image.Path, err.Error())
|
|
}
|
|
}
|
|
|
|
func walkGalleryZip(path string, walkFunc func(file *zip.File) error) error {
|
|
readCloser, err := zip.OpenReader(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer readCloser.Close()
|
|
|
|
for _, file := range readCloser.File {
|
|
if file.FileInfo().IsDir() {
|
|
continue
|
|
}
|
|
|
|
if strings.Contains(file.Name, "__MACOSX") {
|
|
continue
|
|
}
|
|
|
|
if !isImage(file.Name) {
|
|
continue
|
|
}
|
|
|
|
err := walkFunc(file)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func countImagesInZip(path string) int {
|
|
ret := 0
|
|
err := walkGalleryZip(path, func(file *zip.File) error {
|
|
ret++
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
logger.Warnf("Error while walking gallery zip: %v", err)
|
|
}
|
|
|
|
return ret
|
|
}
|