issues

commit 72ce55ca9db6e1433ac2c235c5e72c3f2feab374
parent 2c3ba36585f1fe3292fa0bb894d4130ab8eeb066
Author: Oliver Lowe <o@olowe.co>
Date:   Sun, 25 Aug 2024 16:17:32 +1000

Gitlab: use default host gitlab.com when no flag set

Diffstat:
M
Gitlab/Gitlab.go
 | 
18
++++++++++++------

1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/Gitlab/Gitlab.go b/Gitlab/Gitlab.go
@@ -7,7 +7,9 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/fs"
 	"log"
+	"net/url"
 	"os"
 	"path"
 	"regexp"
@@ -186,7 +188,7 @@ func (w *awin) loadIssue() {
 
 func printIssueList(w io.Writer, issues []Issue) {
 	for i := range issues {
-		fmt.Fprintln(w, issues[i].ID, issues[i].Title)
+		fmt.Fprintf(w, "%d\t%s\n", issues[i].ID, issues[i].Title)
 	}
 }
 
@@ -392,19 +394,23 @@ func main() {
 			log.Fatal(err)
 		}
 		host := *hFlag
+		if host == "" {
+			u, err := url.Parse(GitlabHosted)
+			if err != nil {
+				log.Fatalln("find token: %v", err)
+			}
+			host = u.Host
+		}
 		tokenPath = path.Join(dir, "gitlab", host)
 	}
 	b, err := os.ReadFile(tokenPath)
-	if err != nil {
-		log.Fatal("read token:", err)
+	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		log.Fatalln("read token:", err)
 	}
 	client = &Client{
 		BaseURL: *hFlag,
 		Token:   strings.TrimSpace(string(b)),
 	}
-	if err != nil {
-		log.Fatal(err)
-	}
 
 	project := *pFlag
 	go openProject(project)