28allday
a93cdcaa83
A receiveDir stored as "~/Omarchy-Send" (hand-edited, or typed into the Settings tab) was treated as a relative path, so the receiver silently created a literal "~" directory under its cwd and wrote incoming files there. The TUI expanded ~ for display only, which hid the problem. The canonical ExpandHome now lives in config and is applied in Load (normalised value is persisted back), in the Settings-tab save, and by the TUI's display helper, which now delegates to it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
76 lines
2.2 KiB
Go
76 lines
2.2 KiB
Go
package config
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
// ExpandHome resolves the ~-forms a user may type or hand-edit, and leaves
|
|
// everything else untouched.
|
|
func TestExpandHome(t *testing.T) {
|
|
home, err := os.UserHomeDir()
|
|
if err != nil {
|
|
t.Skipf("no home dir: %v", err)
|
|
}
|
|
cases := map[string]string{
|
|
"~": home,
|
|
"~/Omarchy-Send": filepath.Join(home, "Omarchy-Send"),
|
|
"~/a/b": filepath.Join(home, "a", "b"),
|
|
"/abs/path": "/abs/path",
|
|
"relative/path": "relative/path",
|
|
"~user/not-ours": "~user/not-ours", // ~user expansion is not supported
|
|
"mid/~/not-leading": "mid/~/not-leading",
|
|
"": "",
|
|
}
|
|
for in, want := range cases {
|
|
if got := ExpandHome(in); got != want {
|
|
t.Errorf("ExpandHome(%q) = %q, want %q", in, got, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
// A config file whose receiveDir was stored as "~/…" is normalised to an
|
|
// absolute path by Load — the regression that sent files into a literal "~"
|
|
// directory under the process cwd.
|
|
func TestLoadExpandsTildeReceiveDir(t *testing.T) {
|
|
home, err := os.UserHomeDir()
|
|
if err != nil {
|
|
t.Skipf("no home dir: %v", err)
|
|
}
|
|
cfgHome := t.TempDir()
|
|
t.Setenv("XDG_CONFIG_HOME", cfgHome)
|
|
|
|
dir := filepath.Join(cfgHome, "omarchy-send")
|
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
|
t.Fatalf("mkdir: %v", err)
|
|
}
|
|
seed := map[string]any{"alias": "t", "receiveDir": "~/Omarchy-Send"}
|
|
data, _ := json.Marshal(seed)
|
|
if err := os.WriteFile(filepath.Join(dir, "config.json"), data, 0o600); err != nil {
|
|
t.Fatalf("seed config: %v", err)
|
|
}
|
|
|
|
cfg, err := Load()
|
|
if err != nil {
|
|
t.Fatalf("Load: %v", err)
|
|
}
|
|
want := filepath.Join(home, "Omarchy-Send")
|
|
if cfg.ReceiveDir != want {
|
|
t.Fatalf("ReceiveDir = %q, want %q", cfg.ReceiveDir, want)
|
|
}
|
|
|
|
// And the normalised value is what got persisted back.
|
|
raw, err := os.ReadFile(filepath.Join(dir, "config.json"))
|
|
if err != nil {
|
|
t.Fatalf("read back: %v", err)
|
|
}
|
|
var onDisk map[string]any
|
|
if err := json.Unmarshal(raw, &onDisk); err != nil {
|
|
t.Fatalf("unmarshal: %v", err)
|
|
}
|
|
if onDisk["receiveDir"] != want {
|
|
t.Fatalf("persisted receiveDir = %q, want %q", onDisk["receiveDir"], want)
|
|
}
|
|
}
|