fenix/photocatalog
1
0
Fork 0
mirror of https://github.com/derfenix/photocatalog.git synced 2026-03-11 21:35:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
derFenix
2025-01-06 20:00:00 +03:00
parent bcaeba5ea6
commit df4f2ebd99
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/application.go
View File

@@ -43,7 +43,7 @@ func (a *Application) Start(ctx context.Context, wg *sync.WaitGroup) error {
WithDirMode(os.FileMode(a.config.DirMode)). WithDirMode(os.FileMode(a.config.DirMode)).
WithFileMode(os.FileMode(a.config.FileMode)). WithFileMode(os.FileMode(a.config.FileMode)).
WithErrLogger(func(err error) { WithErrLogger(func(err error) {
log.Println(err) log.Println("ERROR:", err.Error())
}) })
if a.config.Overwrite { if a.config.Overwrite {

10
internal/organizer/organizer.go
View File

@@ -149,7 +149,7 @@ func (o *Organizer) Watch(ctx context.Context, wg *sync.WaitGroup) error {
// Add new directories to the watcher. // Add new directories to the watcher.
if stat.IsDir() { if stat.IsDir() {
if err := watcher.Add(event.Name); err != nil { 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 continue
@@ -248,7 +248,7 @@ func (o *Organizer) processFile(sourcePath string) error {
return fmt.Errorf("build target path: %w", err) return fmt.Errorf("build target path: %w", err)
} }
if pathExists(targetPath) && !o.overwrite { if o.pathExists(targetPath) && !o.overwrite {
return nil return nil
} }
@@ -283,7 +283,7 @@ func (o *Organizer) BuildTargetPath(sourcePath string, meta metadata.Metadata) (
} }
func (o *Organizer) ensureTargetPath(targetPath string) error { func (o *Organizer) ensureTargetPath(targetPath string) error {
if pathExists(targetPath) { if o.pathExists(targetPath) {
return nil return nil
} }
@@ -305,13 +305,15 @@ func (o *Organizer) ensureTargetPath(targetPath string) error {
return nil return nil
} }
func pathExists(path string) bool { func (o *Organizer) pathExists(path string) bool {
_, err := os.Stat(path) _, err := os.Stat(path)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return false return false
} }
o.logErr(fmt.Errorf("pathExists stat %s: %w", path, err))
return true return true
} }