diff --git a/cmd/parasocial/main.go b/cmd/parasocial/main.go new file mode 100644 index 0000000..c60c11d --- /dev/null +++ b/cmd/parasocial/main.go @@ -0,0 +1,25 @@ +package main + +import ( + "context" + "errors" + "fmt" + "os" + "os/signal" + "syscall" + + "parasocial/internal/app" +) + +func main() { + ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) + defer stop() + + if err := app.Run(ctx); err != nil { + if errors.Is(err, context.Canceled) { + return + } + fmt.Fprintf(os.Stderr, "error: %v\n", err) + os.Exit(1) + } +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..eeafaff --- /dev/null +++ b/go.mod @@ -0,0 +1,29 @@ +module parasocial + +go 1.24.0 + +require ( + github.com/BurntSushi/toml v1.6.0 + github.com/charmbracelet/bubbletea v1.3.10 +) + +require ( + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect + github.com/charmbracelet/lipgloss v1.1.0 // indirect + github.com/charmbracelet/x/ansi v0.10.1 // indirect + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect + github.com/charmbracelet/x/term v0.2.1 // indirect + github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-localereader v0.0.1 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect + github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/termenv v0.16.0 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/text v0.3.8 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..99e9b82 --- /dev/null +++ b/go.sum @@ -0,0 +1,45 @@ +github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= +github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw= +github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= +github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= +github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ= +github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= +github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= +github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= +github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= +github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= +github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= +github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= +github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= +github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= +golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E= +golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= diff --git a/internal/app/app.go b/internal/app/app.go new file mode 100644 index 0000000..bab0843 --- /dev/null +++ b/internal/app/app.go @@ -0,0 +1,28 @@ +package app + +import ( + "context" + "os" + + tea "github.com/charmbracelet/bubbletea" + + "parasocial/internal/config" + "parasocial/internal/tui" +) + +// Run loads the application configuration and starts the terminal UI. +func Run(ctx context.Context) error { + cfg, err := config.LoadDefault() + if err != nil { + return err + } + + program := tea.NewProgram( + tui.New(cfg.Streamers), + tea.WithContext(ctx), + tea.WithInput(os.Stdin), + tea.WithOutput(os.Stdout), + ) + _, err = program.Run() + return err +} diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..39f50f1 --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,70 @@ +package config + +import ( + "errors" + "fmt" + "os" + "strings" + + "github.com/BurntSushi/toml" +) + +const configFileName = "config.toml" + +// Config is the user-owned TOML configuration for parasocial. +type Config struct { + Streamers []string `toml:"streamers"` +} + +// DefaultPath returns the config file path relative to the current working directory. +func DefaultPath() string { + return configFileName +} + +// LoadDefault reads config from the current working directory. +func LoadDefault() (Config, error) { + return Load(DefaultPath()) +} + +// Load reads, normalizes, and validates a TOML config file. +func Load(path string) (Config, error) { + var cfg Config + if _, err := toml.DecodeFile(path, &cfg); err != nil { + if errors.Is(err, os.ErrNotExist) { + return Config{}, fmt.Errorf("config file not found at %s", path) + } + return Config{}, fmt.Errorf("load config %s: %w", path, err) + } + + cfg.Streamers = normalizeStreamers(cfg.Streamers) + if len(cfg.Streamers) == 0 { + return Config{}, fmt.Errorf("config %s must define at least one streamer", path) + } + + return cfg, nil +} + +func normalizeStreamers(streamers []string) []string { + seen := make(map[string]struct{}, len(streamers)) + normalized := make([]string, 0, len(streamers)) + + for _, streamer := range streamers { + streamer = normalizeStreamer(streamer) + if streamer == "" { + continue + } + if _, ok := seen[streamer]; ok { + continue + } + seen[streamer] = struct{}{} + normalized = append(normalized, streamer) + } + + return normalized +} + +func normalizeStreamer(streamer string) string { + streamer = strings.TrimSpace(streamer) + streamer = strings.TrimPrefix(streamer, "#") + return strings.ToLower(strings.TrimSpace(streamer)) +} diff --git a/internal/config/config_test.go b/internal/config/config_test.go new file mode 100644 index 0000000..2a953b7 --- /dev/null +++ b/internal/config/config_test.go @@ -0,0 +1,75 @@ +package config + +import ( + "os" + "path/filepath" + "reflect" + "strings" + "testing" +) + +func TestLoadValidConfig(t *testing.T) { + path := writeConfig(t, `streamers = [" Alpha ", "#Beta", "alpha", "", " #Gamma "]`) + + cfg, err := Load(path) + if err != nil { + t.Fatalf("Load() error = %v", err) + } + + want := []string{"alpha", "beta", "gamma"} + if !reflect.DeepEqual(cfg.Streamers, want) { + t.Fatalf("Streamers = %#v, want %#v", cfg.Streamers, want) + } +} + +func TestLoadRejectsMissingStreamerList(t *testing.T) { + path := writeConfig(t, `streamers = []`) + + _, err := Load(path) + if err == nil { + t.Fatal("Load() error = nil, want error") + } + if !strings.Contains(err.Error(), "at least one streamer") { + t.Fatalf("Load() error = %q, want empty streamer message", err) + } +} + +func TestLoadRejectsInvalidTOML(t *testing.T) { + path := writeConfig(t, `streamers = [`) + + _, err := Load(path) + if err == nil { + t.Fatal("Load() error = nil, want error") + } + if !strings.Contains(err.Error(), "load config") { + t.Fatalf("Load() error = %q, want load config context", err) + } +} + +func TestDefaultPathUsesCurrentWorkingDirectoryConfig(t *testing.T) { + if got := DefaultPath(); got != "config.toml" { + t.Fatalf("DefaultPath() = %q, want %q", got, "config.toml") + } +} + +func TestLoadRejectsMissingFile(t *testing.T) { + path := filepath.Join(t.TempDir(), "missing.toml") + + _, err := Load(path) + if err == nil { + t.Fatal("Load() error = nil, want error") + } + if !strings.Contains(err.Error(), "config file not found") { + t.Fatalf("Load() error = %q, want missing file context", err) + } +} + +func writeConfig(t *testing.T, content string) string { + t.Helper() + + path := filepath.Join(t.TempDir(), "config.toml") + if err := os.WriteFile(path, []byte(content), 0o600); err != nil { + t.Fatalf("write config: %v", err) + } + return path +} diff --git a/internal/tui/model.go b/internal/tui/model.go new file mode 100644 index 0000000..0f9a142 --- /dev/null +++ b/internal/tui/model.go @@ -0,0 +1,46 @@ +package tui + +import ( + "fmt" + "strings" + + tea "github.com/charmbracelet/bubbletea" +) + +// Model is the initial terminal UI for parasocial. +type Model struct { + streamers []string +} + +// New returns a Bubble Tea model that displays configured streamers. +func New(streamers []string) Model { + return Model{streamers: append([]string(nil), streamers...)} +} + +func (m Model) Init() tea.Cmd { + return nil +} + +func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + switch msg := msg.(type) { + case tea.KeyMsg: + switch msg.String() { + case "ctrl+c", "esc", "q": + return m, tea.Quit + } + } + + return m, nil +} + +func (m Model) View() string { + var builder strings.Builder + builder.WriteString("Streamers\n") + + for i, streamer := range m.streamers { + fmt.Fprintf(&builder, "%d. %s\n", i+1, streamer) + } + + builder.WriteString("\n") + return builder.String() +} diff --git a/internal/tui/model_test.go b/internal/tui/model_test.go new file mode 100644 index 0000000..85fb719 --- /dev/null +++ b/internal/tui/model_test.go @@ -0,0 +1,13 @@ +package tui + +import "testing" + +func TestViewDisplaysStreamers(t *testing.T) { + model := New([]string{"alpha", "beta"}) + + got := model.View() + want := "Streamers\n1. alpha\n2. beta\n\n" + if got != want { + t.Fatalf("View() = %q, want %q", got, want) + } +} diff --git a/older-impl/go.mod b/older-impl/go.mod new file mode 100644 index 0000000..06ef717 --- /dev/null +++ b/older-impl/go.mod @@ -0,0 +1,5 @@ +module parasocial + +go 1.22 + +require nhooyr.io/websocket v1.8.17 diff --git a/older-impl/go.sum b/older-impl/go.sum new file mode 100644 index 0000000..9c3072b --- /dev/null +++ b/older-impl/go.sum @@ -0,0 +1,2 @@ +nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y= +nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=