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

helpers: Remove (now) unused GetStaticDir

Browse source 
* In Hugo there is no single static dir
* It was used as a filter in the content dir, which makes no sense since any overlap here is impossible
This commit is contained in:
Bjørn Erik Pedersen 2017-11-19 13:47:36 +01:00
parent d99db71ab5
commit c1d325934e
4 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
helpers/path.go
View file

@ -167,12 +167,6 @@ func (p *PathSpec) GetLayoutDirPath() string {
return p.AbsPathify(p.layoutDir) return p.AbsPathify(p.layoutDir)
} }
// GetStaticDirPath returns the absolute path to the static file dir
// for the current Hugo project.
func (p *PathSpec) GetStaticDirPath() string {
return p.AbsPathify(p.StaticDir())
}
// GetThemeDir gets the root directory of the current theme, if there is one. // GetThemeDir gets the root directory of the current theme, if there is one.
// If there is no theme, returns the empty string. // If there is no theme, returns the empty string.
func (p *PathSpec) GetThemeDir() string { func (p *PathSpec) GetThemeDir() string {
@ -230,16 +224,6 @@ func (p *PathSpec) GetThemesDirPath() string {
return dir return dir
} }
// MakeStaticPathRelative makes a relative path to the static files directory.
// It does so by taking either the project's static path or the theme's static
// path into consideration.
func (p *PathSpec) MakeStaticPathRelative(inPath string) (string, error) {
staticDir := p.GetStaticDirPath()
themeStaticDir := p.GetThemesDirPath()
return makePathRelative(inPath, staticDir, themeStaticDir)
}
func makePathRelative(inPath string, possibleDirectories ...string) (string, error) { func makePathRelative(inPath string, possibleDirectories ...string) (string, error) {
for _, currentPath := range possibleDirectories { for _, currentPath := range possibleDirectories {

5
helpers/pathspec.go
View file

@ -133,11 +133,6 @@ func (p *PathSpec) WorkingDir() string {
return p.workingDir return p.workingDir
} }
// StaticDir returns the relative static dir in the current configuration.
func (p *PathSpec) StaticDir() string {
return p.staticDirs[len(p.staticDirs)-1]
}
// StaticDirs returns the relative static dirs for the current configuration. // StaticDirs returns the relative static dirs for the current configuration.
func (p *PathSpec) StaticDirs() []string { func (p *PathSpec) StaticDirs() []string {
return p.staticDirs return p.staticDirs

1
helpers/pathspec_test.go
View file

@ -57,6 +57,5 @@ func TestNewPathSpecFromConfig(t *testing.T) {
require.Equal(t, "thethemes", p.themesDir) require.Equal(t, "thethemes", p.themesDir)
require.Equal(t, "thelayouts", p.layoutDir) require.Equal(t, "thelayouts", p.layoutDir)
require.Equal(t, "thework", p.workingDir) require.Equal(t, "thework", p.workingDir)
require.Equal(t, "thestatic", p.StaticDir())
require.Equal(t, "thetheme", p.theme) require.Equal(t, "thetheme", p.theme)
} }

4
hugolib/site.go
View file

@ -977,10 +977,8 @@ func (s *Site) initialize() (err error) {
return err return err
} }
staticDir := s.PathSpec.GetStaticDirPath() + "/"
sp := source.NewSourceSpec(s.Cfg, s.Fs) sp := source.NewSourceSpec(s.Cfg, s.Fs)
s.Source = sp.NewFilesystem(s.absContentDir(), staticDir) s.Source = sp.NewFilesystem(s.absContentDir())
return return
} }