diff --git a/core/copy.go b/core/copy.go index 28a0d9d..e36030f 100644 --- a/core/copy.go +++ b/core/copy.go @@ -15,7 +15,10 @@ import ( // CopyArgument copies a field from an entry to the clipboard. func CopyArgument(targetLocation string, field int) error { - if isFile, _ := back.TargetIsFile(targetLocation, true, 2); isFile { + if isFile, _, err := back.TargetIsFile(targetLocation, true, 2); isFile { + if err != nil { + return err + } decryptedEntry, err := crypt.DecryptFileToSlice(targetLocation) if err != nil { diff --git a/core/init.go b/core/init.go index 64880b3..9add3b9 100644 --- a/core/init.go +++ b/core/init.go @@ -21,7 +21,7 @@ func LibmuttonInit(inputCB func(prompt string) string, clientSpecificIniData [][ // ensure ssh key file exists fallbackSSHKey := back.Home + global.PathSeparator + ".ssh" + global.PathSeparator + "id_ed25519" sshKeyPath := cmp.Or(back.ExpandPathWithHome(inputCB(back.AnsiBold+"Note:"+back.AnsiReset+" Only key-based authentication is supported (keys may optionally be passphrase-protected).\n The remote server must already be in your ~"+global.PathSeparator+".ssh"+global.PathSeparator+"known_hosts file.\n\nSSH private identity file path (falls back to \""+fallbackSSHKey+"\"):")), fallbackSSHKey) - sshKeyIsFile, _ := back.TargetIsFile(sshKeyPath, false, 0) + sshKeyIsFile, _, _ := back.TargetIsFile(sshKeyPath, false, 0) // error is ignored because errorOnFail is false if !sshKeyIsFile { return errors.New("SSH identity file not found: " + sshKeyPath) } diff --git a/core/launchClipClearProcessCLIGeneric.go b/core/launchClipClearProcessCLIGeneric.go index 7a2fb27..57aa621 100644 --- a/core/launchClipClearProcessCLIGeneric.go +++ b/core/launchClipClearProcessCLIGeneric.go @@ -13,7 +13,7 @@ import ( // For non-interactive CLI implementations, an entirely separate process is created for this purpose. func LaunchClipClearProcess(copySubject string) { cmd := exec.Command(os.Args[0], "clipclear") - back.WriteToStdin(cmd, copySubject) - cmd.Start() + _ = back.WriteToStdin(cmd, copySubject) + _ = cmd.Start() os.Exit(0) // use os.Exit directly since this version of this function is only meant for non-interactive CLI implementations } diff --git a/core/launchClipClearProcessCLIUNIX.go b/core/launchClipClearProcessCLIUNIX.go index d780186..ebd3d1d 100644 --- a/core/launchClipClearProcessCLIUNIX.go +++ b/core/launchClipClearProcessCLIUNIX.go @@ -14,7 +14,7 @@ import ( // For non-interactive CLI implementations, an entirely separate process is created for this purpose. func LaunchClipClearProcess(copySubject string, isWayland bool) { cmd := exec.Command(os.Args[0], "clipclear", strconv.FormatBool(isWayland)) - back.WriteToStdin(cmd, copySubject) + _ = back.WriteToStdin(cmd, copySubject) _ = cmd.Start() os.Exit(0) // use os.Exit directly since this version of this function is only meant for non-interactive CLI implementations } diff --git a/core/utilitiesMisc.go b/core/utilitiesMisc.go index 9bee40f..0412222 100644 --- a/core/utilitiesMisc.go +++ b/core/utilitiesMisc.go @@ -156,13 +156,13 @@ func ClampTrailingWhitespace(note []string) { // Returns: statusCode (0 = success, 1 = target location already exists, 2 = containing directory is invalid). func EntryAddPrecheck(targetLocation string) (uint8, error) { // ensure target location does not already exist - _, isAccessible := back.TargetIsFile(targetLocation, false, 0) + _, isAccessible, _ := back.TargetIsFile(targetLocation, false, 0) // error is ignored because errorOnFail is false if isAccessible { return 1, errors.New("target location already exists") } // ensure target containing directory exists and is a directory (not a file) containingDir := targetLocation[:strings.LastIndex(targetLocation, global.PathSeparator)] - isFile, isAccessible := back.TargetIsFile(containingDir, false, 1) + isFile, isAccessible, _ := back.TargetIsFile(containingDir, false, 1) // error is ignored because errorOnFail is false if isFile || !isAccessible { return 2, errors.New("\"" + containingDir + "\" is not a valid containing directory") } diff --git a/global/1globals.go b/global/1globals.go index 2df853e..cbc523a 100644 --- a/global/1globals.go +++ b/global/1globals.go @@ -13,10 +13,8 @@ const ( FSPath = "\u259e" // ▞ Path separator FSMisc = "\u259f" // ▟ Misc. field separator (if \u259d is already used) - ErrorSyncProcess = 103 - ErrorServerConnection = 104 - ErrorTargetExists = 106 - ErrorDecryption = 108 - ErrorEncryption = 109 - ErrorClipboard = 110 + ErrorSyncProcess = 104 + ErrorDecryption = 105 + ErrorEncryption = 106 + ErrorClipboard = 107 ) diff --git a/global/init.go b/global/init.go index 54db209..91de0ca 100644 --- a/global/init.go +++ b/global/init.go @@ -24,7 +24,7 @@ func DirInit(preserveOldConfigDir bool) (string, error) { // remove existing config directory (if it exists and not in append mode) if !preserveOldConfigDir { - _, isAccessible := back.TargetIsFile(ConfigDir, false, 1) + _, isAccessible, _ := back.TargetIsFile(ConfigDir, false, 1) // error is ignored because errorOnFail is false if isAccessible { err = os.RemoveAll(ConfigDir) if err != nil { diff --git a/go.mod b/go.mod index e8ab0e7..430ebde 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.3 require ( github.com/pkg/sftp v1.13.9 github.com/pquerna/otp v1.5.0 - github.com/rwinkhart/go-boilerplate v0.0.0-20250529185306-e2e64d7fa43b + github.com/rwinkhart/go-boilerplate v0.0.0-20250601181619-e38a47784de0 github.com/rwinkhart/rcw v0.2.0 golang.design/x/clipboard v0.7.0 // only for Android builds golang.org/x/crypto v0.38.0 diff --git a/go.sum b/go.sum index 17c2e15..6dd9c8a 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs= github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= -github.com/rwinkhart/go-boilerplate v0.0.0-20250529185306-e2e64d7fa43b h1:ENgsUlCmYktd1eauEkjW6Fu8rgZzyGOS/m/6jc968xI= -github.com/rwinkhart/go-boilerplate v0.0.0-20250529185306-e2e64d7fa43b/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= +github.com/rwinkhart/go-boilerplate v0.0.0-20250601181619-e38a47784de0 h1:Zuwn0er30tMYrBXD1n4nM3mkGhrLFAdn3sZyMHkxx2I= +github.com/rwinkhart/go-boilerplate v0.0.0-20250601181619-e38a47784de0/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= github.com/rwinkhart/go-winio-easy-pipe-handles v0.0.0-20250407031321-96994a0e8410 h1:NhHwFM3Pgm6zRUfFKvi0p5ndjfFbVWsRwmmhyFlG4PE= github.com/rwinkhart/go-winio-easy-pipe-handles v0.0.0-20250407031321-96994a0e8410/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/rwinkhart/peercred-mini v0.1.0 h1:TiS6u8cEWzW55S9X4iVpU72Iuy/NG6rMUJMtUEVEFLw= diff --git a/libmuttonserver.go b/libmuttonserver.go index 8034183..7ed8080 100644 --- a/libmuttonserver.go +++ b/libmuttonserver.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/rwinkhart/go-boilerplate/back" + "github.com/rwinkhart/go-boilerplate/other" "github.com/rwinkhart/libmutton/global" "github.com/rwinkhart/libmutton/synccommon" "github.com/rwinkhart/libmutton/syncserver" @@ -70,7 +71,7 @@ func main() { // create the necessary directories for libmuttonserver to function _, err := global.DirInit(false) if err != nil { - back.PrintError("Failed to initialize libmuttonserver directories: "+err.Error(), back.ErrorWrite, true) + other.PrintError("Failed to initialize libmuttonserver directories: "+err.Error(), back.ErrorWrite, true) } _ = os.MkdirAll(global.ConfigDir+global.PathSeparator+"deletions", 0700) // error ignored; failure would have occurred by this point in core.DirInit fmt.Println("libmuttonserver directories initialized") diff --git a/syncclient/client.go b/syncclient/client.go index 7a0d398..4aabfc1 100644 --- a/syncclient/client.go +++ b/syncclient/client.go @@ -417,7 +417,7 @@ func folderSync(folders []string) error { folderFullPath := global.TargetLocationFormat(folder) // check if folder already exists - isFile, isAccessible := back.TargetIsFile(folderFullPath, false, 1) + isFile, isAccessible, _ := back.TargetIsFile(folderFullPath, false, 1) // error is ignored because errorOnFail is false if !isFile && !isAccessible { err := os.MkdirAll(folderFullPath, 0700) diff --git a/synccommon/common.go b/synccommon/common.go index 9dc8875..dfb1bc1 100644 --- a/synccommon/common.go +++ b/synccommon/common.go @@ -66,7 +66,10 @@ func ShearLocal(targetLocationIncomplete, clientDeviceID string) (string, bool, 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 - isFile, _ = back.TargetIsFile(targetLocationComplete, true, 0) + isFile, _, err = back.TargetIsFile(targetLocationComplete, true, 0) + if err != nil { + return "", false, err + } } err = os.RemoveAll(targetLocationComplete) if err != nil { @@ -93,7 +96,7 @@ func RenameLocal(oldLocationIncomplete, newLocationIncomplete string, verifyOldL } // ensure newLocation does not exist - _, isAccessible := back.TargetIsFile(newLocation, false, 0) + _, isAccessible, _ := back.TargetIsFile(newLocation, false, 0) // error is ignored because errorOnFail is false if isAccessible { return errors.New("target already exists: " + newLocation) }