ShadowsOverWestgate/sow-tools
7
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 38 Activity

Fix paths asset regression

Browse Source
This commit is contained in:
archvillainette
2026-05-08 00:23:41 +02:00
parent 4dc16793cd
commit 9f16aa8872
4 changed files with 235 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/project/project.go
+15 -10
View File
@@ -581,7 +581,7 @@ func (p *Project) Scan() error {
effective := p.EffectiveConfig()
sourceDir := p.SourceDir()
if sourceDir != "" && filepath.Clean(sourceDir) != p.Root {
if sourceDir != "" && filepath.Clean(sourceDir) != filepath.Clean(p.Root) {
var err error
sourceFiles, sourceExts, err = scanDir(sourceDir, func(path string) bool {
ext := strings.ToLower(filepath.Ext(path))
@@ -594,15 +594,20 @@ func (p *Project) Scan() error {
}
}
assetFiles, _, err := scanDir(p.AssetsDir(), func(path string) bool {
ext := strings.ToLower(filepath.Ext(path))
return slices.Contains(effective.Inventory.AssetExtensions, ext)
})
if err != nil {
if errors.Is(err, os.ErrNotExist) {
assetFiles = nil
} else {
return fmt.Errorf("scan assets tree: %w", err)
assetDir := p.AssetsDir()
var assetFiles []string
if assetDir != "" && filepath.Clean(assetDir) != filepath.Clean(p.Root) {
var err error
assetFiles, _, err = scanDir(assetDir, func(path string) bool {
ext := strings.ToLower(filepath.Ext(path))
return slices.Contains(effective.Inventory.AssetExtensions, ext)
})
if err != nil {
if errors.Is(err, os.ErrNotExist) {
assetFiles = nil
} else {
return fmt.Errorf("scan assets tree: %w", err)
}
}
}