[Slim-Checkins] r33891 - in /7.7/trunk/server: Changelog7.html scanner.pl

Author: agrundman
Date: Mon Mar 12 13:40:17 2012
New Revision: 33891

URL: http://svn.slimdevices.com/slim?rev=33891&view=rev
Log:
Fixed bug 17890, remove the ability to pass scanner.pl a specific directory to scan. This is not supported by the new media directory and scanner code.

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/scanner.pl

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33891&r1=33890&r2=33891&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Mon Mar 12 13:40:17 2012
@@ -3,6 +3,12 @@
 	<li>New Features:</li>
 	<ul>
 		<li>New packages for the ReadyNAS family of storage systems to support their ARM processor based devices.</li>
+	</ul>
+	<br />
+	
+	<li>Scanner Changes:</li>
+	<ul>
+		<li>The command-line scanner no longer supports scanning a path passed on the command-line. All paths to be scanned must be listed in the prefs file.</li>
 	</ul>
 	<br />
 

Modified: 7.7/trunk/server/scanner.pl
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/scanner.pl?rev=33891&r1=33890&r2=33891&view=diff
==============================================================================
--- 7.7/trunk/server/scanner.pl (original)
+++ 7.7/trunk/server/scanner.pl Mon Mar 12 13:40:17 2012
@@ -166,7 +166,7 @@
 		'debug'   => $debug,
 	});
 
-	if ($help || (!$rescan && !$wipe && !$playlists && !scalar @ARGV)) {
+	if ($help || (!$rescan && !$wipe && !$playlists)) {
 		usage();
 		exit;
 	}
@@ -311,29 +311,16 @@
 	# exceptions properly, it should croak(), so the exception is
 	# propagated to the higher levels.
 	#
-	# We've been passed an explict path or URL - deal with that.
-	if (scalar @ARGV) {
-
-		for my $url (@ARGV) {
-
-			eval { Slim::Utils::Scanner->scanPathOrURL({ 
-				'url'      => $url,
-				'progress' => 1, 
-			}) };
-		}
-
-	} else {
-
-		# Otherwise just use our Importers to scan.
-		eval {
-
-			if ($wipe) {
-				Slim::Music::Import->resetImporters;
-			}
-
-			$changes = Slim::Music::Import->runScan;
-		};
-	}
+
+	# Use our Importers to scan.
+	eval {
+
+		if ($wipe) {
+			Slim::Music::Import->resetImporters;
+		}
+
+		$changes = Slim::Music::Import->runScan;
+	};
 
 	if ($@) {
 
@@ -408,7 +395,7 @@
 
 sub usage {
 	print <<EOF;
-Usage: $0 [debug options] [--rescan] [--wipe] <path or URL>
+Usage: $0 [debug options] [--rescan] [--wipe]
 
 Command line options:
 
@@ -434,9 +421,7 @@
 	
 Examples:
 
-	$0 --rescan /Users/dsully/Music
-
-	$0 http://www.somafm.com/groovesalad.pls
+	$0 --rescan
 
 EOF