Reorganize function parameters to not specify repeat types

This commit is contained in:
2024-05-29 13:23:08 -04:00
parent 53f88e8739
commit 971556aabc
6 changed files with 8 additions and 8 deletions
+3 -3
View File
@@ -11,7 +11,7 @@ import (
) )
// CopyArgument copies a field from an entry to the clipboard // CopyArgument copies a field from an entry to the clipboard
func CopyArgument(targetLocation string, field int, executableName string) { func CopyArgument(executableName, targetLocation string, field int) {
if isFile, _ := TargetIsFile(targetLocation, true, 2); isFile { if isFile, _ := TargetIsFile(targetLocation, true, 2); isFile {
decryptedEntry := DecryptGPG(targetLocation) decryptedEntry := DecryptGPG(targetLocation)
@@ -41,7 +41,7 @@ func CopyArgument(targetLocation string, field int, executableName string) {
for { // keep field copied to clipboard, refresh on 30-second intervals for { // keep field copied to clipboard, refresh on 30-second intervals
currentTime := time.Now() currentTime := time.Now()
copyField(GenTOTP(secret, currentTime, forSteam), "") copyField("", GenTOTP(secret, currentTime, forSteam))
// sleep until next 30-second interval // sleep until next 30-second interval
time.Sleep(time.Duration(30-(currentTime.Second()%30)) * time.Second) time.Sleep(time.Duration(30-(currentTime.Second()%30)) * time.Second)
} }
@@ -52,7 +52,7 @@ func CopyArgument(targetLocation string, field int, executableName string) {
} }
// copy field to clipboard, launch clipboard clearing process // copy field to clipboard, launch clipboard clearing process
copyField(copySubject, executableName) copyField(executableName, copySubject)
} }
} }
+1 -1
View File
@@ -13,7 +13,7 @@ import (
// TODO MacOS support is entirely untested - I would appreciate feedback on this implementation // TODO MacOS support is entirely untested - I would appreciate feedback on this implementation
// copyField copies a field from an entry to the clipboard // copyField copies a field from an entry to the clipboard
func copyField(copySubject string, executableName string) { func copyField(executableName, copySubject string) {
cmd := exec.Command("pbcopy") cmd := exec.Command("pbcopy")
writeToStdin(cmd, copySubject) writeToStdin(cmd, copySubject)
err := cmd.Run() err := cmd.Run()
+1 -1
View File
@@ -11,7 +11,7 @@ import (
) )
// copyField copies a field from an entry to the clipboard // copyField copies a field from an entry to the clipboard
func copyField(copySubject string, executableName string) { func copyField(executableName, copySubject string) {
cmd := exec.Command("termux-clipboard-set") cmd := exec.Command("termux-clipboard-set")
writeToStdin(cmd, copySubject) writeToStdin(cmd, copySubject)
err := cmd.Run() err := cmd.Run()
+1 -1
View File
@@ -11,7 +11,7 @@ import (
) )
// copyField copies a field from an entry to the clipboard // copyField copies a field from an entry to the clipboard
func copyField(copySubject string, executableName string) { func copyField(executableName, copySubject string) {
var envSet bool // track whether environment variables are set var envSet bool // track whether environment variables are set
var cmd *exec.Cmd var cmd *exec.Cmd
// determine whether to use wl-copy (Wayland) or xclip (X11) // determine whether to use wl-copy (Wayland) or xclip (X11)
+1 -1
View File
@@ -11,7 +11,7 @@ import (
) )
// copyField copies a field from an entry to the clipboard // copyField copies a field from an entry to the clipboard
func copyField(copySubject string, executableName string) { func copyField(executableName, copySubject string) {
cmd := exec.Command("powershell.exe", "-c", fmt.Sprintf("echo '%s' | Set-Clipboard", strings.ReplaceAll(copySubject, "'", "''"))) cmd := exec.Command("powershell.exe", "-c", fmt.Sprintf("echo '%s' | Set-Clipboard", strings.ReplaceAll(copySubject, "'", "''")))
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
+1 -1
View File
@@ -22,7 +22,7 @@ func GetOldEntryData(targetLocation string, field int) []string {
} }
// Rename renames oldLocation to newLocation // Rename renames oldLocation to newLocation
func Rename(oldLocation string, newLocation string) { func Rename(oldLocation, newLocation string) {
// ensure newLocation does not exist // ensure newLocation does not exist
_, isAccessible := TargetIsFile(newLocation, false, 0) _, isAccessible := TargetIsFile(newLocation, false, 0)
if isAccessible { if isAccessible {