fix extension case, optimize copy if source and target are the same

askolesov · Sep 30, 2024 · f83d749 · f83d749
1 parent cf9372e
commit f83d749
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/util/config.go b/pkg/util/config.go
@@ -31,7 +31,7 @@ template: |-
   {{- $mediaCreateDate := and (any .Exif.MediaCreateDate) (ne .Exif.MediaCreateDate "0000:00:00 00:00:00") | ternary .Exif.MediaCreateDate "" -}}
   {{- $date := or $dateTimeOriginal $mediaCreateDate "1970:01:01 00:00:00" | toDate "2006:01:02 15:04:05" -}}
   {{- $mimeType := .Exif.MIMEType | default "unknown/unknown" | splitList "/" | first -}}
-  {{$make}} {{$model}} ({{$mimeType}})/{{$date | date "2006"}}/{{$date | date "2006-01-02"}}/{{$date | date "2006-01-02_15-04-05"}}_{{.Hash.Md5Short}}{{.Fs.Ext}}
+  {{$make}} {{$model}} ({{$mimeType}})/{{$date | date "2006"}}/{{$date | date "2006-01-02"}}/{{$date | date "2006-01-02_15-04-05"}}_{{.Hash.Md5Short}}{{.Fs.Ext | lower}}
 
 # skipPermissionDenied: Controls whether to skip files and directories with permission denied errors.
 skipPermissionDenied: true

diff --git a/pkg/util/copy.go b/pkg/util/copy.go
@@ -20,6 +20,11 @@ import (
 // - Performs the actual copy operation if all checks pass.
 // The function respects dryRun and errorOnAction flags for safety and logging purposes.
 func SmartCopyFile(log func(string, ...any), source, target string, dryRun, errorOnAction bool) error {
+	if source == target {
+		log("Skipping copy, source and target are the same: source=%s, target=%s", source, target)
+		return nil
+	}
+
 	sourceInfo, err := os.Stat(source)
 	if err != nil {
 		return fmt.Errorf("failed to stat source file: %w", err)