feat: add network buffer settings

Author: Alexsatter

README.md

@@ -147,13 +147,27 @@ Quit with `q` or `ctrl+c`.
 | `s` | share selected station as a YAML snippet |
 | `p` | import station snippet from clipboard |
 | `x` | open ambient mixer (modal) |
+| `o` | open settings (network buffer) |
 | `i` | toggle stream-info row |
 | `?` | toggle full help card |
 | `q` / `ctrl+c` | quit |
 
 The macOS hardware Play/Pause key controls the station already loaded
 in mpv; if no station has been started yet, it is ignored.
 
+### Settings (after `o`)
+
+| key | action |
+| --- | --- |
+| `j` / `↓` · `k` / `↑` | select setting |
+| `h` / `←` · `l` / `→` | adjust by 5 seconds |
+| `0` | turn selected setting off |
+| `enter` | save |
+| `esc` | cancel |
+
+Network-buffer changes are persisted for you; no manual config editing needed.
+Restart the app to apply them to the underlying mpv process.
+
 ### Ambient mixer (after `x`)
 
 | key | action |
@@ -226,6 +240,8 @@ on first run with sensible defaults; a documented example sits at
 ```yaml
 theme: tokyo-night        # see Themes below for all built-in theme ids
 volume: 60                # initial volume, 0–100
+buffer_seconds: 30        # network read-ahead; try 60–120 on flaky Wi-Fi
+initial_buffer_seconds: 0 # wait before start/resume; try 5–10 if streams stutter
 
 stations:
   - name: SomaFM Groove Salad

README.ru.md

@@ -151,13 +151,27 @@ lofi-player
 | `s` | поделиться выбранной станцией YAML-сниппетом |
 | `p` | импортировать сниппет станции из clipboard |
 | `x` | открыть эмбиент-микшер (модалка) |
+| `o` | открыть настройки (сетевой буфер) |
 | `i` | переключить stream-info строку |
 | `?` | показать/скрыть полную справку |
 | `q` / `ctrl+c` | выход |
 
 Аппаратная клавиша Play/Pause на macOS управляет станцией, уже
 загруженной в mpv; если станцию ещё не запускали, нажатие игнорируется.
 
+### Настройки (после `o`)
+
+| клавиша | действие |
+| --- | --- |
+| `j` / `↓` · `k` / `↑` | выбрать настройку |
+| `h` / `←` · `l` / `→` | изменить на 5 секунд |
+| `0` | выключить выбранную настройку |
+| `enter` | сохранить |
+| `esc` | отмена |
+
+Настройки сетевого буфера сохраняются автоматически; руками редактировать
+конфиг не нужно. Перезапусти приложение, чтобы они применились к процессу mpv.
+
 ### Эмбиент-микшер (после `x`)
 
 | клавиша | действие |
@@ -232,6 +246,8 @@ lofi-player --import - < stations.yaml
 ```yaml
 theme: tokyo-night        # все встроенные id см. в разделе «Темы»
 volume: 60                # стартовая громкость, 0–100
+buffer_seconds: 30        # сетевой запас; для плохого Wi-Fi попробуй 60–120
+initial_buffer_seconds: 0 # ждать перед стартом/возобновлением; попробуй 5–10
 
 stations:
   - name: SomaFM Groove Salad

configs/lofi-player.example.yaml

@@ -13,6 +13,14 @@ theme: tokyo-night
 # Initial playback volume, 0–100.
 volume: 60
 
+# Network buffering for unstable connections.
+# buffer_seconds asks mpv to keep this many seconds buffered ahead when the
+# stream/server permits it. Try 60–120 on flaky Wi-Fi; 0 leaves mpv defaults.
+buffer_seconds: 30
+# initial_buffer_seconds waits for this much cache before starting/resuming
+# after a cache stall. 5–10 helps bad networks but delays playback start.
+initial_buffer_seconds: 0
+
 # Internet-radio stations. Each station needs a display name and a stream URL.
 # Share/import uses the same shape, so snippets copied from friends can be
 # pasted under this key or imported with `lofi-player --import stations.yaml`.

internal/audio/player.go

@@ -103,6 +103,13 @@ type Options struct {
 	// InitialVolume is the volume (0..100) applied right after the IPC
 	// handshake. Values outside the range are clamped.
 	InitialVolume int
+	// BufferSeconds asks mpv to keep this many seconds of network audio
+	// buffered ahead when the stream/server permits it. 0 leaves mpv at
+	// its default cache behavior.
+	BufferSeconds int
+	// InitialBufferSeconds makes mpv wait for this many seconds of cache
+	// before starting/resuming after a cache stall. 0 starts immediately.
+	InitialBufferSeconds int
 }
 
 // Player owns an mpv subprocess and a JSON-IPC connection to it,
@@ -136,14 +143,15 @@ type Player struct {
 
 const mainInputConf = "PAUSE cycle pause\n"
 
-func mainMPVArgs(socketPath string) []string {
+func mainMPVArgs(socketPath string, opts Options) []string {
 	args := []string{
 		"--no-config",
 		"--idle=yes",
 		"--no-video",
 		"--no-terminal",
 		"--input-ipc-server=" + socketPath,
 	}
+	args = append(args, networkCacheArgs(opts)...)
 	if runtime.GOOS == "darwin" {
 		args = append(args,
 			"--input-media-keys=yes",
@@ -153,6 +161,41 @@ func mainMPVArgs(socketPath string) []string {
 	return args
 }
 
+func networkCacheArgs(opts Options) []string {
+	bufferSec := clampSeconds(opts.BufferSeconds, 0, 600)
+	initialSec := clampSeconds(opts.InitialBufferSeconds, 0, 120)
+	if initialSec > bufferSec {
+		bufferSec = initialSec
+	}
+	if bufferSec == 0 {
+		return nil
+	}
+
+	args := []string{
+		"--cache=yes",
+		fmt.Sprintf("--demuxer-readahead-secs=%d", bufferSec),
+		"--demuxer-max-bytes=64MiB",
+	}
+	if initialSec > 0 {
+		args = append(args,
+			"--cache-pause=yes",
+			"--cache-pause-initial=yes",
+			fmt.Sprintf("--cache-pause-wait=%d", initialSec),
+		)
+	}
+	return args
+}
+
+func clampSeconds(v, min, max int) int {
+	if v < min {
+		return min
+	}
+	if v > max {
+		return max
+	}
+	return v
+}
+
 func ambientMPVArgs(socketPath, filePath string) []string {
 	args := []string{
 		"--no-config",
@@ -216,7 +259,7 @@ func NewPlayer(ctx context.Context, opts Options) (*Player, error) {
 	}
 
 	var stderr bytes.Buffer
-	cmd := exec.Command(mpvPath, mainMPVArgs(socketPath)...)
+	cmd := exec.Command(mpvPath, mainMPVArgs(socketPath, opts)...)
 	cmd.Stderr = &stderr
 	if err := cmd.Start(); err != nil {
 		os.RemoveAll(socketDir)

internal/audio/player_test.go

@@ -196,7 +196,7 @@ func TestClampVolume(t *testing.T) {
 }
 
 func TestMPVArgsDisableUserConfig(t *testing.T) {
-	mainArgs := mainMPVArgs("/tmp/lofi-player-test.sock")
+	mainArgs := mainMPVArgs("/tmp/lofi-player-test.sock", Options{})
 	if !hasArg(mainArgs, "--no-config") {
 		t.Fatalf("main mpv args %v do not disable user config", mainArgs)
 	}
@@ -219,11 +219,34 @@ func TestMPVArgsDisableUserConfig(t *testing.T) {
 	}
 }
 
+func TestMainMPVArgsConfigureNetworkBuffer(t *testing.T) {
+	args := mainMPVArgs("/tmp/lofi-player-test.sock", Options{BufferSeconds: 120, InitialBufferSeconds: 10})
+	for _, want := range []string{
+		"--cache=yes",
+		"--demuxer-readahead-secs=120",
+		"--demuxer-max-bytes=64MiB",
+		"--cache-pause=yes",
+		"--cache-pause-initial=yes",
+		"--cache-pause-wait=10",
+	} {
+		if !hasArg(args, want) {
+			t.Fatalf("main mpv args %v missing %s", args, want)
+		}
+	}
+}
+
+func TestMainMPVArgsInitialBufferExtendsReadahead(t *testing.T) {
+	args := mainMPVArgs("/tmp/lofi-player-test.sock", Options{InitialBufferSeconds: 45})
+	if !hasArg(args, "--demuxer-readahead-secs=45") {
+		t.Fatalf("main mpv args %v did not extend readahead to initial buffer", args)
+	}
+}
+
 func TestDarwinMPVArgsWireMediaKeys(t *testing.T) {
 	if runtime.GOOS != "darwin" {
 		t.Skip("media-key args are macOS-only")
 	}
-	mainArgs := mainMPVArgs("/tmp/lofi-player-test.sock")
+	mainArgs := mainMPVArgs("/tmp/lofi-player-test.sock", Options{})
 	if !hasArg(mainArgs, "--input-media-keys=yes") {
 		t.Fatalf("main mpv args %v do not enable media keys", mainArgs)
 	}

internal/config/config.go

@@ -31,6 +31,13 @@ type Config struct {
 	Theme string `yaml:"theme"`
 	// Volume is the initial playback volume, 0–100.
 	Volume int `yaml:"volume"`
+	// BufferSeconds asks mpv to keep this many seconds of network audio
+	// buffered ahead when the stream/server permits it. 0 disables the
+	// explicit cache tuning and leaves mpv at its defaults.
+	BufferSeconds int `yaml:"buffer_seconds"`
+	// InitialBufferSeconds makes mpv wait for this many seconds of cache
+	// before starting/resuming after a cache stall. 0 starts immediately.
+	InitialBufferSeconds int `yaml:"initial_buffer_seconds"`
 	// Stations is the user's list of internet-radio stations.
 	Stations []Station `yaml:"stations"`
 }
@@ -76,8 +83,10 @@ func (s Station) IsYouTube() bool {
 // and was chosen for stability across networks and metadata correctness.
 func Defaults() Config {
 	return Config{
-		Theme:  "tokyo-night",
-		Volume: 60,
+		Theme:                "tokyo-night",
+		Volume:               60,
+		BufferSeconds:        30,
+		InitialBufferSeconds: 0,
 		Stations: []Station{
 			{Name: "SomaFM Groove Salad", URL: "https://ice1.somafm.com/groovesalad-256-mp3"},
 			{Name: "SomaFM Drone Zone", URL: "https://ice1.somafm.com/dronezone-256-mp3"},

internal/config/config_test.go

@@ -164,11 +164,33 @@ func TestLoadFromFile_MissingFieldsKeepDefaults(t *testing.T) {
 	if cfg.Volume != defaults.Volume {
 		t.Errorf("Volume = %d, want default %d", cfg.Volume, defaults.Volume)
 	}
+	if cfg.BufferSeconds != defaults.BufferSeconds {
+		t.Errorf("BufferSeconds = %d, want default %d", cfg.BufferSeconds, defaults.BufferSeconds)
+	}
+	if cfg.InitialBufferSeconds != defaults.InitialBufferSeconds {
+		t.Errorf("InitialBufferSeconds = %d, want default %d", cfg.InitialBufferSeconds, defaults.InitialBufferSeconds)
+	}
 	if len(cfg.Stations) != 1 || cfg.Stations[0].Name != "Only" {
 		t.Errorf("Stations = %+v, want [{Only http://x}]", cfg.Stations)
 	}
 }
 
+func TestLoadFromFile_ExplicitZeroBufferDisablesTuning(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	body := []byte("theme: tokyo-night\nvolume: 60\nbuffer_seconds: 0\ninitial_buffer_seconds: 0\nstations: []\n")
+	if err := os.WriteFile(path, body, 0o644); err != nil {
+		t.Fatalf("seed file: %v", err)
+	}
+	cfg, err := loadFromFile(path)
+	if err != nil {
+		t.Fatalf("loadFromFile: %v", err)
+	}
+	if cfg.BufferSeconds != 0 || cfg.InitialBufferSeconds != 0 {
+		t.Fatalf("buffer settings = %d/%d, want explicit zeroes", cfg.BufferSeconds, cfg.InitialBufferSeconds)
+	}
+}
+
 func TestLoadFromFile_InvalidYAMLReturnsError(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "config.yaml")
@@ -214,6 +236,12 @@ func TestDefaultsAreNonEmpty(t *testing.T) {
 	if d.Volume < 0 || d.Volume > 100 {
 		t.Errorf("Defaults().Volume = %d, want 0..100", d.Volume)
 	}
+	if d.BufferSeconds <= 0 {
+		t.Errorf("Defaults().BufferSeconds = %d, want positive", d.BufferSeconds)
+	}
+	if d.InitialBufferSeconds < 0 {
+		t.Errorf("Defaults().InitialBufferSeconds = %d, want non-negative", d.InitialBufferSeconds)
+	}
 	if len(d.Stations) == 0 {
 		t.Error("Defaults().Stations is empty")
 	}
@@ -295,4 +323,3 @@ stations:
 		t.Errorf("station IsYouTube() = false, want true")
 	}
 }
-

internal/tui/keys.go

@@ -21,6 +21,7 @@ type KeyMap struct {
 	ShareStation  key.Binding
 	ImportStation key.Binding
 	MixerOpen     key.Binding
+	SettingsOpen  key.Binding
 	StreamInfo    key.Binding
 	Help          key.Binding
 	Quit          key.Binding
@@ -83,6 +84,10 @@ func DefaultKeyMap() KeyMap {
 			key.WithKeys("x"),
 			key.WithHelp("x", "mixer"),
 		),
+		SettingsOpen: key.NewBinding(
+			key.WithKeys("o"),
+			key.WithHelp("o", "settings"),
+		),
 		StreamInfo: key.NewBinding(
 			key.WithKeys("i"),
 			key.WithHelp("i", "info"),
@@ -103,6 +108,6 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		{k.Up, k.Down, k.AddStation, k.EditStation, k.DeleteStation, k.ShareStation, k.ImportStation, k.MixerOpen},
 		{k.PlayPause, k.VolUp, k.VolDown},
-		{k.ThemeCycle, k.Mini, k.StreamInfo, k.Help, k.Quit},
+		{k.ThemeCycle, k.SettingsOpen, k.Mini, k.StreamInfo, k.Help, k.Quit},
 	}
 }

internal/tui/model.go

@@ -65,6 +65,7 @@ const (
 	modeShareStation
 	modeImportStations
 	modeThemePicker
+	modeSettings
 )
 
 // Model is the root Bubble Tea model.
@@ -140,6 +141,12 @@ type Model struct {
 	themeCursor       int
 	themeBeforePicker string
 
+	// settingsCursor highlights the active row in the settings modal.
+	// Draft values are kept separate from cfg until Enter persists them.
+	settingsCursor               int
+	settingsBufferSeconds        int
+	settingsInitialBufferSeconds int
+
 	mixer   *audio.AmbientMixer
 	mixerUI mixerModel
 

internal/tui/model_test.go

@@ -233,6 +233,44 @@ func TestThemePickerViewAndTopChip(t *testing.T) {
 	}
 }
 
+func TestSettingsModalAdjustSaveAndCancel(t *testing.T) {
+	t.Setenv("XDG_CONFIG_HOME", t.TempDir())
+	cfg := config.Defaults()
+	cfg.Stations = []config.Station{{Name: "A", URL: "http://a"}}
+	m := NewModel(&cfg, nil, audio.NewAmbientMixer(), Options{AutoplayStation: -1})
+	updated, _ := m.Update(tea.WindowSizeMsg{Width: 80, Height: 24})
+	m = updated.(Model)
+
+	m = send(t, m, "o")
+	if m.mode != modeSettings {
+		t.Fatalf("mode after o: got %v, want modeSettings", m.mode)
+	}
+	out := m.View()
+	for _, want := range []string{"settings", "network buffer", "initial buffer"} {
+		if !strings.Contains(out, want) {
+			t.Fatalf("settings view missing %q; got:\n%s", want, out)
+		}
+	}
+
+	m = send(t, m, "l", "j", "l", "l") // buffer 30→35, initial 0→10
+	updated, cmd := m.Update(tea.KeyMsg{Type: tea.KeyEnter})
+	m = updated.(Model)
+	if cmd == nil {
+		t.Fatal("saving settings produced no toast command")
+	}
+	if m.mode != modeFull {
+		t.Fatalf("mode after saving settings: got %v, want modeFull", m.mode)
+	}
+	if cfg.BufferSeconds != 35 || cfg.InitialBufferSeconds != 10 {
+		t.Fatalf("saved buffer settings = %d/%d, want 35/10", cfg.BufferSeconds, cfg.InitialBufferSeconds)
+	}
+
+	m = send(t, m, "o", "0", "esc")
+	if cfg.BufferSeconds != 35 || cfg.InitialBufferSeconds != 10 {
+		t.Fatalf("cancel changed config to %d/%d", cfg.BufferSeconds, cfg.InitialBufferSeconds)
+	}
+}
+
 func TestUpdate_QuitReturnsTeaQuit(t *testing.T) {
 	m := fixture()
 	_, cmd := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("q")})