From ed52dd691c1be69b3842545694c9a5a08198c5e5 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Fri, 31 Dec 2021 12:55:37 +0100 Subject: [PATCH] move md5 tools --- internal/md5/file.go | 22 +++++++++++++++++ internal/piwigo/piwigotools/file_to_upload.go | 4 +++- internal/piwigo/piwigotools/md5.go | 24 ------------------- 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 internal/md5/file.go delete mode 100644 internal/piwigo/piwigotools/md5.go diff --git a/internal/md5/file.go b/internal/md5/file.go new file mode 100644 index 0000000..cd2ac3f --- /dev/null +++ b/internal/md5/file.go @@ -0,0 +1,22 @@ +package md5 + +import ( + "crypto/md5" + "fmt" + "io" + "os" +) + +func File(filename string) (string, error) { + file, err := os.Open(filename) + if err != nil { + return "", err + } + defer file.Close() + + hash := md5.New() + if _, err = io.Copy(hash, file); err != nil { + return "", err + } + return fmt.Sprintf("%x", hash.Sum(nil)), nil +} diff --git a/internal/piwigo/piwigotools/file_to_upload.go b/internal/piwigo/piwigotools/file_to_upload.go index ebda35e..618256b 100644 --- a/internal/piwigo/piwigotools/file_to_upload.go +++ b/internal/piwigo/piwigotools/file_to_upload.go @@ -4,6 +4,8 @@ import ( "os" "path/filepath" "strings" + + "github.com/celogeek/piwigo-cli/internal/md5" ) type FileToUpload struct { @@ -26,7 +28,7 @@ func (f *FileToUpload) Checked() bool { func (f *FileToUpload) MD5() string { if f.md5 == nil { - md5, err := Md5File(f.FullPath()) + md5, err := md5.File(f.FullPath()) if err != nil { return "" } diff --git a/internal/piwigo/piwigotools/md5.go b/internal/piwigo/piwigotools/md5.go deleted file mode 100644 index ebfd562..0000000 --- a/internal/piwigo/piwigotools/md5.go +++ /dev/null @@ -1,24 +0,0 @@ -package piwigotools - -import ( - "crypto/md5" - "fmt" - "io" - "os" -) - -func Md5File(filename string) (result string, err error) { - file, err := os.Open(filename) - if err != nil { - return - } - defer file.Close() - - hash := md5.New() - _, err = io.Copy(hash, file) - if err != nil { - return - } - result = fmt.Sprintf("%x", hash.Sum(nil)) - return -}