PNArchives/Memoh
1
0
Fork 0
mirror of https://github.com/memohai/Memoh.git synced 2026-04-25 07:00:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(media): add local filesystem fallback and fix gallery lightbox matching

Browse Source 
- Add localfs storage provider as fallback when containerfs is unreachable
- Wrap media service with fallback provider in both entry points
- Fix gallery lightbox src matching by comparing pathnames only
This commit is contained in:
Acbox
2026-04-03 00:01:49 +08:00
parent fc2b603018
commit 5aeb2fd3fc
5 changed files with 181 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/agent/main.go
+11 -2
View File
@@ -10,6 +10,7 @@ import (
"net/http"
"os"
stdpath "path"
"path/filepath"
"strings"
"time"
@@ -81,6 +82,8 @@ import (
sessionpkg "github.com/memohai/memoh/internal/session"
"github.com/memohai/memoh/internal/settings"
"github.com/memohai/memoh/internal/storage/providers/containerfs"
"github.com/memohai/memoh/internal/storage/providers/fallback"
"github.com/memohai/memoh/internal/storage/providers/localfs"
ttspkg "github.com/memohai/memoh/internal/tts"
ttsedge "github.com/memohai/memoh/internal/tts/adapter/edge"
"github.com/memohai/memoh/internal/version"
@@ -672,8 +675,14 @@ func provideSessionHandler(log *slog.Logger, sessionService *sessionpkg.Service,
return handlers.NewSessionHandler(log, sessionService, botService, accountService)
}
func provideMediaService(log *slog.Logger, manager *workspace.Manager) *media.Service {
provider := containerfs.New(manager)
func provideMediaService(log *slog.Logger, manager *workspace.Manager, cfg config.Config) *media.Service {
primary := containerfs.New(manager)
dataRoot := cfg.Workspace.DataRoot
if dataRoot == "" {
dataRoot = config.DefaultDataRoot
}
secondary := localfs.New(filepath.Join(dataRoot, "media"))
provider := fallback.New(primary, secondary)
return media.NewService(log, provider)
}
cmd/memoh/serve.go
+11 -2
View File
@@ -9,6 +9,7 @@ import (
"net/http"
"os"
stdpath "path"
"path/filepath"
"strings"
"time"
@@ -82,6 +83,8 @@ import (
sessionpkg "github.com/memohai/memoh/internal/session"
"github.com/memohai/memoh/internal/settings"
"github.com/memohai/memoh/internal/storage/providers/containerfs"
"github.com/memohai/memoh/internal/storage/providers/fallback"
"github.com/memohai/memoh/internal/storage/providers/localfs"
ttspkg "github.com/memohai/memoh/internal/tts"
ttsedge "github.com/memohai/memoh/internal/tts/adapter/edge"
"github.com/memohai/memoh/internal/version"
@@ -576,8 +579,14 @@ func (h *memohAuthHandler) Register(e *echo.Echo) {
e.POST("/api/auth/refresh", h.inner.Refresh)
}
func provideMediaService(log *slog.Logger, manager *workspace.Manager) *media.Service {
provider := containerfs.New(manager)
func provideMediaService(log *slog.Logger, manager *workspace.Manager, cfg config.Config) *media.Service {
primary := containerfs.New(manager)
dataRoot := cfg.Workspace.DataRoot
if dataRoot == "" {
dataRoot = config.DefaultDataRoot
}
secondary := localfs.New(filepath.Join(dataRoot, "media"))
provider := fallback.New(primary, secondary)
return media.NewService(log, provider)
}