Skip to content

Commit 10bea10

Browse files
committed
New "Warning" Log Level
Fixes #573
1 parent bd1da0c commit 10bea10

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

internal/e2eTests/upload/e2e_from_folder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestUploadFromGooglePhotos(t *testing.T) {
3535
"upload", "from-google-photos",
3636
"--server=" + myEnv["IMMICHGO_SERVER"],
3737
"--api-key=" + myEnv["IMMICHGO_APIKEY"],
38-
"--no-ui",
38+
// "--no-ui",
3939
myEnv["IMMICHGO_TESTFILES"] + "/demo takeout/Takeout",
4040
})
4141

internal/fileevent/fileevents.go

+26-1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,30 @@ var _code = map[Code]string{
9191
Error: "error",
9292
}
9393

94+
var _logLevels = map[Code]slog.Level{
95+
DiscoveredImage: slog.LevelInfo,
96+
DiscoveredVideo: slog.LevelInfo,
97+
DiscoveredDiscarded: slog.LevelWarn,
98+
DiscoveredUnsupported: slog.LevelWarn,
99+
DiscoveredUseless: slog.LevelWarn,
100+
AnalysisAssociatedMetadata: slog.LevelInfo,
101+
AnalysisMissingAssociatedMetadata: slog.LevelWarn,
102+
AnalysisLocalDuplicate: slog.LevelWarn,
103+
UploadNotSelected: slog.LevelWarn,
104+
UploadUpgraded: slog.LevelInfo,
105+
UploadServerBetter: slog.LevelInfo,
106+
UploadAlbumCreated: slog.LevelInfo,
107+
UploadServerError: slog.LevelError,
108+
Uploaded: slog.LevelInfo,
109+
Stacked: slog.LevelInfo,
110+
LivePhoto: slog.LevelInfo,
111+
Metadata: slog.LevelInfo,
112+
INFO: slog.LevelInfo,
113+
Written: slog.LevelInfo,
114+
Tagged: slog.LevelInfo,
115+
Error: slog.LevelError,
116+
}
117+
94118
func (e Code) String() string {
95119
if s, ok := _code[e]; ok {
96120
return s
@@ -120,10 +144,11 @@ func (r *Recorder) Log() *slog.Logger {
120144
func (r *Recorder) Record(ctx context.Context, code Code, file slog.LogValuer, args ...any) {
121145
atomic.AddInt64(&r.counts[code], 1)
122146
if r.log != nil {
123-
level := slog.LevelInfo
147+
level := _logLevels[code]
124148
if file != nil {
125149
args = append([]any{"file", file.LogValue()}, args...)
126150
}
151+
127152
for _, a := range args {
128153
if a == "error" {
129154
level = slog.LevelError

0 commit comments

Comments
 (0)