move embed logic to ocispkg

settings/pkg/assets/assets.go

@@ -1,55 +0,0 @@
-package assets
-
-import (
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"github.com/owncloud/ocis/settings"
-
-	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/settings/pkg/config"
-)
-
-// assets gets initialized by New and provides the handler.
-type assets struct {
-	logger log.Logger
-	config *config.Config
-}
-
-// Open just implements the HTTP filesystem interface.
-func (a assets) Open(original string) (http.File, error) {
-	if a.config.Asset.Path != "" {
-		if stat, err := os.Stat(a.config.Asset.Path); err == nil && stat.IsDir() {
-			custom := filepath.Join(
-				a.config.Asset.Path,
-				original,
-			)
-
-			if _, err := os.Stat(custom); !os.IsNotExist(err) {
-				f, err := os.Open(custom)
-
-				if err != nil {
-					return nil, err
-				}
-
-				return f, nil
-			}
-		} else {
-			a.logger.Warn().
-				Str("path", a.config.Asset.Path).
-				Msg("Assets directory doesn't exist")
-		}
-	}
-
-	return settings.Assets.Open(original)
-}
-
-// New returns a new http filesystem to serve assets.
-func New(opts ...Option) http.FileSystem {
-	options := newOptions(opts...)
-
-	return assets{
-		config: options.Config,
-	}
-}

settings/pkg/assets/option.go

@@ -1,10 +1,20 @@
 package assets
 
 import (
+	"net/http"
+
+	"github.com/owncloud/ocis/ocis-pkg/assetsfs"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/settings"
 	"github.com/owncloud/ocis/settings/pkg/config"
 )
 
+// New returns a new http filesystem to serve assets.
+func New(opts ...Option) http.FileSystem {
+	options := newOptions(opts...)
+	return assetsfs.New(settings.Assets, options.Config.Asset.Path, options.Logger)
+}
+
 // Option defines a single option function.
 type Option func(o *Options)
 

settings/settings.go

@@ -2,21 +2,7 @@ package settings
 
 import (
 	"embed"
-	"io/fs"
-	"net/http"
 )
 
 //go:embed assets/*
-var assets embed.FS
-
-// Assets FS
-var Assets http.FileSystem
-
-func init() {
-	embedFS, err := fs.Sub(assets, "assets")
-	if err != nil {
-		panic(err)
-	}
-
-	Assets = http.FS(embedFS)
-}
+var Assets embed.FS