release 0.4.0

Author: h2337

README.md

@@ -18,14 +18,6 @@ You need to have Go >=1.19 installed.
 
 `git clone https://github.com/h2337/rssnix --depth=1 && cd rssnix && go install`
 
-## Packages
-
-<a href="https://aur.archlinux.org/packages/rssnix">Arch Linux AUR Package (build newest version)</a> <img src="https://img.shields.io/aur/version/rssnix?color=green" alt="AUR"> 
-
-<a href="https://aur.archlinux.org/packages/rssnix-bin">Arch Linux AUR Package (binary newest version)</a> <img src="https://img.shields.io/aur/version/rssnix-bin?color=green" alt="AUR"> 
-
-<a href="https://aur.archlinux.org/packages/rssnix-git">Arch Linux AUR Package (build from git)</a> <img src="https://img.shields.io/aur/version/rssnix-git?color=green" alt="AUR"> 
-
 ## Flags
 
 `config`

config.go

@@ -2,18 +2,22 @@ package main
 
 import (
 	"errors"
+	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-ini/ini"
 	log "github.com/sirupsen/logrus"
 )
 
-var defaultConfigContent = `[settings]
-viewer = vim
-feed_directory = ~/rssnix
-
-[feeds]`
+const (
+	configEnvVar         = "RSSNIX_CONFIG_HOME"
+	defaultConfigDir     = ".config/rssnix"
+	configFileName       = "config.ini"
+	defaultViewer        = "vim"
+	defaultFeedDirectory = "~/rssnix"
+)
 
 type Configuration struct {
 	FeedDirectory string
@@ -23,43 +27,129 @@ type Configuration struct {
 
 var Config Configuration
 
-func LoadConfig() {
+func LoadConfig() error {
 	homePath, err := os.UserHomeDir()
 	if err != nil {
-		log.Error("Failed to get home path")
-		os.Exit(1)
+		return fmt.Errorf("resolve home directory: %w", err)
+	}
+
+	cfgDir, err := resolveConfigDir(homePath)
+	if err != nil {
+		return err
 	}
 
-	if _, err := os.Stat(homePath + "/.config/rssnix/config.ini"); errors.Is(err, os.ErrNotExist) {
+	if err := os.MkdirAll(cfgDir, 0o755); err != nil {
+		return fmt.Errorf("ensure config directory %q: %w", cfgDir, err)
+	}
+
+	cfgPath := filepath.Join(cfgDir, configFileName)
+	if _, err := os.Stat(cfgPath); errors.Is(err, os.ErrNotExist) {
 		log.Warn("Config file does not exist, creating...")
+		if err := createDefaultConfig(cfgPath); err != nil {
+			return fmt.Errorf("create default config: %w", err)
+		}
+		log.Infof("Config file created at %s", cfgPath)
+	} else if err != nil {
+		return fmt.Errorf("stat config file: %w", err)
+	}
+
+	cfg, err := ini.Load(cfgPath)
+	if err != nil {
+		return fmt.Errorf("load config: %w", err)
+	}
+
+	Config = Configuration{}
+	settings := cfg.Section("settings")
+
+	feedDirValue := strings.TrimSpace(settings.Key("feed_directory").String())
+	if feedDirValue == "" {
+		feedDirValue = defaultFeedDirectory
+	}
+	Config.FeedDirectory = expandPath(feedDirValue, homePath)
+	if err := os.MkdirAll(Config.FeedDirectory, 0o755); err != nil {
+		return fmt.Errorf("ensure feed directory %q: %w", Config.FeedDirectory, err)
+	}
 
-		os.MkdirAll(homePath+"/.config/rssnix", 0777)
-		file, err := os.Create(homePath + "/.config/rssnix/config.ini")
-		if err != nil {
-			log.Error("Failed to create a config file")
-			os.Exit(1)
+	viewer := strings.TrimSpace(settings.Key("viewer").String())
+	if viewer == "" {
+		viewer = defaultViewer
+	}
+	Config.Viewer = viewer
+
+	feedsSection := cfg.Section("feeds")
+	for _, key := range feedsSection.Keys() {
+		name := strings.TrimSpace(key.Name())
+		if name == "" {
+			continue
 		}
-		defer file.Close()
 
-		_, err = file.WriteString(defaultConfigContent)
-		if err != nil {
-			log.Error("Failed to create a config file")
-			os.Exit(1)
+		url := strings.TrimSpace(key.String())
+		if url == "" {
+			log.WithField("feed", name).Warn("Feed has empty URL; skipping")
+			continue
 		}
 
-		log.Info("Config file created at " + homePath + "/.config/rssnix/config.ini")
+		Config.Feeds = append(Config.Feeds, Feed{Name: name, URL: url})
 	}
 
-	cfg, err := ini.Load(homePath + "/.config/rssnix/config.ini")
+	if len(Config.Feeds) == 0 {
+		log.Warn("No feeds configured; use `rssnix add` or `rssnix import` to add feeds")
+	}
 
-	Config = Configuration{}
-	Config.FeedDirectory = cfg.Section("settings").Key("feed_directory").String()
-	if strings.HasPrefix(Config.FeedDirectory, "~") {
-		Config.FeedDirectory = homePath + Config.FeedDirectory[1:]
+	return nil
+}
+
+func resolveConfigDir(home string) (string, error) {
+	override := strings.TrimSpace(os.Getenv(configEnvVar))
+	if override == "" {
+		return filepath.Join(home, defaultConfigDir), nil
+	}
+
+	override = expandPath(override, home)
+	if !filepath.IsAbs(override) {
+		override = filepath.Join(home, override)
+	}
+	return override, nil
+}
+
+func expandPath(path, home string) string {
+	if path == "~" {
+		return home
 	}
-	os.MkdirAll(Config.FeedDirectory, 0777)
-	Config.Viewer = cfg.Section("settings").Key("viewer").String()
-	for _, key := range cfg.Section("feeds").Keys() {
-		Config.Feeds = append(Config.Feeds, Feed{key.Name(), key.String()})
+	if strings.HasPrefix(path, "~/") {
+		return filepath.Join(home, path[2:])
+	}
+	return path
+}
+
+func createDefaultConfig(path string) error {
+	cfg := ini.Empty()
+	settings := cfg.Section("settings")
+	settings.Key("viewer").SetValue(defaultViewer)
+	settings.Key("feed_directory").SetValue(defaultFeedDirectory)
+	cfg.Section("feeds")
+	return cfg.SaveTo(path)
+}
+
+func configFilePath() (string, error) {
+	homePath, err := os.UserHomeDir()
+	if err != nil {
+		return "", fmt.Errorf("resolve home directory: %w", err)
+	}
+
+	cfgDir, err := resolveConfigDir(homePath)
+	if err != nil {
+		return "", err
+	}
+
+	return filepath.Join(cfgDir, configFileName), nil
+}
+
+func (c *Configuration) FeedByName(name string) (Feed, bool) {
+	for _, feed := range c.Feeds {
+		if feed.Name == name {
+			return feed, true
+		}
 	}
+	return Feed{}, false
 }

config_test.go

@@ -0,0 +1,113 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/go-ini/ini"
+)
+
+func TestLoadConfigCreatesDefaults(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv(configEnvVar, "")
+
+	if err := LoadConfig(); err != nil {
+		t.Fatalf("LoadConfig returned error: %v", err)
+	}
+
+	cfgPath, err := configFilePath()
+	if err != nil {
+		t.Fatalf("configFilePath returned error: %v", err)
+	}
+
+	if _, err := os.Stat(cfgPath); err != nil {
+		t.Fatalf("config file not created at %s: %v", cfgPath, err)
+	}
+
+	expectedFeedDir := filepath.Join(home, "rssnix")
+	if Config.FeedDirectory != expectedFeedDir {
+		t.Fatalf("expected feed directory %s, got %s", expectedFeedDir, Config.FeedDirectory)
+	}
+
+	if _, err := os.Stat(Config.FeedDirectory); err != nil {
+		t.Fatalf("feed directory not created: %v", err)
+	}
+
+	if Config.Viewer != defaultViewer {
+		t.Fatalf("expected viewer %s, got %s", defaultViewer, Config.Viewer)
+	}
+
+	if len(Config.Feeds) != 0 {
+		t.Fatalf("expected no feeds configured by default, got %d", len(Config.Feeds))
+	}
+}
+
+func TestLoadConfigRespectsEnvOverride(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	overrideDir := filepath.Join(home, "custom-config")
+	t.Setenv(configEnvVar, overrideDir)
+
+	if err := LoadConfig(); err != nil {
+		t.Fatalf("LoadConfig returned error: %v", err)
+	}
+
+	cfgPath, err := configFilePath()
+	if err != nil {
+		t.Fatalf("configFilePath returned error: %v", err)
+	}
+
+	expectedPath := filepath.Join(overrideDir, configFileName)
+	if cfgPath != expectedPath {
+		t.Fatalf("expected config file path %s, got %s", expectedPath, cfgPath)
+	}
+
+	if _, err := os.Stat(expectedPath); err != nil {
+		t.Fatalf("config file not created at %s: %v", expectedPath, err)
+	}
+}
+
+func TestAddFeedPersistsConfig(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv(configEnvVar, "")
+
+	if err := LoadConfig(); err != nil {
+		t.Fatalf("LoadConfig returned error: %v", err)
+	}
+
+	const name = "test-feed"
+	const url = "https://example.com/feed"
+
+	if err := addFeed(name, url); err != nil {
+		t.Fatalf("addFeed returned error: %v", err)
+	}
+
+	if len(Config.Feeds) != 1 {
+		t.Fatalf("expected 1 feed in memory, got %d", len(Config.Feeds))
+	}
+
+	if Config.Feeds[0].Name != name || Config.Feeds[0].URL != url {
+		t.Fatalf("unexpected feed stored in memory: %+v", Config.Feeds[0])
+	}
+
+	cfgPath, err := configFilePath()
+	if err != nil {
+		t.Fatalf("configFilePath returned error: %v", err)
+	}
+
+	cfg, err := ini.Load(cfgPath)
+	if err != nil {
+		t.Fatalf("failed to reload config: %v", err)
+	}
+
+	if got := cfg.Section("feeds").Key(name).String(); got != url {
+		t.Fatalf("expected config to persist feed URL %s, got %s", url, got)
+	}
+
+	if err := addFeed(name, url); err == nil {
+		t.Fatalf("expected adding duplicate feed to fail")
+	}
+}