mirror of
https://github.com/datarhei/core.git
synced 2025-10-18 14:00:41 +08:00
Merge branch 'dev' into iam
This commit is contained in:
@@ -155,7 +155,8 @@ type server struct {
|
||||
type filesystem struct {
|
||||
fs.FS
|
||||
|
||||
handler *handler.FSHandler
|
||||
handler *handler.FSHandler
|
||||
middleware echo.MiddlewareFunc
|
||||
}
|
||||
|
||||
func NewServer(config Config) (Server, error) {
|
||||
@@ -196,13 +197,13 @@ func NewServer(config Config) (Server, error) {
|
||||
handler: handler.NewFS(fs),
|
||||
}
|
||||
|
||||
s.filesystems[filesystem.Name] = filesystem
|
||||
|
||||
if fs.Filesystem.Type() == "disk" {
|
||||
s.middleware.hlsrewrite = mwhlsrewrite.NewHLSRewriteWithConfig(mwhlsrewrite.HLSRewriteConfig{
|
||||
filesystem.middleware = mwhlsrewrite.NewHLSRewriteWithConfig(mwhlsrewrite.HLSRewriteConfig{
|
||||
PathPrefix: fs.Filesystem.Metadata("base"),
|
||||
})
|
||||
}
|
||||
|
||||
s.filesystems[filesystem.Name] = filesystem
|
||||
}
|
||||
|
||||
if _, ok := corsPrefixes["/"]; !ok {
|
||||
@@ -461,6 +462,14 @@ func (s *server) setRoutes() {
|
||||
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.HEAD("", filesystem.handler.GetFile)
|
||||
|
||||
|
Reference in New Issue
Block a user