diff --git a/internal/cache/cache.go b/internal/cache/cache.go index 950ed43..fed52cb 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -10,6 +10,7 @@ import ( "os" "path/filepath" + "gitea.elara.ws/Hazel/transfem-startpage/internal/utils" "github.com/labstack/echo/v4" ) @@ -23,7 +24,7 @@ func getCacheDir() (string, error) { if err != nil { baseDir = "/tmp" } - cacheDir := filepath.Join(baseDir, "startpage") + cacheDir := filepath.Join(baseDir, utils.Name) err = os.MkdirAll(cacheDir, 0o755) if err != nil { return "", err diff --git a/internal/cli/cli.go b/internal/cli/cli.go index ae1ba80..d76479a 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -4,6 +4,7 @@ import ( "log" "os" + "gitea.elara.ws/Hazel/transfem-startpage/internal/utils" "github.com/TwiN/go-color" ) @@ -22,8 +23,8 @@ type Argument struct { Description string } -var HelpHeader = `This is the help page of transfem-startpage. -` + color.Purple + `transfem-startpage {program} {...args}` + color.Reset + ` +var HelpHeader = `This is the help page of ` + utils.Name + `. +` + color.Purple + utils.BinaryName + ` {program} {...args}` + color.Reset + ` The following Programs are available:` var Programs = []Program{ { diff --git a/internal/cli/help.go b/internal/cli/help.go index 61b6ac6..876b0c3 100644 --- a/internal/cli/help.go +++ b/internal/cli/help.go @@ -5,6 +5,7 @@ import ( "os" "strings" + "gitea.elara.ws/Hazel/transfem-startpage/internal/utils" "github.com/TwiN/go-color" ) @@ -55,7 +56,7 @@ func specificHelp(programName string) error { fmt.Println(color.Bold + "MAN PAGE FOR " + strings.ToUpper(programName) + color.Reset) fmt.Println() - fmt.Println(color.Purple + "transfem-startpage " + programName + color.Reset + getArgumentString(program.Arguments)) + fmt.Println(color.Purple + utils.BinaryName + " " + programName + color.Reset + getArgumentString(program.Arguments)) fmt.Println() fmt.Println(color.Bold + "arguments" + color.Reset) diff --git a/internal/diyhrt/fetch.go b/internal/diyhrt/fetch.go index d2c9fb6..d1db765 100644 --- a/internal/diyhrt/fetch.go +++ b/internal/diyhrt/fetch.go @@ -11,7 +11,7 @@ const endpoint = "https://diyhrt.market/api/listings" func GetListings(apiKey string) ([]Listing, error) { if apiKey == "" { - return nil, errors.New("API_KEY key not set. Set it as env or in DiyHrt.ApiKey") + return nil, errors.New("diyhrt API_KEY key not set. Set it as env or in DiyHrt.ApiKey") } // Create HTTP client diff --git a/internal/rendering/config.go b/internal/rendering/config.go index 8348582..7e56f8f 100644 --- a/internal/rendering/config.go +++ b/internal/rendering/config.go @@ -7,6 +7,7 @@ import ( "path/filepath" "gitea.elara.ws/Hazel/transfem-startpage/internal/diyhrt" + "gitea.elara.ws/Hazel/transfem-startpage/internal/utils" "github.com/pelletier/go-toml" ) @@ -105,7 +106,7 @@ func (rc *Config) ScanForConfigFile(profile string) error { baseDir, cacheDirErr := os.UserConfigDir() if cacheDirErr == nil { - configFile := filepath.Join(baseDir, "startpage", profileFile) + configFile := filepath.Join(baseDir, utils.Name, profileFile) if err := rc.LoadConfigFile(configFile); !errors.Is(err, os.ErrNotExist) { return err diff --git a/internal/utils/meta.go b/internal/utils/meta.go new file mode 100644 index 0000000..133bc73 --- /dev/null +++ b/internal/utils/meta.go @@ -0,0 +1,6 @@ +package utils + +import "os" + +var Name = "transfem-startpage" +var BinaryName = os.Args[0] diff --git a/tmp/build-errors.log b/tmp/build-errors.log index 9ba0172..a2a130a 100644 --- a/tmp/build-errors.log +++ b/tmp/build-errors.log @@ -1 +1 @@ -exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1 \ No newline at end of file +exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1 \ No newline at end of file