feat(settings): 支持自定义并持久化日志目录

- 将日志目录配置整合到数据目录设置,支持选择、打开、恢复默认与保存
- 持久化日志目录并保留环境变量优先级,目录调整后重启生效
- 通过跨进程锁和原子写入保护数据目录与日志目录配置
- 移除重复标题并互斥目录修改操作,补齐六语言文案
- 补充桌面接口、浏览器模拟及并发回归测试
This commit is contained in:
Syngnat
2026-07-23 11:40:17 +08:00
parent 5a5fbf04fe
commit 97cffa7809
28 changed files with 1459 additions and 38 deletions

View File

@@ -12,6 +12,8 @@ import (
"sync"
"sync/atomic"
"time"
"GoNavi-Wails/internal/appdata"
)
const (
@@ -147,6 +149,23 @@ func Path() string {
return logPath
}
func DefaultDirectory() string {
return defaultLogDir()
}
func ConfiguredDirectory() (string, bool) {
if directory := strings.TrimSpace(os.Getenv(envLogDir)); directory != "" {
if abs, err := filepath.Abs(directory); err == nil {
directory = filepath.Clean(abs)
}
return directory, true
}
if directory, err := appdata.ResolveConfiguredLogDirectory(); err == nil && directory != "" {
return directory, false
}
return defaultLogDir(), false
}
func Close() {
Init()
logMu.Lock()
@@ -263,14 +282,17 @@ func printf(level string, format string, args ...any) {
}
func initOutput() (string, io.Writer) {
dir := strings.TrimSpace(os.Getenv(envLogDir))
if dir == "" {
dir = defaultLogDir()
}
dir, _ := ConfiguredDirectory()
if path, writer, ok := openLogFile(dir); ok {
return path, writer
}
defaultDir := defaultLogDir()
if filepath.Clean(dir) != filepath.Clean(defaultDir) {
if path, writer, ok := openLogFile(defaultDir); ok {
return path, writer
}
}
fallbackDir := filepath.Join(os.TempDir(), appHiddenDir, appLogDirName)
if path, writer, ok := openLogFile(fallbackDir); ok {

View File

@@ -6,10 +6,13 @@ import (
"fmt"
"io"
"os"
"path/filepath"
"strings"
"sync"
"testing"
"time"
"GoNavi-Wails/internal/appdata"
)
func TestMain(m *testing.M) {
@@ -34,6 +37,62 @@ func TestMain(m *testing.M) {
os.Exit(code)
}
func TestConfiguredDirectoryUsesPersistedSetting(t *testing.T) {
homeDir := t.TempDir()
t.Setenv("HOME", homeDir)
t.Setenv("USERPROFILE", homeDir)
t.Setenv(envLogDir, "")
customDirectory := filepath.Join(t.TempDir(), "custom-logs")
if _, err := appdata.SetConfiguredLogDirectory(customDirectory); err != nil {
t.Fatalf("SetConfiguredLogDirectory returned error: %v", err)
}
directory, managedByEnvironment := ConfiguredDirectory()
if managedByEnvironment {
t.Fatal("persisted log directory should not be marked as environment-managed")
}
if directory != customDirectory {
t.Fatalf("configured directory = %q, want %q", directory, customDirectory)
}
}
func TestConfiguredDirectoryPrefersEnvironmentOverride(t *testing.T) {
homeDir := t.TempDir()
t.Setenv("HOME", homeDir)
t.Setenv("USERPROFILE", homeDir)
persistedDirectory := filepath.Join(t.TempDir(), "persisted-logs")
if _, err := appdata.SetConfiguredLogDirectory(persistedDirectory); err != nil {
t.Fatalf("SetConfiguredLogDirectory returned error: %v", err)
}
environmentDirectory := filepath.Join(t.TempDir(), "environment-logs")
t.Setenv(envLogDir, environmentDirectory)
directory, managedByEnvironment := ConfiguredDirectory()
if !managedByEnvironment {
t.Fatal("environment log directory should be marked as environment-managed")
}
if directory != environmentDirectory {
t.Fatalf("configured directory = %q, want environment override %q", directory, environmentDirectory)
}
}
func TestConfiguredDirectoryFallsBackToDefault(t *testing.T) {
homeDir := t.TempDir()
t.Setenv("HOME", homeDir)
t.Setenv("USERPROFILE", homeDir)
t.Setenv(envLogDir, "")
directory, managedByEnvironment := ConfiguredDirectory()
if managedByEnvironment {
t.Fatal("default log directory should not be marked as environment-managed")
}
want := filepath.Join(homeDir, appHiddenDir, appLogDirName)
if directory != want {
t.Fatalf("configured directory = %q, want default %q", directory, want)
}
}
type slowSyncSink struct {
mu sync.Mutex
contents bytes.Buffer