From a4e9d9da144124d6dc61550308114990d3d84ed5 Mon Sep 17 00:00:00 2001
From: Deluan <github@deluan.com>
Date: Wed, 9 Mar 2016 19:06:50 -0500
Subject: [PATCH] Option to ignore folder playlists

---
 conf/app.conf             | 1 +
 scanner/itunes_scanner.go | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index fcab3aa94..d0bc73b01 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -14,6 +14,7 @@ user=deluan
 password=wordpass
 dbPath=./devDb
 downsampleCommand=ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -
+ignorePlsFolders = true
 
 [dev]
 disableValidation = true
diff --git a/scanner/itunes_scanner.go b/scanner/itunes_scanner.go
index 039c36671..47f8311a0 100644
--- a/scanner/itunes_scanner.go
+++ b/scanner/itunes_scanner.go
@@ -55,7 +55,12 @@ func (s *ItunesScanner) ScanLibrary(lastModifiedSince time.Time, path string) (i
 		}
 	}
 
+	ignFolders, _ := beego.AppConfig.Bool("ignorePlsFolders")
 	for _, p := range l.Playlists {
+		if p.Master || p.Music || (ignFolders && p.Folder) {
+			continue
+		}
+
 		s.collectPlaylists(&p)
 	}
 	beego.Debug("Processed", len(l.Playlists), "playlists.")
@@ -77,9 +82,6 @@ func (s *ItunesScanner) Playlists() map[string]*domain.Playlist {
 }
 
 func (s *ItunesScanner) collectPlaylists(p *itl.Playlist) {
-	if p.Master || p.Music {
-		return
-	}
 	pl := &domain.Playlist{}
 	pl.Id = strconv.Itoa(p.PlaylistID)
 	pl.Name = p.Name