Merge pull request #8 from ezeoleaf/new-blogs

add searching mode and sync new blogs

Author: ezeoleaf

cmd/tblogs/main.go

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	cfg, err := config.LoadConfig("")
+	cfg, err := config.LoadConfig()
 	if err != nil {
 		log.Fatalf("failed to load config: %v", err)
 	}

internal/app/app.go

@@ -82,7 +82,7 @@ func (a *App) Run() {
 
 	defer func() {
 		a.Config.App.LastLogin = a.Config.App.CurrentLogin
-		err := config.SaveConfig(a.Config, "")
+		err := config.SaveConfig(a.Config)
 		if err != nil {
 			log.Printf("failed to save config: %v", err)
 		}

internal/app/blogs.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"log"
+	"slices"
 	"strings"
 	"time"
 
@@ -86,17 +87,17 @@ func (a *App) filterBlogsList(listBlogs *tview.List, term string) {
 	for _, blog := range a.Config.Blogs {
 		if term == "" || strings.Contains(strings.ToLower(blog.Name), strings.ToLower(term)) {
 			found = true
-			isIn := false
-			for _, id := range a.Config.App.FollowingBlogs {
-				if id == blog.Name {
-					isIn = true
-					break
-				}
-			}
+			isIn := slices.Contains(a.Config.App.FollowingBlogs, blog.Name)
+
 			r := emptyRune
 			if isIn {
 				r = followRune
 			}
+
+			if term != "" {
+				listBlogs.AddItem("=== SEARCHING MODE === "+term, "", 0, nil)
+			}
+
 			listBlogs.AddItem(blog.Name, blog.Feed, r, func() {
 				listPosts.Clear()
 				listPosts.AddItem("Loading...", blog.Feed, 0, nil)
@@ -206,7 +207,7 @@ func (a *App) savePost(listPosts *tview.List, post *gofeed.Item, refreshHome, in
 		a.Config.App.SavedPosts = append(a.Config.App.SavedPosts[:ix], a.Config.App.SavedPosts[ix+1:]...)
 	}
 
-	err := config.SaveConfig(a.Config, "")
+	err := config.SaveConfig(a.Config)
 	if err != nil {
 		log.Printf("failed to save config: %v", err)
 		return
@@ -255,7 +256,7 @@ func (a *App) followBlogs(listBlogs *tview.List) {
 		a.Config.App.FollowingBlogs = append(a.Config.App.FollowingBlogs[:ix], a.Config.App.FollowingBlogs[ix+1:]...)
 	}
 
-	err := config.SaveConfig(a.Config, "")
+	err := config.SaveConfig(a.Config)
 	if err != nil {
 		log.Printf("failed to save config: %v", err)
 	}

internal/app/home.go

@@ -127,7 +127,7 @@ func (a *App) generateHomeList(listHome *tview.List) {
 
 		if event.Key() == tcell.KeyCtrlL {
 			a.Config.App.LastLoginMode = !a.Config.App.LastLoginMode
-			err := config.SaveConfig(a.Config, "")
+			err := config.SaveConfig(a.Config)
 			if err != nil {
 				log.Printf("failed to save config: %v", err)
 			}

internal/app/savedPosts.go

@@ -44,7 +44,7 @@ func (a *App) generateSavedPosts(listSavedPosts *tview.List) {
 				// // Remove the post at index x
 				a.Config.App.SavedPosts = append(a.Config.App.SavedPosts[:x], a.Config.App.SavedPosts[x+1:]...)
 				// Persist the config change
-				err := config.SaveConfig(a.Config, "")
+				err := config.SaveConfig(a.Config)
 				if err != nil {
 					log.Printf("failed to save config: %v", err)
 					return nil

internal/config/config.go

@@ -38,7 +38,7 @@ type Config struct {
 // GetConfigPath returns the OS-appropriate config file path for tblogs
 const defaultConfigFile = "data.yml"
 
-func GetConfigPath() (string, error) {
+func getConfigPath() (string, error) {
 	configDir, err := os.UserConfigDir()
 	if err != nil {
 		return "", err
@@ -52,42 +52,17 @@ func GetConfigPath() (string, error) {
 	return filepath.Join(tblogsDir, defaultConfigFile), nil
 }
 
-func loadDefaultBlogsYAML(path string) ([]Blog, error) {
-	f, err := os.Open(path)
+// LoadConfig loads the YAML config from the given path (or default path if empty) and returns a Config struct
+func LoadConfig() (*Config, error) {
+	path, err := getConfigPath()
 	if err != nil {
 		return nil, err
 	}
 
-	defer func() {
-		if err := f.Close(); err != nil {
-			log.Printf("failed to close file: %v", err)
-		}
-	}()
-
-	var blogs []Blog
-
-	decoder := yaml.NewDecoder(f)
-	if err := decoder.Decode(&blogs); err != nil {
-		return nil, err
-	}
-
-	return blogs, nil
-}
-
-// LoadConfig loads the YAML config from the given path (or default path if empty) and returns a Config struct
-func LoadConfig(path string) (*Config, error) {
-	if path == "" {
-		var err error
-		path, err = GetConfigPath()
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	f, err := os.Open(path)
 	if err != nil {
 		if os.IsNotExist(err) {
-			blogs, err := loadDefaultBlogsYAML("internal/config/default-blogs.yml")
+			blogs, err := loadDefaultBlogs()
 			if err != nil {
 				return nil, err
 			}
@@ -103,7 +78,7 @@ func LoadConfig(path string) (*Config, error) {
 			}
 
 			// Save the default config
-			if err := SaveConfig(cfg, path); err != nil {
+			if err := SaveConfig(cfg); err != nil {
 				return nil, err
 			}
 
@@ -126,22 +101,68 @@ func LoadConfig(path string) (*Config, error) {
 		return nil, err
 	}
 
+	// Sync blogs with defaults
+	if err := cfg.syncBlogs(); err != nil {
+		log.Printf("warning: failed to sync blogs: %v", err)
+		// Don't fail the load, just log the warning
+	}
+
 	cfg.App.CurrentLogin = time.Now()
 
 	return &cfg, nil
 }
 
-// SaveConfig writes the config struct to the given YAML file path (or default path if empty)
-func SaveConfig(cfg *Config, path string) error {
-	if path == "" {
-		var err error
+func loadDefaultBlogs() ([]Blog, error) {
+	f, err := os.Open("internal/config/default-blogs.yml")
+	if err != nil {
+		return nil, err
+	}
 
-		path, err = GetConfigPath()
-		if err != nil {
-			return err
+	defer func() {
+		if err := f.Close(); err != nil {
+			log.Printf("failed to close file: %v", err)
+		}
+	}()
+
+	var blogs []Blog
+
+	decoder := yaml.NewDecoder(f)
+	if err := decoder.Decode(&blogs); err != nil {
+		return nil, err
+	}
+
+	return blogs, nil
+}
+
+func (cfg *Config) syncBlogs() error {
+	defaultBlogs, err := loadDefaultBlogs()
+	if err != nil {
+		return err
+	}
+
+	// Create a map of existing blogs by name for quick lookup
+	existingBlogs := make(map[string]Blog)
+	for _, blog := range cfg.Blogs {
+		existingBlogs[blog.Name] = blog
+	}
+
+	// Add missing blogs from default
+	for _, defaultBlog := range defaultBlogs {
+		if _, exists := existingBlogs[defaultBlog.Name]; !exists {
+			cfg.Blogs = append(cfg.Blogs, defaultBlog)
 		}
 	}
 
+	return nil
+}
+
+// SaveConfig writes the config struct to the given YAML file path (or default path if empty)
+func SaveConfig(cfg *Config) error {
+	path, err := getConfigPath()
+	if err != nil {
+		return err
+	}
+
 	f, err := os.Create(path)
 	if err != nil {
 		return err

internal/config/default-blogs.yml

@@ -140,8 +140,6 @@
   feed: https://triplebyte.com/blog/feed
 - name: PureCore
   feed: https://purecore.ro/feed/rss.xml
-- name: GitHub Blog
-  feed: https://github.blog/feed/
 - name: Stack Overflow Blog
   feed: https://stackoverflow.blog/feed/
 - name: Google Developers Blog