refactor(blogo,plugins): update plugins to use io/fs instead of blogo/fs

This commit is contained in:
Guz
2025-01-23 09:48:45 -03:00
parent ad016203fd
commit 18afa476ca
7 changed files with 24 additions and 16 deletions

View File

@@ -16,7 +16,9 @@
package plugins
import (
"forge.capytal.company/loreddev/x/blogo/fs"
"io/fs"
"forge.capytal.company/loreddev/x/blogo/metadata"
"forge.capytal.company/loreddev/x/blogo/plugin"
)
@@ -38,8 +40,8 @@ func (p *emptySourcer) Source() (fs.FS, error) {
type emptyFS struct{}
func (f emptyFS) Metadata() fs.Metadata {
return fs.MetadataMap(map[string]any{})
func (f emptyFS) Metadata() metadata.Metadata {
return metadata.Map(map[string]any{})
}
func (f emptyFS) Open(name string) (fs.File, error) {

View File

@@ -19,9 +19,9 @@ import (
"bytes"
"fmt"
"io"
"io/fs"
"log/slog"
"forge.capytal.company/loreddev/x/blogo/fs"
"forge.capytal.company/loreddev/x/blogo/plugin"
)

View File

@@ -20,9 +20,9 @@ import (
"errors"
"fmt"
"io"
"io/fs"
"log/slog"
"forge.capytal.company/loreddev/x/blogo/fs"
"forge.capytal.company/loreddev/x/blogo/plugin"
)

View File

@@ -19,9 +19,10 @@ import (
"errors"
"fmt"
"io"
"io/fs"
"log/slog"
"forge.capytal.company/loreddev/x/blogo/fs"
"forge.capytal.company/loreddev/x/blogo/metadata"
"forge.capytal.company/loreddev/x/blogo/plugin"
)
@@ -133,12 +134,14 @@ type multiSourcerFS struct {
skipOnError bool
}
func (pf *multiSourcerFS) Metadata() fs.Metadata {
var m fs.Metadata
func (pf *multiSourcerFS) Metadata() metadata.Metadata {
ms := []metadata.Metadata{}
for _, v := range pf.fileSystems {
m = fs.JoinMetadata(m, v.Metadata())
if m, err := metadata.GetMetadata(v); err == nil {
ms = append(ms, m)
}
}
return m
return metadata.Join(ms...)
}
func (mf *multiSourcerFS) Open(name string) (fs.File, error) {

View File

@@ -19,8 +19,8 @@ import (
"errors"
"fmt"
"io"
"io/fs"
"forge.capytal.company/loreddev/x/blogo/fs"
"forge.capytal.company/loreddev/x/blogo/plugin"
)

View File

@@ -18,10 +18,11 @@ package plugins
import (
"fmt"
"io"
"io/fs"
"log/slog"
"strings"
"forge.capytal.company/loreddev/x/blogo/fs"
"forge.capytal.company/loreddev/x/blogo/metadata"
"forge.capytal.company/loreddev/x/blogo/plugin"
)
@@ -163,12 +164,14 @@ type prefixedSourcerFS struct {
prefixSeparator string
}
func (pf *prefixedSourcerFS) Metadata() fs.Metadata {
var m fs.Metadata
func (pf *prefixedSourcerFS) Metadata() metadata.Metadata {
ms := []metadata.Metadata{}
for _, v := range pf.fileSystems {
m = fs.JoinMetadata(m, v.Metadata())
if m, err := metadata.GetMetadata(v); err == nil {
ms = append(ms, m)
}
}
return m
return metadata.Join(ms...)
}
func (pf *prefixedSourcerFS) Open(name string) (fs.File, error) {