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

Author: mherger
Date: Fri Nov  4 06:40:32 2011
New Revision: 33657

URL: http://svn.slimdevices.com/slim?rev=33657&view=rev
Log:
Fixed Bug: 17639
Description: pass singledir value to external scanner

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

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33657&r1=33656&r2=33657&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Fri Nov  4 06:40:32 2011
@@ -2,6 +2,7 @@
 <ul>
 	<li>Bug Fixes:</li>
 	<ul>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17639">#17639</a> - Rescan buttons scans the wrong folder</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17643">#17643</a> - Displayed playlist not refreshed on repeat with reshuffle</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17647">#17647</a> - "Generic OPML Browser" plugin needs to be forced enabled</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17644">#17644</a> - Squeezebox database and logfiles fill up OS-partition</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=33657&r1=33656&r2=33657&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Control/Commands.pm (original)
+++ 7.7/trunk/server/Slim/Control/Commands.pm Fri Nov  4 06:40:32 2011
@@ -2492,6 +2492,8 @@
 			rescan  => 1,
 			cleanup => 1,
 		);
+		
+		$args{singledir} = $singledir if $singledir;
 
 		Slim::Music::Import->launchScan(\%args);
 	}

Modified: 7.7/trunk/server/Slim/Music/Import.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Music/Import.pm?rev=33657&r1=33656&r2=33657&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Music/Import.pm (original)
+++ 7.7/trunk/server/Slim/Music/Import.pm Fri Nov  4 06:40:32 2011
@@ -135,6 +135,9 @@
 	if (defined $scannerPriority && $scannerPriority ne "") {
 		$args->{"priority=$scannerPriority"} = 1;
 	}
+	
+	# bug 17639 - pass singledir value if defined
+	my $singledir = delete $args->{singledir} || '';
 
 	my @scanArgs = map { "--$_" } keys %{$args};
 
@@ -162,6 +165,10 @@
 	if ( $debugArgs ) {
 		$debugArgs =~ s/,$//;
 		push @scanArgs, '--debug', $debugArgs;
+	}
+	
+	if ( $singledir ) {
+		push @scanArgs, $singledir;
 	}
 	
 	$class->setIsScanning($args->{wipe} ? 'SETUP_WIPEDB' : 'SETUP_STANDARDRESCAN');