refactor: simplify codebase (-209 lines)

internal/watcher/autostart.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 )
 
+// EnsureAutostart installs the watcher as a system autostart service.
+// Currently disabled: installAutostart is not called due to DB concurrency issues.
 func EnsureAutostart(homeDir string) error {
 	if isAutostartInstalled(homeDir) || isTemporaryExecutable() {
 		return nil
@@ -18,15 +20,13 @@ func EnsureAutostart(homeDir string) error {
 }
 
 func isAutostartInstalled(homeDir string) bool {
-	switch runtime.GOOS {
-	case "darwin":
-		path := filepath.Join(homeDir, "Library", "LaunchAgents", "com.godeez.watch.plist")
-		_, err := os.Stat(path)
-
-		return err == nil
-	default:
+	if runtime.GOOS != "darwin" {
 		return false
 	}
+
+	path := filepath.Join(homeDir, "Library", "LaunchAgents", "com.godeez.watch.plist")
+	_, err := os.Stat(path)
+	return err == nil
 }
 
 func isTemporaryExecutable() bool {
@@ -34,6 +34,5 @@ func isTemporaryExecutable() bool {
 	if err != nil {
 		return true
 	}
-
 	return strings.Contains(exe, "go-build")
 }

internal/watcher/watcher.go

@@ -26,12 +26,11 @@ func New(appConfig *config.Config) *Watcher {
 		log.Fatalf("Failed to open log file: %v\n", err)
 	}
 
-	base := log.New(file, "", log.LstdFlags)
-	log := logger.New(base)
+	l := logger.New(log.New(file, "", log.LstdFlags))
 
 	return &Watcher{
 		appConfig: appConfig,
-		logger:    log,
+		logger:    l,
 	}
 }
 
@@ -39,33 +38,26 @@ func (w *Watcher) Run(ctx context.Context, opts downloader.Options) {
 	w.logger.Infof("Starting watcher...")
 
 	for {
+		playlists, err := store.ListWatchedPlaylists()
+		if err != nil {
+			w.logger.Errorf("Failed to list watched playlists: %v", err)
+		}
+
+		for _, playlist := range playlists {
+			dl := downloader.New(w.appConfig, "playlist")
+			dl.Logger = w.logger
+			if err := dl.Run(ctx, opts, playlist.ID); err != nil {
+				if errors.Is(err, context.Canceled) {
+					return
+				}
+				w.logger.Errorf("Playlist %s: %v", playlist.ID, err)
+			}
+		}
+
 		select {
 		case <-ctx.Done():
 			return
-		default:
-			playlists, err := store.ListWatchedPlaylists()
-			if err != nil {
-				w.logger.Errorf("Failed to list watched playlists: %v\n", err)
-			} else {
-				for _, playlist := range playlists {
-					dl := downloader.New(w.appConfig, "playlist")
-					dl.Logger = w.logger
-					if err := dl.Run(ctx, opts, playlist.ID); err != nil {
-						if errors.Is(err, context.Canceled) {
-							return
-						}
-
-						w.logger.Errorf("Playlist %s: %v\n", playlist.ID, err)
-					}
-				}
-			}
-
-			select {
-			case <-ctx.Done():
-				return
-			case <-time.After(15 * time.Minute):
-				// Continue to the next iteration to check for updates
-			}
+		case <-time.After(15 * time.Minute):
 		}
 	}
 }