Fix default PlsIgnoredPatterns configuration

This commit is contained in:
Deluan 2020-01-06 15:17:44 -05:00
parent 3eaf80de99
commit 4c61ac3272
2 changed files with 5 additions and 2 deletions

View file

@ -15,14 +15,14 @@ type sonic struct {
IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"` IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"`
IndexGroups string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"` IndexGroups string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"`
User string `default:"deluan"` User string `default:"anyone"`
Password string `default:"wordpass"` Password string `default:"wordpass"`
DisableDownsampling bool `default:"false"` DisableDownsampling bool `default:"false"`
DisableValidation bool `default:"false"` DisableValidation bool `default:"false"`
DownsampleCommand string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"` DownsampleCommand string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"`
PlsIgnoreFolders bool `default:"true"` PlsIgnoreFolders bool `default:"true"`
PlsIgnoredPatterns string `default:"^iCloud;\~"` PlsIgnoredPatterns string `default:"^iCloud;\\~"`
RunMode string `default:"dev"` RunMode string `default:"dev"`
} }

View file

@ -152,6 +152,9 @@ func (s *ItunesScanner) skipPlaylist(p *itl.Playlist, ignFolders bool, ignPatter
} }
for _, p := range ignPatterns { for _, p := range ignPatterns {
if p == "" {
continue
}
m, _ := regexp.MatchString(p, fullPath) m, _ := regexp.MatchString(p, fullPath)
if m { if m {
return true return true