apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-09-27 04:16:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing filesystem metadata and middlewares

Browse Source
This commit is contained in:
Ingo Oppermann
2023-02-14 16:16:35 +01:00
parent 1d30d9eecd
commit 05a176370a
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/api.go
View File

@@ -389,6 +389,12 @@ func (a *api) start() error {
return fmt.Errorf("disk filesystem: %w", err) return fmt.Errorf("disk filesystem: %w", err)
} }
if diskfsRoot, err := filepath.Abs(cfg.Storage.Disk.Dir); err != nil {
return err
} else {
diskfs.SetMetadata("base", diskfsRoot)
}
a.diskfs = diskfs a.diskfs = diskfs
baseMemFS := url.URL{ baseMemFS := url.URL{

2
http/handler/filesystem.go
View File

@@ -84,7 +84,7 @@ func (h *FSHandler) PutFile(c echo.Context) error {
_, created, err := h.fs.Filesystem.WriteFileReader(path, req.Body) _, created, err := h.fs.Filesystem.WriteFileReader(path, req.Body)
if err != nil { if err != nil {
return api.Err(http.StatusBadRequest, "%s", err) return api.Err(http.StatusBadRequest, "Bad request", "%s", err)
} }
if h.fs.Cache != nil { if h.fs.Cache != nil {

17
http/server.go
View File

@@ -153,7 +153,8 @@ type server struct {
type filesystem struct { type filesystem struct {
fs.FS fs.FS
handler *handler.FSHandler handler *handler.FSHandler
middleware echo.MiddlewareFunc
} }
func NewServer(config Config) (Server, error) { func NewServer(config Config) (Server, error) {
@@ -194,13 +195,13 @@ func NewServer(config Config) (Server, error) {
handler: handler.NewFS(fs), handler: handler.NewFS(fs),
} }
s.filesystems[filesystem.Name] = filesystem
if fs.Filesystem.Type() == "disk" { if fs.Filesystem.Type() == "disk" {
s.middleware.hlsrewrite = mwhlsrewrite.NewHLSRewriteWithConfig(mwhlsrewrite.HLSRewriteConfig{ filesystem.middleware = mwhlsrewrite.NewHLSRewriteWithConfig(mwhlsrewrite.HLSRewriteConfig{
PathPrefix: fs.Filesystem.Metadata("base"), PathPrefix: fs.Filesystem.Metadata("base"),
}) })
} }
s.filesystems[filesystem.Name] = filesystem
} }
if _, ok := corsPrefixes["/"]; !ok { if _, ok := corsPrefixes["/"]; !ok {
@@ -461,6 +462,14 @@ func (s *server) setRoutes() {
fs.Use(mwcache) fs.Use(mwcache)
} }
if filesystem.middleware != nil {
fs.Use(filesystem.middleware)
}
if s.middleware.session != nil {
fs.Use(s.middleware.session)
}
fs.GET("", filesystem.handler.GetFile) fs.GET("", filesystem.handler.GetFile)
fs.HEAD("", filesystem.handler.GetFile) fs.HEAD("", filesystem.handler.GetFile)

2
io/fs/fs.go
View File

@@ -44,7 +44,7 @@ type File interface {
type ReadFilesystem interface { type ReadFilesystem interface {
// Size returns the consumed size and capacity of the filesystem in bytes. The // Size returns the consumed size and capacity of the filesystem in bytes. The
// capacity is negative if the filesystem can consume as much space as it wants. // capacity is zero or negative if the filesystem can consume as much space as it wants.
Size() (int64, int64) Size() (int64, int64)
// Files returns the current number of files in the filesystem. // Files returns the current number of files in the filesystem.

6
io/fs/sized.go
View File

@@ -22,7 +22,7 @@ type PurgeFilesystem interface {
type sizedFilesystem struct { type sizedFilesystem struct {
Filesystem Filesystem
// Siez is the capacity of the filesystem in bytes // Size is the capacity of the filesystem in bytes
maxSize int64 maxSize int64
// Set true to automatically delete the oldest files until there's // Set true to automatically delete the oldest files until there's
@@ -67,7 +67,7 @@ func (r *sizedFilesystem) Resize(size int64) error {
func (r *sizedFilesystem) WriteFileReader(path string, rd io.Reader) (int64, bool, error) { func (r *sizedFilesystem) WriteFileReader(path string, rd io.Reader) (int64, bool, error) {
currentSize, maxSize := r.Size() currentSize, maxSize := r.Size()
if maxSize < 0 { if maxSize <= 0 {
return r.Filesystem.WriteFileReader(path, rd) return r.Filesystem.WriteFileReader(path, rd)
} }
@@ -106,7 +106,7 @@ func (r *sizedFilesystem) WriteFile(path string, data []byte) (int64, bool, erro
func (r *sizedFilesystem) WriteFileSafe(path string, data []byte) (int64, bool, error) { func (r *sizedFilesystem) WriteFileSafe(path string, data []byte) (int64, bool, error) {
currentSize, maxSize := r.Size() currentSize, maxSize := r.Size()
if maxSize < 0 { if maxSize <= 0 {
return r.Filesystem.WriteFile(path, data) return r.Filesystem.WriteFile(path, data)
} }