cli #1

Merged
Hazel merged 13 commits from cli into main 2025-07-16 14:35:52 +00:00
7 changed files with 17 additions and 7 deletions
Showing only changes of commit 68c89de1a4 - Show all commits

View File

@ -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

View File

@ -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{
{

View File

@ -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)

View File

@ -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

View File

@ -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

6
internal/utils/meta.go Normal file
View File

@ -0,0 +1,6 @@
package utils
import "os"
var Name = "transfem-startpage"
var BinaryName = os.Args[0]

View File

@ -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
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