GitHubMirror/MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/MUTN.git synced 2026-08-31 14:26:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace remaining ANSI escape codes with constants

Browse Source
This commit is contained in:
RandyTheSilly
2024-02-27 12:01:35 -05:00
parent fa6d5bc78a
commit ba89fbeab6
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/entryList.go
+8 -6
View File
@@ -11,7 +11,9 @@ import (
// global constants used only in this file // global constants used only in this file
const ( const (
ansiAlternateEntryColor = "\033[38;5;8m" ansiAlternateEntryColor = "\033[38;5;8m"
ansiDirectoryHeader = "\033[38;5;7;48;5;8m"
ansiEmptyDirectoryWarning = "\033[38;5;11m"
) )
// calculates and returns the final visual indentation multiplier (needed to adjust indentation for skipped parent directories) - also subtracts "old" text from directory header // calculates and returns the final visual indentation multiplier (needed to adjust indentation for skipped parent directories) - also subtracts "old" text from directory header
@@ -161,9 +163,9 @@ func EntryListGen() {
skippedDirList[i] = false // the directory header is being printed, indicate that it is not being skipped skippedDirList[i] = false // the directory header is being printed, indicate that it is not being skipped
indent, vanityDirectory = indentSubtractor(skippedDirList, dirList, i, indent) // calculate the final indentation multiplier indent, vanityDirectory = indentSubtractor(skippedDirList, dirList, i, indent) // calculate the final indentation multiplier
if !offline.Windows { // for consistency, format directories with UNIX-style path separators on all platforms if !offline.Windows { // for consistency, format directories with UNIX-style path separators on all platforms
fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+"\033[38;5;7;48;5;8m%s/"+offline.AnsiReset+"\n", vanityDirectory) fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+ansiDirectoryHeader+"%s/"+offline.AnsiReset+"\n", vanityDirectory)
} else { } else {
fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+"\033[38;5;7;48;5;8m%s/"+offline.AnsiReset+"\n", strings.ReplaceAll(vanityDirectory, offline.PathSeparator, "/")) fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+ansiDirectoryHeader+"%s/"+offline.AnsiReset+"\n", strings.ReplaceAll(vanityDirectory, offline.PathSeparator, "/"))
} }
} }
@@ -177,11 +179,11 @@ func EntryListGen() {
skippedDirList[i] = false // the directory header is being printed, indicate that it is not being skipped skippedDirList[i] = false // the directory header is being printed, indicate that it is not being skipped
indent, vanityDirectory = indentSubtractor(skippedDirList, dirList, i, indent) // calculate the final indentation multiplier indent, vanityDirectory = indentSubtractor(skippedDirList, dirList, i, indent) // calculate the final indentation multiplier
if !offline.Windows { // for consistency, format directories with UNIX-style path separators on all platforms if !offline.Windows { // for consistency, format directories with UNIX-style path separators on all platforms
fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+"\033[38;5;7;48;5;8m%s/"+offline.AnsiReset+"\n", vanityDirectory) fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+ansiDirectoryHeader+"%s/"+offline.AnsiReset+"\n", vanityDirectory)
} else { } else {
fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+"\033[38;5;7;48;5;8m%s/"+offline.AnsiReset+"\n", strings.ReplaceAll(vanityDirectory, offline.PathSeparator, "/")) fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+ansiDirectoryHeader+"%s/"+offline.AnsiReset+"\n", strings.ReplaceAll(vanityDirectory, offline.PathSeparator, "/"))
} }
fmt.Print(strings.Repeat(" ", indent*2) + "\033[38;5;11m-empty directory-" + offline.AnsiReset) fmt.Print(strings.Repeat(" ", indent*2) + ansiEmptyDirectoryWarning + "-empty directory-" + offline.AnsiReset)
} else { // warn if the only thing that exists is the root-level directory } else { // warn if the only thing that exists is the root-level directory
fmt.Print("\n\nNothing's here! For help creating your first entry, run \"mutn help\".") fmt.Print("\n\nNothing's here! For help creating your first entry, run \"mutn help\".")
} }
src/offline/configParser.go
+3 -3
View File
@@ -11,7 +11,7 @@ var Config = make(map[string]interface{})
func ReadConfig() { func ReadConfig() {
cfg, err := ini.Load(home + "/.config/libmutton/libmutton.ini") cfg, err := ini.Load(home + "/.config/libmutton/libmutton.ini")
if err != nil { if err != nil {
fmt.Println(AnsiError + "\033[38;5;9mFailed to load libmutton.ini" + AnsiReset) fmt.Println(AnsiError + "Failed to load libmutton.ini" + AnsiReset)
os.Exit(1) os.Exit(1)
} }
@@ -22,7 +22,7 @@ func ReadConfig() {
// ONLINE (conditional) // ONLINE (conditional)
onlineMode, err := cfg.Section("OFFLINE").Key("onlineMode").Bool() onlineMode, err := cfg.Section("OFFLINE").Key("onlineMode").Bool()
if err != nil { if err != nil {
fmt.Println(AnsiError + "\033[38;5;9mFailed to enable online (synced) mode - [OFFLINE]/onlineMode in libmutton.ini must be a boolean value - continuing in offline mode" + AnsiReset) fmt.Println(AnsiError + "Failed to enable online (synced) mode - [OFFLINE]/onlineMode in libmutton.ini must be a boolean value - continuing in offline mode" + AnsiReset)
onlineMode = false onlineMode = false
} }
if onlineMode { if onlineMode {
@@ -38,7 +38,7 @@ func ReadConfig() {
Config["remoteIP"] = cfg.Section("ONLINE").Key("remoteIP").String() Config["remoteIP"] = cfg.Section("ONLINE").Key("remoteIP").String()
Config["remotePort"], err = cfg.Section("ONLINE").Key("remotePort").Int() Config["remotePort"], err = cfg.Section("ONLINE").Key("remotePort").Int()
if err != nil { if err != nil {
fmt.Println(AnsiError + "\033[38;5;9mFailed to enable online (synced) mode - [ONLINE]/remotePort in libmutton.ini must be an integer value- continuing in offline mode" + AnsiReset) fmt.Println(AnsiError + "Failed to enable online (synced) mode - [ONLINE]/remotePort in libmutton.ini must be an integer value- continuing in offline mode" + AnsiReset)
// remotePort == 0 represents offline-only mode // remotePort == 0 represents offline-only mode
Config["remotePort"] = 0 Config["remotePort"] = 0
} }