From 4c61ac32728153674c5e96e7f370890ed30ceb44 Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 6 Jan 2020 15:17:44 -0500 Subject: [PATCH] Fix default PlsIgnoredPatterns configuration --- conf/configuration.go | 4 ++-- scanner/itunes_scanner.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/configuration.go b/conf/configuration.go index 3e85a06b..32eb315d 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -15,14 +15,14 @@ type sonic struct { 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]([)"` - User string `default:"deluan"` + User string `default:"anyone"` Password string `default:"wordpass"` DisableDownsampling bool `default:"false"` DisableValidation bool `default:"false"` DownsampleCommand string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"` PlsIgnoreFolders bool `default:"true"` - PlsIgnoredPatterns string `default:"^iCloud;\~"` + PlsIgnoredPatterns string `default:"^iCloud;\\~"` RunMode string `default:"dev"` } diff --git a/scanner/itunes_scanner.go b/scanner/itunes_scanner.go index b55273d1..42adb3da 100644 --- a/scanner/itunes_scanner.go +++ b/scanner/itunes_scanner.go @@ -152,6 +152,9 @@ func (s *ItunesScanner) skipPlaylist(p *itl.Playlist, ignFolders bool, ignPatter } for _, p := range ignPatterns { + if p == "" { + continue + } m, _ := regexp.MatchString(p, fullPath) if m { return true