[Slim-Checkins] r33883 - in /7.7/trunk/server: Changelog7.html Slim/Control/Commands.pm

Author: mherger
Date: Fri Mar  9 02:36:40 2012
New Revision: 33883

URL: http://svn.slimdevices.com/slim?rev=33883&view=rev
Log:
Fixed Bug: 17777
Description: unless we run a single folder scan, push the playlist folder on the stack of folders to be scanned

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/Slim/Control/Commands.pm

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33883&r1=33882&r2=33883&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Fri Mar  9 02:36:40 2012
@@ -9,6 +9,7 @@
 	<li>Bug Fixes:</li>
 	<ul>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17680">#17680</a> - General install issue of LMS on ReadyNAS Pro (ends up with an install error)</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17777">#17777</a> - New & changed scan does not scan playlists</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17807">#17807</a> - Windows installer is showing German messages if no localization is available</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17818">#17818</a> - logitechmediaserver breaks apparmor in Ubuntu</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17819">#17819</a> - Squeezebox folder is breaking ReadyNAS Samba configuration</li>

Modified: 7.7/trunk/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Control/Commands.pm?rev=33883&r1=33882&r2=33883&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Control/Commands.pm (original)
+++ 7.7/trunk/server/Slim/Control/Commands.pm Fri Mar  9 02:36:40 2012
@@ -2550,6 +2550,10 @@
 					if ($singledir) {
 						$audiodirs = [ grep { /$singledir/ } @{$audiodirs} ];
 					}
+					else {
+						# scan playlist folder too
+						push @$audiodirs, Slim::Utils::Misc::getPlaylistDir();
+					}
 					
 					# XXX until libmediascan supports audio, run the audio scanner now
 					Slim::Utils::Scanner::Local->rescan( $audiodirs, {
@@ -2577,6 +2581,10 @@
 				
 				if ($singledir) {
 					$audiodirs = [ grep { /$singledir/ } @{$audiodirs} ];
+				}
+				else {
+					# scan playlist folder too
+					push @$audiodirs, Slim::Utils::Misc::getPlaylistDir();
 				}
 				
 				# XXX until libmediascan supports audio, run the audio scanner now