From edf7145a45598c72e17ea79aee9b01c7030d927b Mon Sep 17 00:00:00 2001 From: derfenix Date: Wed, 7 Aug 2019 17:24:26 +0300 Subject: [PATCH] Rename package --- cmd/photocatalog/photocatalog.go | 22 +++++++++++----------- pkg/{core => manager}/managemode.go | 2 +- pkg/{core => manager}/managemode_string.go | 2 +- pkg/{core => manager}/manager.go | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) rename pkg/{core => manager}/managemode.go (87%) rename pkg/{core => manager}/managemode_string.go (97%) rename pkg/{core => manager}/manager.go (99%) diff --git a/cmd/photocatalog/photocatalog.go b/cmd/photocatalog/photocatalog.go index 848c0d1..fae00d0 100644 --- a/cmd/photocatalog/photocatalog.go +++ b/cmd/photocatalog/photocatalog.go @@ -12,7 +12,7 @@ import ( "github.com/fsnotify/fsnotify" - "github.com/derfenix/photocatalog/pkg/core" + "github.com/derfenix/photocatalog/pkg/manager" ) func main() { @@ -24,29 +24,29 @@ func main() { args := flag.Args() log.Println("Using", *target, "as target and", *mode, "as mode") - var manageMode core.ManageMode + var manageMode manager.ManageMode switch *mode { case "copy": - manageMode = core.Copy + manageMode = manager.Copy case "hardlink": - manageMode = core.Hardlink + manageMode = manager.Hardlink default: log.Fatalf("Invalid mode %s", *mode) } - manager, err := core.NewManager(*target, manageMode) + mgr, err := manager.NewManager(*target, manageMode) if err != nil { log.Fatalf(err.Error()) } if *monitor == "" { - processFiles(args, manager) + processFiles(args, mgr) } else { - startMonitoring(*monitor, manager) + startMonitoring(*monitor, mgr) } } -func processFiles(args []string, manager *core.Manager) { +func processFiles(args []string, manager *manager.Manager) { var manageErr error var gotErrors bool @@ -77,7 +77,7 @@ func processFiles(args []string, manager *core.Manager) { } } -func startMonitoring(monitor string, manager *core.Manager) { +func startMonitoring(monitor string, manager *manager.Manager) { var manageErr error if !path.IsAbs(monitor) { @@ -120,8 +120,8 @@ func startMonitoring(monitor string, manager *core.Manager) { log.Println(manageErr) } } - case err, ok := <-watcher.Errors: - log.Println("error:", err) + case wErr, ok := <-watcher.Errors: + log.Println("error:", wErr) if !ok { return } diff --git a/pkg/core/managemode.go b/pkg/manager/managemode.go similarity index 87% rename from pkg/core/managemode.go rename to pkg/manager/managemode.go index 509a640..c56625b 100644 --- a/pkg/core/managemode.go +++ b/pkg/manager/managemode.go @@ -1,4 +1,4 @@ -package core +package manager //go:generate stringer -type ManageMode diff --git a/pkg/core/managemode_string.go b/pkg/manager/managemode_string.go similarity index 97% rename from pkg/core/managemode_string.go rename to pkg/manager/managemode_string.go index 9870cc9..2044800 100644 --- a/pkg/core/managemode_string.go +++ b/pkg/manager/managemode_string.go @@ -1,6 +1,6 @@ // Code generated by "stringer -type ManageMode"; DO NOT EDIT. -package core +package manager import "strconv" diff --git a/pkg/core/manager.go b/pkg/manager/manager.go similarity index 99% rename from pkg/core/manager.go rename to pkg/manager/manager.go index e49e0e6..c26809d 100644 --- a/pkg/core/manager.go +++ b/pkg/manager/manager.go @@ -1,4 +1,4 @@ -package core +package manager import ( "fmt"