From df4f2ebd990f465901ac3252a245943190ae4ae3 Mon Sep 17 00:00:00 2001 From: derfenix Date: Mon, 6 Jan 2025 20:00:00 +0300 Subject: [PATCH] Refactoring --- application/application.go | 2 +- internal/organizer/organizer.go | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/application/application.go b/application/application.go index 53d631f..726f745 100644 --- a/application/application.go +++ b/application/application.go @@ -43,7 +43,7 @@ func (a *Application) Start(ctx context.Context, wg *sync.WaitGroup) error { WithDirMode(os.FileMode(a.config.DirMode)). WithFileMode(os.FileMode(a.config.FileMode)). WithErrLogger(func(err error) { - log.Println(err) + log.Println("ERROR:", err.Error()) }) if a.config.Overwrite { diff --git a/internal/organizer/organizer.go b/internal/organizer/organizer.go index a05e1a2..63f181f 100644 --- a/internal/organizer/organizer.go +++ b/internal/organizer/organizer.go @@ -149,7 +149,7 @@ func (o *Organizer) Watch(ctx context.Context, wg *sync.WaitGroup) error { // Add new directories to the watcher. if stat.IsDir() { if err := watcher.Add(event.Name); err != nil { - o.logErr(fmt.Errorf("watch dir: %w", err)) + o.logErr(fmt.Errorf("add the directory %s to watcher: %w", event.Name, err)) } continue @@ -248,7 +248,7 @@ func (o *Organizer) processFile(sourcePath string) error { return fmt.Errorf("build target path: %w", err) } - if pathExists(targetPath) && !o.overwrite { + if o.pathExists(targetPath) && !o.overwrite { return nil } @@ -283,7 +283,7 @@ func (o *Organizer) BuildTargetPath(sourcePath string, meta metadata.Metadata) ( } func (o *Organizer) ensureTargetPath(targetPath string) error { - if pathExists(targetPath) { + if o.pathExists(targetPath) { return nil } @@ -305,13 +305,15 @@ func (o *Organizer) ensureTargetPath(targetPath string) error { return nil } -func pathExists(path string) bool { +func (o *Organizer) pathExists(path string) bool { _, err := os.Stat(path) if err != nil { if os.IsNotExist(err) { return false } + o.logErr(fmt.Errorf("pathExists stat %s: %w", path, err)) + return true }