From a539d6489639217c1b2fded6ff7238b2d5e7b5da Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 15 Aug 2021 12:09:54 -0700
Subject: [PATCH] refactor

---
 weed/shell/command_remote_cache.go     |  3 ++-
 weed/shell/command_remote_meta_sync.go | 17 ++++++++---------
 weed/shell/command_remote_mount.go     |  3 +++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/weed/shell/command_remote_cache.go b/weed/shell/command_remote_cache.go
index 21c479258..f032239f3 100644
--- a/weed/shell/command_remote_cache.go
+++ b/weed/shell/command_remote_cache.go
@@ -52,8 +52,9 @@ func (c *commandRemoteCache) Do(args []string, commandEnv *CommandEnv, writer io
 		return nil
 	}
 
-	localMountedDir, remoteStorageMountedLocation, remoteStorageConf, detectErr := detectMountInfo(commandEnv, writer, *dir)
+	mappings, localMountedDir, remoteStorageMountedLocation, remoteStorageConf, detectErr := detectMountInfo(commandEnv, writer, *dir)
 	if detectErr != nil{
+		jsonPrintln(writer, mappings)
 		return detectErr
 	}
 
diff --git a/weed/shell/command_remote_meta_sync.go b/weed/shell/command_remote_meta_sync.go
index b6fb15a62..d2b88ec16 100644
--- a/weed/shell/command_remote_meta_sync.go
+++ b/weed/shell/command_remote_meta_sync.go
@@ -54,8 +54,9 @@ func (c *commandRemoteMetaSync) Do(args []string, commandEnv *CommandEnv, writer
 		return nil
 	}
 
-	localMountedDir, remoteStorageMountedLocation, remoteStorageConf, detectErr := detectMountInfo(commandEnv, writer, *dir)
+	mappings, localMountedDir, remoteStorageMountedLocation, remoteStorageConf, detectErr := detectMountInfo(commandEnv, writer, *dir)
 	if detectErr != nil{
+		jsonPrintln(writer, mappings)
 		return detectErr
 	}
 
@@ -67,14 +68,13 @@ func (c *commandRemoteMetaSync) Do(args []string, commandEnv *CommandEnv, writer
 	return nil
 }
 
-func detectMountInfo(commandEnv *CommandEnv, writer io.Writer, dir string) (string, *filer_pb.RemoteStorageLocation, *filer_pb.RemoteConf, error) {
+func detectMountInfo(commandEnv *CommandEnv, writer io.Writer, dir string) (*filer_pb.RemoteStorageMapping, string, *filer_pb.RemoteStorageLocation, *filer_pb.RemoteConf, error) {
 	mappings, listErr := filer.ReadMountMappings(commandEnv.option.GrpcDialOption, commandEnv.option.FilerAddress)
 	if listErr != nil {
-		return "", nil, nil, listErr
+		return nil, "", nil, nil, listErr
 	}
 	if dir == "" {
-		jsonPrintln(writer, mappings)
-		return "", nil, nil, fmt.Errorf("need to specify '-dir' option")
+		return mappings, "", nil, nil, fmt.Errorf("need to specify '-dir' option")
 	}
 
 	var localMountedDir string
@@ -85,17 +85,16 @@ func detectMountInfo(commandEnv *CommandEnv, writer io.Writer, dir string) (stri
 		}
 	}
 	if localMountedDir == "" {
-		jsonPrintln(writer, mappings)
-		return "", nil, nil, fmt.Errorf("%s is not mounted", dir)
+		return mappings, localMountedDir, remoteStorageMountedLocation, nil, fmt.Errorf("%s is not mounted", dir)
 	}
 
 	// find remote storage configuration
 	remoteStorageConf, err := filer.ReadRemoteStorageConf(commandEnv.option.GrpcDialOption, commandEnv.option.FilerAddress, remoteStorageMountedLocation.Name)
 	if err != nil {
-		return "", nil, nil, err
+		return mappings, localMountedDir, remoteStorageMountedLocation, remoteStorageConf, err
 	}
 
-	return localMountedDir, remoteStorageMountedLocation, remoteStorageConf, nil
+	return mappings, localMountedDir, remoteStorageMountedLocation, remoteStorageConf, nil
 }
 
 /*
diff --git a/weed/shell/command_remote_mount.go b/weed/shell/command_remote_mount.go
index 077c64e94..f675d706e 100644
--- a/weed/shell/command_remote_mount.go
+++ b/weed/shell/command_remote_mount.go
@@ -95,6 +95,9 @@ func listExistingRemoteStorageMounts(commandEnv *CommandEnv, writer io.Writer) (
 }
 
 func jsonPrintln(writer io.Writer, message proto.Message) error {
+	if message == nil {
+		return nil
+	}
 	m := jsonpb.Marshaler{
 		EmitDefaults: false,
 		Indent:       "  ",