Do not determine online/offline mode based on device ID presence

syncclient/oneOff.go

@@ -9,16 +9,18 @@ import (
 	"github.com/rwinkhart/libmutton/synccommon"
 )
 
-// ShearRemoteFromClient removes the target file or directory from the local system and calls the server to remove it remotely and add it to the deletions list.
+// ShearRemoteFromClient removes the target file or directory from
-// It can safely be called in offline mode, as well, so this is the intended interface for shearing (ShearLocal should only be used directly by the server binary).
+// the local system and calls the server to remove it remotely and
+// add it to the deletions list.
+// It can safely be called in offline mode, as well, so this is
+// the intended interface for shearing (ShearLocal should only
+// be used directly by the server binary).
 func ShearRemoteFromClient(targetLocationIncomplete string) error {
 	deviceID, isDir, err := synccommon.ShearLocal(targetLocationIncomplete, "") // remove the target from the local system and get the device ID of the client
 	if err != nil {
 		return errors.New("unable to shear target locally: " + err.Error())
 	}
 
-	if deviceID != "" { // ensure a device ID exists (online mode)
-		// create an SSH client
 	sshClient, offlineMode, _, _, err := GetSSHClient()
 	if offlineMode {
 		goto end
@@ -26,6 +28,9 @@ func ShearRemoteFromClient(targetLocationIncomplete string) error {
 	if err != nil {
 		return errors.New("unable to connect to SSH client: " + err.Error())
 	}
+	if deviceID == "" {
+		return errors.New("unable to shear target remotely: no device ID found")
+	}
 
 	// ensure targetLocationIncomplete ends with a slash if it is a directory (for clarity in shear message)
 	if isDir && !strings.HasSuffix(targetLocationIncomplete, "/") {
@@ -43,15 +48,17 @@ func ShearRemoteFromClient(targetLocationIncomplete string) error {
 	if err != nil {
 		return errors.New("unable to close SSH client: " + err.Error())
 	}
-	}
 
 end:
 	back.Exit(0) // sync is not required after shearing since the target has already been removed from the local system
 	return nil
 }
 
-// RenameRemoteFromClient renames oldLocationIncomplete to newLocationIncomplete on the local system and calls the server to perform the rename remotely and add the old target to the deletions list.
+// RenameRemoteFromClient renames oldLocationIncomplete to newLocationIncomplete on
-// It can safely be called in offline mode, as well, so this is the intended interface for renaming (RenameLocal should only be used directly by the server binary).
+// the local system and calls the server to perform the rename remotely and add the
+// old target to the deletions list.
+// It can safely be called in offline mode, as well, so this is the intended
+// interface for renaming (RenameLocal should only be used directly by the server binary).
 func RenameRemoteFromClient(oldLocationIncomplete, newLocationIncomplete string) error {
 	err := synccommon.RenameLocal(oldLocationIncomplete, newLocationIncomplete, false) // move the target on the local system
 	if err != nil {
@@ -62,7 +69,6 @@ func RenameRemoteFromClient(oldLocationIncomplete, newLocationIncomplete string)
 	if err != nil {
 		return errors.New("unable to generate device ID list: " + err.Error())
 	}
-	if len(deviceIDList) > 0 { // ensure a device ID exists (online mode)
 	// create an SSH client
 	sshClient, offlineMode, _, _, err := GetSSHClient()
 	if offlineMode {
@@ -71,6 +77,9 @@ func RenameRemoteFromClient(oldLocationIncomplete, newLocationIncomplete string)
 	if err != nil {
 		return errors.New("unable to connect to SSH client: " + err.Error())
 	}
+	if deviceIDList[0].Name() == "" {
+		return errors.New("unable to rename target remotely: no device ID found")
+	}
 
 	// call the server to move the target on the remote system and add the old target to the deletions list
 	_, err = GetSSHOutput(sshClient, "libmuttonserver rename",
@@ -86,26 +95,23 @@ func RenameRemoteFromClient(oldLocationIncomplete, newLocationIncomplete string)
 	if err != nil {
 		return errors.New("unable to close SSH client: " + err.Error())
 	}
-	}
 
 end:
 	back.Exit(0)
 	return nil
 }
 
-// AddFolderRemoteFromClient creates a new entry-containing directory on the local system and calls the server to create the folder remotely.
+// AddFolderRemoteFromClient creates a new entry-containing directory
-// It can safely be called in offline mode, as well, so this is the intended interface for adding folders (AddFolderLocal should only be used directly by the server binary).
+// on the local system and calls the server to create the folder remotely.
+// It can safely be called in offline mode, as well, so this is the
+// intended interface for adding folders (AddFolderLocal should only be
+// used directly by the server binary).
 func AddFolderRemoteFromClient(targetLocationIncomplete string) error {
 	err := synccommon.AddFolderLocal(targetLocationIncomplete) // add the folder on the local system
 	if err != nil {
 		return errors.New("unable to add folder locally: " + err.Error())
 	}
 
-	deviceIDList, err := global.GenDeviceIDList()
-	if err != nil {
-		return errors.New("unable to generate device ID list: " + err.Error())
-	}
-	if len(deviceIDList) > 0 { // ensure a device ID exists (online mode)
 	// create an SSH client
 	sshClient, offlineMode, _, _, err := GetSSHClient()
 	if offlineMode {
@@ -126,7 +132,6 @@ func AddFolderRemoteFromClient(targetLocationIncomplete string) error {
 	if err != nil {
 		return errors.New("unable to close SSH client: " + err.Error())
 	}
-	}
 
 end:
 	back.Exit(0)

synccommon/common.go

@@ -62,7 +62,7 @@ func ShearLocal(targetLocationIncomplete, clientDeviceID string) (string, bool,
 		}
 	}
 
-	// get the full targetLocation path and remove the target
+	// remove the target locally
 	targetLocationComplete := global.TargetLocationFormat(targetLocationIncomplete)
 	var isFile bool
 	if !onServer { // error if target does not exist on client, needed because os.RemoveAll does not return an error if target does not exist
@@ -112,7 +112,7 @@ func RenameLocal(oldLocationIncomplete, newLocationIncomplete string, verifyOldL
 // AddFolderLocal creates a new entry-containing directory on the local system.
 // This function should only be used directly by the server binary.
 func AddFolderLocal(targetLocationIncomplete string) error {
-	// get the full targetLocation path and create the target
+	// create the target locally
 	targetLocationComplete := global.TargetLocationFormat(targetLocationIncomplete)
 	err := os.Mkdir(targetLocationComplete, 0700)
 	if err != nil {