- Add support for environment-aware config file.

- Fix an issue where tasks would not be fetched if there was only one
  page.

bb2todotxt.go

@@ -2,14 +2,16 @@ package main
 
 import (
 	"encoding/json"
-	"errors"
 	"flag"
 	"fmt"
 	"html/template"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
+
+	"github.com/kirsle/configdir"
 )
 
 const VERSION = "v0.0.3"
@@ -19,6 +21,40 @@ type bitbucketConfig struct {
 	Password string `json:password`
 }
 
+const PACKAGE_NAME = "com.scottmmjackson.bb2todotxt"
+
+var WELL_KNOWN_CONFIG_FILE_PATH = filepath.Join(configdir.LocalConfig(PACKAGE_NAME), "bitbucket.json")
+
+func resolveConfigFile(commandLinePath string) (*bitbucketConfig, error) {
+	var err error
+	var bitbucketConfigString []byte
+	var bitbucketConfigMap *bitbucketConfig
+	if commandLinePath != "" {
+		_, err = os.Stat(commandLinePath)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to open config file at %s: %s", WELL_KNOWN_CONFIG_FILE_PATH, err)
+		}
+		bitbucketConfigString, err = os.ReadFile(commandLinePath)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to upen config file at %s: %s", commandLinePath, err)
+		}
+	} else {
+		_, err = os.Stat(WELL_KNOWN_CONFIG_FILE_PATH)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to open config file at %s: %s", WELL_KNOWN_CONFIG_FILE_PATH, err)
+		}
+		bitbucketConfigString, err = os.ReadFile(WELL_KNOWN_CONFIG_FILE_PATH)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to open config file at %s: %s", WELL_KNOWN_CONFIG_FILE_PATH, err)
+		}
+	}
+	err = json.Unmarshal(bitbucketConfigString, &bitbucketConfigMap)
+	if err != nil {
+		return nil, err
+	}
+	return bitbucketConfigMap, nil
+}
+
 func commandLine() (*bitbucketConfig, string, string, int, error) {
 	var bitbucketConfigMap *bitbucketConfig
 	version := flag.Bool("v", false, "print version and quit")
@@ -31,16 +67,9 @@ func commandLine() (*bitbucketConfig, string, string, int, error) {
 		fmt.Println(VERSION)
 		os.Exit(0)
 	}
-	if *bitbucketConfigFile == "" {
-		return bitbucketConfigMap, "", "", 0, errors.New("Required flags not provided.")
-	}
-	bitbucketConfigString, err := os.ReadFile(*bitbucketConfigFile)
+	bitbucketConfigMap, err := resolveConfigFile(*bitbucketConfigFile)
 	if err != nil {
-		return bitbucketConfigMap, "", "", 0, err
-	}
-	err = json.Unmarshal(bitbucketConfigString, &bitbucketConfigMap)
-	if err != nil {
-		return bitbucketConfigMap, "", "", 0, err
+		return nil, "", "", 0, err
 	}
 	return bitbucketConfigMap, *slug, *owner, *id, nil
 }
@@ -117,6 +146,9 @@ func getTasks(bucketConfig *bitbucketConfig, uri string) ([]Task, string) {
 		log.Fatalf("error: %s", err)
 	}
 	defer resp.Body.Close()
+	if resp.StatusCode > 300 {
+		log.Fatalf("error: %s", resp.Status)
+	}
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		log.Fatalf("error: %s", err)
@@ -143,10 +175,10 @@ func main() {
 		BITBUCKET_URL,
 		owner, slug, id,
 	)
-	taskChunk, next := getTasks(bitbucketConfig, uri)
-	for next != "" {
+	var taskChunk []Task
+	for uri != "" {
+		taskChunk, uri = getTasks(bitbucketConfig, uri)
 		tasks = append(tasks, taskChunk...)
-		taskChunk, next = getTasks(bitbucketConfig, next)
 	}
 	todoTmpl.Execute(os.Stdout, tasks)
 }

go.mod

@@ -1,3 +1,5 @@
 module github.com/scottmmjackson/bb2todotxt
 
 go 1.20
+
+require github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f

go.sum

@@ -0,0 +1,2 @@
+github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f h1:dKccXx7xA56UNqOcFIbuqFjAWPVtP688j5QMgmo6OHU=
+github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f/go.mod h1:4rEELDSfUAlBSyUjPG0JnaNGjf13JySHFeRdD/3dLP0=