Merge FileInfo and Message struct to reduce duplicate code

contract/file_info.go

@@ -1,12 +1,14 @@
 package contract
 
 type FileInfo struct {
-	// Path file path
+	// Path the file path
 	Path string `json:"path"`
 	// IsDir is a dir the path
-	IsDir bool `json:"is_dir"`
+	IsDir FsDirValue `json:"is_dir"`
 	// Size the size of path for bytes
 	Size int64 `json:"size"`
+	// Hash calculate the path hash value, if the path is a file
+	Hash string `json:"hash"`
 	// CTime create time, unix sec
 	CTime int64 `json:"c_time"`
 	// ATime last access time, unix sec

monitor/remote_client_monitor.go

@@ -207,9 +207,9 @@ func (m *remoteClientMonitor) processingMessage() {
 			log.Debug("received other message, ignore it => %s", string(message.data))
 		} else {
 			values := url.Values{}
-			values.Add(contract.FsDir, util.String(msg.IsDir))
+			values.Add(contract.FsDir, msg.IsDir.String())
 			values.Add(contract.FsSize, util.String(msg.Size))
-			values.Add(contract.FsHash, util.String(msg.Hash))
+			values.Add(contract.FsHash, msg.Hash)
 			values.Add(contract.FsCtime, util.String(msg.CTime))
 			values.Add(contract.FsAtime, util.String(msg.ATime))
 			values.Add(contract.FsMtime, util.String(msg.MTime))

server/handler/file_api_handler.go

@@ -75,7 +75,7 @@ func (h *fileApiHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
 			}
 			fileList = append(fileList, contract.FileInfo{
 				Path:  file.Name(),
-				IsDir: file.IsDir(),
+				IsDir: contract.ParseFsDirValue(file.IsDir()),
 				Size:  file.Size(),
 				ATime: aTime.Unix(),
 				CTime: cTime.Unix(),

sync/message.go

@@ -5,22 +5,9 @@ import "github.com/no-src/gofs/contract"
 // Message a message of the remote file change
 type Message struct {
 	contract.Status
-	// Path the file path
-	Path string `json:"path"`
+	contract.FileInfo
 	// Action the action of file change
 	Action Action `json:"action"`
 	// BaseUrl the base url of file server
 	BaseUrl string `json:"base_url"`
-	// IsDir is a dir the path
-	IsDir contract.FsDirValue `json:"is_dir"`
-	// Size the size of path for bytes
-	Size int64 `json:"size"`
-	// Hash calculate the path hash value, if the path is a file
-	Hash string `json:"hash"`
-	// CTime create time, unix sec
-	CTime int64 `json:"c_time"`
-	// ATime last access time, unix sec
-	ATime int64 `json:"a_time"`
-	// MTime last modify time, unix sec
-	MTime int64 `json:"m_time"`
 }

sync/remote_client_sync.go

@@ -302,18 +302,14 @@ func (rs *remoteClientSync) sync(serverAddr, path string) error {
 	}
 	for _, file := range files {
 		currentPath := path + "/" + file.Path
-		isDir := contract.FsNotDir
-		if file.IsDir {
-			isDir = contract.FsIsDir
-		}
 		values := url.Values{}
-		values.Add(contract.FsDir, util.String(isDir))
+		values.Add(contract.FsDir, file.IsDir.String())
 		values.Add(contract.FsSize, util.String(file.Size))
 		values.Add(contract.FsCtime, util.String(file.CTime))
 		values.Add(contract.FsAtime, util.String(file.ATime))
 		values.Add(contract.FsMtime, util.String(file.MTime))
 		syncPath := fmt.Sprintf("%s/%s?%s", serverAddr, currentPath, values.Encode())
-		if file.IsDir {
+		if file.IsDir.Bool() {
 			// create directory
 			rs.Create(syncPath)
 			// sync current directory content

sync/remote_server_sync.go

@@ -172,14 +172,16 @@ func (rs *remoteServerSync) send(action Action, path string) (err error) {
 	req := Message{
 		Status:  contract.SuccessStatus(contract.SyncMessageApi),
 		Action:  action,
-		Path:    path,
 		BaseUrl: rs.serverAddr + server.SrcRoutePrefix,
-		IsDir:   isDirValue,
-		Size:    size,
-		Hash:    hash,
-		CTime:   cTime.Unix(),
-		ATime:   aTime.Unix(),
-		MTime:   mTime.Unix(),
+		FileInfo: contract.FileInfo{
+			Path:  path,
+			IsDir: isDirValue,
+			Size:  size,
+			Hash:  hash,
+			CTime: cTime.Unix(),
+			ATime: aTime.Unix(),
+			MTime: mTime.Unix(),
+		},
 	}
 
 	data, err := util.Marshal(req)