github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

source: Remove unused Filesystem struct

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2024-02-05 15:01:15 +01:00
parent 9df7b295bc
commit a80c3021ba
No known key found for this signature in database
3 changed files with 1 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/server.go
View file

@ -497,9 +497,7 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
err := func() error { err := func() error {
defer c.r.timeTrack(time.Now(), "Built") defer c.r.timeTrack(time.Now(), "Built")
var err error return c.build()
err = c.build()
return err
}() }()
if err != nil { if err != nil {
return err return err

84
source/filesystem.go
View file

@ -1,84 +0,0 @@
// Copyright 2016 The Hugo Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package source
import (
"path/filepath"
"github.com/gohugoio/hugo/hugofs"
"github.com/spf13/afero"
)
// Filesystem represents a source filesystem.
type Filesystem struct {
Base string
fs afero.Fs
fi hugofs.FileMetaInfo
SourceSpec
}
// NewFilesystem returns a new filesytem for a given source spec.
func (sp SourceSpec) NewFilesystem(base string) *Filesystem {
return &Filesystem{SourceSpec: sp, Base: base, fs: sp.Fs.Source}
}
func (f *Filesystem) Walk(addFile func(*File) error) error {
walker := func(path string, fi hugofs.FileMetaInfo) error {
if fi.IsDir() {
return nil
}
meta := fi.Meta()
filename := meta.Filename
b, err := f.shouldRead(filename, fi)
if err != nil {
return err
}
if b {
if err = addFile(NewFileInfo(fi)); err != nil {
return err
}
}
return err
}
w := hugofs.NewWalkway(hugofs.WalkwayConfig{
Fs: f.fs,
Info: f.fi,
Root: f.Base,
WalkFn: walker,
})
return w.Walk()
}
func (f *Filesystem) shouldRead(filename string, fi hugofs.FileMetaInfo) (bool, error) {
ignore := f.SourceSpec.IgnoreFile(fi.Meta().Filename)
if fi.IsDir() {
if ignore {
return false, filepath.SkipDir
}
return false, nil
}
if ignore {
return false, nil
}
return true, nil
}

48
source/filesystem_test.go
View file

@ -1,48 +0,0 @@
// Copyright 2024 The Hugo Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package source_test
import (
"runtime"
"testing"
qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/hugolib"
"golang.org/x/text/unicode/norm"
)
func TestUnicodeNorm(t *testing.T) {
if runtime.GOOS != "darwin" {
t.Skip("Skipping test on non-Darwin OS")
}
t.Parallel()
files := `
-- hugo.toml --
-- content/å.md --
-- content/é.md --
-- content/å/å.md --
-- content/é/é.md --
-- layouts/_default/single.html --
Title: {{ .Title }}|File: {{ .File.Path}}
`
b := hugolib.Test(t, files, hugolib.TestOptWithNFDOnDarwin())
for _, p := range b.H.Sites[0].RegularPages() {
f := p.File()
b.Assert(norm.NFC.IsNormalString(f.Path()), qt.IsTrue)
b.Assert(norm.NFC.IsNormalString(f.Dir()), qt.IsTrue)
b.Assert(norm.NFC.IsNormalString(f.Filename()), qt.IsTrue)
b.Assert(norm.NFC.IsNormalString(f.BaseFileName()), qt.IsTrue)
}
}