public/photoview
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/photoview.git synced 2026-08-03 19:29:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update log for passing attrs with context. (#1216)

Browse Source 
* Update log for passing attrs with context.

* Check type-casting

* add tests.

* Use t.Cleanup() to restore the global value.

* Fix error.

* Update tests.

* Add comments.

* Remove cover.cov

* Update doc.

* Update git ignore.
This commit is contained in:
Googol Lee
2025-06-07 17:11:50 +02:00
committed by GitHub
parent 1d1305628a
commit 0da8bef69e
8 changed files with 162 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/scanner/media_encoding/executable_worker/executable_worker.go
View File

@@ -19,7 +19,7 @@ func Initialize() func() {
Ffmpeg = newFfmpegCli()
if err := SetFfprobePath(); err != nil {
log.Error("Init ffprobe fail.", "error", err)
log.Error(nil, "Init ffprobe fail.", "error", err)
}
return func() {
@@ -46,7 +46,7 @@ func SetFfprobePath() error {
return fmt.Errorf("Executable ffprobe(%q) not executable: %w", path, err)
}
log.Info("Found ffprobe", "path", path, "version", strings.Split(string(version), "\n")[0])
log.Info(nil, "Found ffprobe", "path", path, "version", strings.Split(string(version), "\n")[0])
ffprobe.SetFFProbeBinPath(path)
return nil

8
api/scanner/media_encoding/executable_worker/ffmpeg_cli.go
View File

@@ -26,7 +26,7 @@ type FfmpegCli struct {
func newFfmpegCli() *FfmpegCli {
if utils.EnvDisableVideoEncoding.GetBool() {
log.Warn("Executable ffmpeg worker disabled", utils.EnvDisableVideoEncoding.GetName(), utils.EnvDisableVideoEncoding.GetValue())
log.Warn(nil, "Executable ffmpeg worker disabled", utils.EnvDisableVideoEncoding.GetName(), utils.EnvDisableVideoEncoding.GetValue())
return &FfmpegCli{
err: ErrDisabledFunction,
}
@@ -34,7 +34,7 @@ func newFfmpegCli() *FfmpegCli {
path, err := exec.LookPath("ffmpeg")
if err != nil {
log.Error("Executable ffmpeg worker not found")
log.Error(nil, "Executable ffmpeg worker not found")
return &FfmpegCli{
err: ErrNoDependency,
}
@@ -42,7 +42,7 @@ func newFfmpegCli() *FfmpegCli {
version, err := exec.Command(path, "-version").Output()
if err != nil {
log.Error("Executable ffmpeg worker getting version error", "error", err)
log.Error(nil, "Executable ffmpeg worker getting version error", "error", err)
return &FfmpegCli{
err: ErrNoDependency,
}
@@ -59,7 +59,7 @@ func newFfmpegCli() *FfmpegCli {
}
}
log.Info("Found executable worker: ffmpeg", "version", strings.Split(string(version), "\n")[0], "codec", codec)
log.Info(nil, "Found executable worker: ffmpeg", "version", strings.Split(string(version), "\n")[0], "codec", codec)
return &FfmpegCli{
path: path,

2
api/scanner/media_encoding/executable_worker/magickwand.go
View File

@@ -16,7 +16,7 @@ func newMagickWand() *MagickWand {
verstr, vernum := imagick.GetVersion()
log.Info("Found magickwand worker: "+verstr, "version", vernum)
log.Info(nil, "Found magickwand worker: "+verstr, "version", vernum)
return &MagickWand{
initialized: true,

6
api/scanner/media_type/magic.go
View File

@@ -18,7 +18,7 @@ func init() {
libmagic.libmagic, libmagic.err = newLibMagic()
if libmagic.err != nil {
libmagic.libmagic = nil
log.Error("Init libmagic error.", "error", libmagic.err)
log.Error(nil, "Init libmagic error.", "error", libmagic.err)
}
}
@@ -29,13 +29,13 @@ func GetMediaType(f string) MediaType {
defer libmagic.mu.Unlock()
if libmagic.err != nil {
log.Warn("GetMediaType() error.", "error", libmagic.err, "file", f)
log.Warn(nil, "GetMediaType() error.", "error", libmagic.err, "file", f)
return TypeUnknown
}
mime, err := libmagic.libmagic.Type(f)
if err != nil {
log.Warn("GetMediaType() error.", "error", err, "file", f)
log.Warn(nil, "GetMediaType() error.", "error", err, "file", f)
return TypeUnknown
}