diff --git a/blogo/plugins/emptysourcer.go b/blogo/plugins/emptysourcer.go index 3aa9c6e..e9c2952 100644 --- a/blogo/plugins/emptysourcer.go +++ b/blogo/plugins/emptysourcer.go @@ -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) { diff --git a/blogo/plugins/foldingrenderer.go b/blogo/plugins/foldingrenderer.go index 8b75b12..3ed44ae 100644 --- a/blogo/plugins/foldingrenderer.go +++ b/blogo/plugins/foldingrenderer.go @@ -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" ) diff --git a/blogo/plugins/multirenderer.go b/blogo/plugins/multirenderer.go index 0c417ed..aa837ce 100644 --- a/blogo/plugins/multirenderer.go +++ b/blogo/plugins/multirenderer.go @@ -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" ) diff --git a/blogo/plugins/multisourcer.go b/blogo/plugins/multisourcer.go index a14ec72..1cf4c0b 100644 --- a/blogo/plugins/multisourcer.go +++ b/blogo/plugins/multisourcer.go @@ -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) { diff --git a/blogo/plugins/plaintext.go b/blogo/plugins/plaintext.go index b3eafda..bd14081 100644 --- a/blogo/plugins/plaintext.go +++ b/blogo/plugins/plaintext.go @@ -19,8 +19,8 @@ import ( "errors" "fmt" "io" + "io/fs" - "forge.capytal.company/loreddev/x/blogo/fs" "forge.capytal.company/loreddev/x/blogo/plugin" ) diff --git a/blogo/plugins/plugingroup.go b/blogo/plugins/plugingroup.go deleted file mode 100644 index e69de29..0000000 diff --git a/blogo/plugins/prefixedsourcer.go b/blogo/plugins/prefixedsourcer.go index 39617d2..fcdf970 100644 --- a/blogo/plugins/prefixedsourcer.go +++ b/blogo/plugins/prefixedsourcer.go @@ -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) {