From aee1ab19c26e6f4e0dad79f0661833e7e91b8a02 Mon Sep 17 00:00:00 2001
From: mstmdev <mstmdev@gmail.com>
Date: Fri, 24 Dec 2021 10:30:41 +0800
Subject: [PATCH] Code refactoring

---
 cmd/gofs/main.go                 | 6 +-----
 monitor/monitor.go               | 2 +-
 monitor/remote_client_monitor.go | 2 +-
 server/middleware/login.go       | 3 +--
 server/server.go                 | 3 +--
 tran/tcpserver.go                | 2 --
 util/hash.go                     | 1 +
 7 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/cmd/gofs/main.go b/cmd/gofs/main.go
index 7062c95f..af4beceb 100644
--- a/cmd/gofs/main.go
+++ b/cmd/gofs/main.go
@@ -99,11 +99,7 @@ func main() {
 		log.Error(err, "create the instance of Monitor error")
 		return
 	}
-	defer func() {
-		if err = monitor.Close(); err != nil {
-			log.Error(err, "close monitor error")
-		}
-	}()
+	defer monitor.Close()
 
 	// start monitor
 	log.Log("monitor is starting...")
diff --git a/monitor/monitor.go b/monitor/monitor.go
index 52002d12..f855ba1e 100644
--- a/monitor/monitor.go
+++ b/monitor/monitor.go
@@ -27,7 +27,7 @@ func NewMonitor(syncer sync.Sync, retry retry.Retry, syncOnce bool, enableTLS bo
 	} else if src.Is(core.RemoteDisk) && src.Server() {
 		return NewFsNotifyMonitor(syncer, retry, syncOnce)
 	} else if src.Is(core.RemoteDisk) && !src.Server() {
-		return NewRemoteClientMonitor(syncer, retry, syncOnce, src.Host(), src.Port(), enableTLS, certFile, keyFile, users)
+		return NewRemoteClientMonitor(syncer, retry, syncOnce, src.Host(), src.Port(), enableTLS, users)
 	}
 	return nil, fmt.Errorf("file system unsupported ! src=>%s", src.Type().String())
 
diff --git a/monitor/remote_client_monitor.go b/monitor/remote_client_monitor.go
index 00898736..158188b9 100644
--- a/monitor/remote_client_monitor.go
+++ b/monitor/remote_client_monitor.go
@@ -31,7 +31,7 @@ type message struct {
 }
 
 // NewRemoteClientMonitor create an instance of remoteClientMonitor to monitor the remote file change
-func NewRemoteClientMonitor(syncer sync.Sync, retry retry.Retry, syncOnce bool, host string, port int, enableTLS bool, certFile string, keyFile string, users []*auth.User) (Monitor, error) {
+func NewRemoteClientMonitor(syncer sync.Sync, retry retry.Retry, syncOnce bool, host string, port int, enableTLS bool, users []*auth.User) (Monitor, error) {
 	if syncer == nil {
 		err := errors.New("syncer can't be nil")
 		return nil, err
diff --git a/server/middleware/login.go b/server/middleware/login.go
index 2f7d388d..1997c2c7 100644
--- a/server/middleware/login.go
+++ b/server/middleware/login.go
@@ -25,8 +25,7 @@ func NewLoginHandler(users []*auth.User) handler.GinHandler {
 
 func (h *loginHandler) Handle(c *gin.Context) {
 	defer func() {
-		e := recover()
-		if e != nil {
+		if e := recover(); e != nil {
 			log.Error(fmt.Errorf("%v", e), "user login error")
 			c.String(http.StatusOK, "user login error")
 		}
diff --git a/server/server.go b/server/server.go
index bb9c2bde..92a0e238 100644
--- a/server/server.go
+++ b/server/server.go
@@ -95,8 +95,7 @@ func ReleaseTemplate(releasePath string, serverTemplateOverride bool) error {
 	if err != nil {
 		return err
 	}
-	err = os.MkdirAll(filepath.ToSlash(releasePath), os.ModePerm)
-	if err != nil {
+	if err = os.MkdirAll(filepath.ToSlash(releasePath), os.ModePerm); err != nil {
 		return err
 	}
 	for _, f := range files {
diff --git a/tran/tcpserver.go b/tran/tcpserver.go
index 9233449f..fd2afbaa 100644
--- a/tran/tcpserver.go
+++ b/tran/tcpserver.go
@@ -47,8 +47,6 @@ func NewServer(ip string, port int, enableTLS bool, certFile string, keyFile str
 	}
 	if len(srv.users) == 0 {
 		log.Warn("the tcp server allows anonymous access, you should set some server users by the -users or -rand_user_count flag for security reasons")
-	} else {
-
 	}
 	return srv
 }
diff --git a/util/hash.go b/util/hash.go
index 8270438e..9747a3ea 100644
--- a/util/hash.go
+++ b/util/hash.go
@@ -10,6 +10,7 @@ import (
 )
 
 // MD5FromFile calculate the hash value of the file
+// If you reuse the file reader, please set its offset to start position first, like os.File.Seek
 func MD5FromFile(file io.Reader, bufSize int) (hash string, err error) {
 	if file == nil {
 		err = errors.New("file is nil")