diff --git a/core/2globalsWIN.go b/core/2globalsWIN.go index 8e6eb6c..c9c3c0a 100644 --- a/core/2globalsWIN.go +++ b/core/2globalsWIN.go @@ -2,10 +2,12 @@ package core +import "github.com/rwinkhart/go-boilerplate/back" + var ( - EntryRoot = Home + "\\AppData\\Local\\libmutton\\entries" // Path to libmutton entry directory - ConfigDir = Home + "\\AppData\\Local\\libmutton\\config" // Path to libmutton configuration directory - ConfigPath = ConfigDir + "\\libmutton.ini" // Path to libmutton configuration file + EntryRoot = back.Home + "\\AppData\\Local\\libmutton\\entries" // Path to libmutton entry directory + ConfigDir = back.Home + "\\AppData\\Local\\libmutton\\config" // Path to libmutton configuration directory + ConfigPath = ConfigDir + "\\libmutton.ini" // Path to libmutton configuration file ) const ( diff --git a/core/clipClearProcessDROID.go b/core/clipClearProcessDROID.go index 450fc29..cfc1294 100644 --- a/core/clipClearProcessDROID.go +++ b/core/clipClearProcessDROID.go @@ -6,6 +6,7 @@ import ( "strings" "time" + "github.com/rwinkhart/go-boilerplate/back" "golang.design/x/clipboard" ) @@ -14,7 +15,7 @@ import ( func clipClearProcess(assignedContents string) { clearClipboard := func() { clipboard.Write(clipboard.FmtText, []byte("")) - Exit(0) + back.Exit(0) } // if assignedContents is empty, clear the clipboard immediately and unconditionally diff --git a/core/copyDARWIN.go b/core/copyDARWIN.go index 5e858c5..56219d1 100644 --- a/core/copyDARWIN.go +++ b/core/copyDARWIN.go @@ -4,15 +4,17 @@ package core import ( "os/exec" + + "github.com/rwinkhart/go-boilerplate/back" ) // copyString copies a string to the clipboard. func copyString(continuous bool, copySubject string) { cmd := exec.Command("pbcopy") - writeToStdin(cmd, copySubject) + back.WriteToStdin(cmd, copySubject) err := cmd.Run() if err != nil { - PrintError("Failed to copy to clipboard: "+err.Error(), ErrorClipboard, true) + back.PrintError("Failed to copy to clipboard: "+err.Error(), ErrorClipboard, true) } if !continuous { @@ -23,6 +25,6 @@ func copyString(continuous bool, copySubject string) { // getClipCommands returns the commands for pasting and clearing the clipboard contents. func getClipCommands() (*exec.Cmd, *exec.Cmd) { cmdClear := exec.Command("pbcopy") - writeToStdin(cmdClear, "") + back.WriteToStdin(cmdClear, "") return exec.Command("pbpaste"), cmdClear } diff --git a/core/copyTERMUX.go b/core/copyTERMUX.go index aaa808e..8f5ab88 100644 --- a/core/copyTERMUX.go +++ b/core/copyTERMUX.go @@ -4,15 +4,17 @@ package core import ( "os/exec" + + "github.com/rwinkhart/go-boilerplate/back" ) // copyString copies a string to the clipboard. func copyString(continuous bool, copySubject string) { cmd := exec.Command("termux-clipboard-set") - writeToStdin(cmd, copySubject) + back.WriteToStdin(cmd, copySubject) err := cmd.Run() if err != nil { - PrintError("Failed to copy to clipboard: "+err.Error(), ErrorClipboard, true) + back.PrintError("Failed to copy to clipboard: "+err.Error(), ErrorClipboard, true) } if !continuous { @@ -23,6 +25,6 @@ func copyString(continuous bool, copySubject string) { // getClipCommands returns the commands for pasting and clearing the clipboard contents. func getClipCommands() (*exec.Cmd, *exec.Cmd) { cmdClear := exec.Command("termux-clipboard-set") - writeToStdin(cmdClear, "") + back.WriteToStdin(cmdClear, "") return exec.Command("termux-clipboard-get"), cmdClear } diff --git a/core/copyWIN.go b/core/copyWIN.go index 29cf5f8..cb8c753 100644 --- a/core/copyWIN.go +++ b/core/copyWIN.go @@ -6,6 +6,8 @@ import ( "fmt" "os/exec" "strings" + + "github.com/rwinkhart/go-boilerplate/back" ) // copyString copies a string to the clipboard. @@ -13,7 +15,7 @@ func copyString(continuous bool, copySubject string) { cmd := exec.Command("powershell.exe", "-c", fmt.Sprintf("echo '%s' | Set-Clipboard", strings.ReplaceAll(copySubject, "'", "''"))) err := cmd.Run() if err != nil { - PrintError("Failed to copy to clipboard: "+err.Error(), ErrorClipboard, true) + back.PrintError("Failed to copy to clipboard: "+err.Error(), ErrorClipboard, true) } if !continuous { diff --git a/core/launchClipClearProcessCLIGeneric.go b/core/launchClipClearProcessCLIGeneric.go index 27bc563..7a2fb27 100644 --- a/core/launchClipClearProcessCLIGeneric.go +++ b/core/launchClipClearProcessCLIGeneric.go @@ -5,13 +5,15 @@ package core import ( "os" "os/exec" + + "github.com/rwinkhart/go-boilerplate/back" ) // LaunchClipClearProcess launches the timed clipboard clearing process. // 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") - 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/sync/commonWIN.go b/sync/commonWIN.go index cf7fe25..3a82be5 100644 --- a/sync/commonWIN.go +++ b/sync/commonWIN.go @@ -8,6 +8,7 @@ import ( "path/filepath" "strings" + "github.com/rwinkhart/go-boilerplate/back" "github.com/rwinkhart/libmutton/core" ) @@ -25,9 +26,9 @@ func WalkEntryDir() ([]string, []string) { // check for errors encountered while walking directory if err != nil { if os.IsNotExist(err) { - core.PrintError("The entry directory does not exist - Initialize libmutton to create it", core.ErrorOther, true) + back.PrintError("The entry directory does not exist - Initialize libmutton to create it", back.ErrorOther, true) } else { - core.PrintError("An unexpected error occurred while generating the entry list: "+err.Error(), core.ErrorOther, true) + back.PrintError("An unexpected error occurred while generating the entry list: "+err.Error(), back.ErrorOther, true) } }