From ad1102978002165ef54daed8f07e9c2e9bcf4000 Mon Sep 17 00:00:00 2001
From: Martijn Voncken <mvoncken@gmail.com>
Date: Fri, 15 Aug 2008 22:00:22 +0000
Subject: [PATCH] get_status -> get_dev_torrents_state

---
 deluge/core/core.py          |  3 +--
 deluge/tests/test_filters.py | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/deluge/core/core.py b/deluge/core/core.py
index 73e60bde3..234bd3cdf 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -507,8 +507,7 @@ class Core(
             status.update(self.plugins.get_status(torrent_id, leftover_fields))
         return status
 
-
-    def export_get_status(self, keys, filter_dict = None):
+    def export_get_dev_torrents_status(self, filter_dict, keys ):
         """
         returns all torrents , optionally filtered by filter_dict.
         """
diff --git a/deluge/tests/test_filters.py b/deluge/tests/test_filters.py
index 718e4fc47..f77ccaad3 100644
--- a/deluge/tests/test_filters.py
+++ b/deluge/tests/test_filters.py
@@ -6,6 +6,7 @@
 from deluge.ui.client import sclient
 sclient.set_core_uri()
 torrent_id = sclient.get_session_state()[0]
+torrent_id2 = sclient.get_session_state()[1]
 print torrent_id
 #/init
 
@@ -16,20 +17,27 @@ print torrent_id
 print sorted(sclient.get_torrent_status(torrent_id,[]).keys())
 print sorted(sclient.get_status_keys())
 
-
 #default, no filter argument.
-print sclient.get_status(["name","state"])
+print sclient.get_dev_torrents_status(None, ["name","state"])
 
 print "HI! , after this the errors start"
+
+#torrent_id filters and list-arguments:
+print sclient.get_dev_torrents_status({"id":torrent_id}, ["name","state"])
+print sclient.get_dev_torrents_status({"id":[torrent_id, torrent_id2]}, ["name","state"])
+
 #filters on default state fields
-print sclient.get_status(["name","state"], {"state":"Paused"})
-print sclient.get_status(["name","state"], {"tracker_host":"aelitis.com"})
+print sclient.get_dev_torrents_status({"state":"Paused"}, ["name","state"])
+print sclient.get_dev_torrents_status({"state":["Paused","Downloading"]}, ["name","state"])
+print sclient.get_dev_torrents_status({"tracker_host":"aelitis.com"}, ["name","state"])
+
 
 #plugin status fields:
-print sclient.get_status(["name","state"], {"label":"test"})
+print sclient.get_dev_torrents_status({"label":"test"}, ["name","state"])
+print sclient.get_dev_torrents_status({"label":["test","tpb"]}, ["name","state"])
 
 #special filters:
-print sclient.get_status(["name","state"], {"keyword":"az"})
+print sclient.get_dev_torrents_status({"keyword":"az"}, ["name","state"])