[Slim-Checkins] r12593 - in /trunk/server: HTML/EN/html/docs/cli-api.html Slim/Plugin/Favorites/Plugin.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Fri Aug 17 10:37:36 2007
New Revision: 12593

URL: http://svn.slimdevices.com?rev=12593&view=rev
Log:
Bug: N/A
Description: favorites cli for delete - make this take a tagged param
to match documentation

Modified:
    trunk/server/HTML/EN/html/docs/cli-api.html
    trunk/server/Slim/Plugin/Favorites/Plugin.pm

Modified: trunk/server/HTML/EN/html/docs/cli-api.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/docs/cli-api.html?rev=12593&r1=12592&r2=12593&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/docs/cli-api.html (original)
+++ trunk/server/HTML/EN/html/docs/cli-api.html Fri Aug 17 10:37:36 2007
@@ -8087,9 +8087,9 @@
 </p>
 <blockquote> 
 	<p>
-		Request:  &quot;favorites delete 1.2.3.4.5&lt;LF&gt;&quot;
-		<br>
-		Response: &quot;favorites delete 1.2.3.4.5&lt;LF&gt;&quot;
+		Request:  &quot;favorites delete item_id:1.2.3.4.5&lt;LF&gt;&quot;
+		<br>
+		Response: &quot;favorites delete item_id:1.2.3.4.5&lt;LF&gt;&quot;
 	</p>
 </blockquote>
 

Modified: trunk/server/Slim/Plugin/Favorites/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/Favorites/Plugin.pm?rev=12593&r1=12592&r2=12593&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/Favorites/Plugin.pm (original)
+++ trunk/server/Slim/Plugin/Favorites/Plugin.pm Fri Aug 17 10:37:36 2007
@@ -53,7 +53,7 @@
 	Slim::Control::Request::addDispatch(['favorites', 'items', '_index', '_quantity'], [0, 1, 1, \&cliBrowse]);
 	Slim::Control::Request::addDispatch(['favorites', 'add'], [0, 0, 1, \&cliAdd]);
 	Slim::Control::Request::addDispatch(['favorites', 'addlevel'], [0, 0, 1, \&cliAdd]);
-	Slim::Control::Request::addDispatch(['favorites', 'delete'], [0, 0, 0, \&cliDelete]);
+	Slim::Control::Request::addDispatch(['favorites', 'delete'], [0, 0, 1, \&cliDelete]);
 	Slim::Control::Request::addDispatch(['favorites', 'playlist', '_method' ],[1, 1, 1, \&cliBrowse]);
 	
 	# register notifications
@@ -571,14 +571,16 @@
 	}
 
 	my $client = $request->client();
-	my $index  = $request->getParam('_index');
-
-	if (!defined $index) {
+	my $index  = $request->getParam('item_id');
+
+	my $favs = Slim::Plugin::Favorites::OpmlFavorites->new($client);
+
+	if (!defined $index || !defined $favs->entry($index)) {
 		$request->setStatusBadParams();
 		return;
 	}
 
-	Slim::Plugin::Favorites::OpmlFavorites->new($client)->deleteIndex($index);
+	$favs->deleteIndex($index);
 
 	$request->setStatusDone();
 }