ppf: show parameter is False by default in select methods.

diff --git a/ppf/db/access.py b/ppf/db/access.py
index 008ccaf..24aa480 100644 (file)
--- a/ppf/db/access.py
+++ b/ppf/db/access.py
@@ -38,7 +38,7 @@ class DatabaseAccess:
     def insert_swarms(self, torrent_file, filesize, purpose, source):
         self.insert_swarms_row([torrent_file, filesize, purpose, source])
 
-    def select_swarms(self, show=True, swarm_id=-1):
+    def select_swarms(self, show=False, swarm_id=-1):
         pass
 
     def delete_swarms(self, swarm_id=-1):
@@ -50,10 +50,10 @@ class DatabaseAccess:
     def insert_btclients(self, client_name, language, dht, streaming):
         self.insert_btclients_row([client_name, language, dht, streaming])
 
-    def select_btclients(self, show=True, id=-1):
+    def select_btclients(self, show=False, id=-1):
         pass
 
-    def select_btclients_by_name(self, client_name, show=True):
+    def select_btclients_by_name(self, client_name, show=False):
         pass
 
     def select_btclients_id_by_name(self, client_name):
@@ -65,10 +65,10 @@ class DatabaseAccess:
     def insert_client_sessions(self, swarm_id, client_id, system_os, system_os_version, system_ram, system_cpu, public_ip, public_port, ds_limit, us_limit, start_time):
         self.insert_client_sessions_row([swarm_id, client_id, system_os, system_os_version, system_ram, system_cpu, public_ip, public_port, ds_limit, us_limit, start_time]);
 
-    def select_client_sessions_by_id(self, show=True, cs_id=-1):
+    def select_client_sessions_by_id(self, show=False, cs_id=-1):
         pass
 
-    def select_client_sessions_by_swarm(self, show=True, swarm_id=-1, client_id=None):
+    def select_client_sessions_by_swarm(self, show=False, swarm_id=-1, client_id=None):
         pass
 
     def delete_client_sessions_by_id(self, cs_id=-1):
@@ -83,7 +83,7 @@ class DatabaseAccess:
     def insert_status_messages(self, cs_id, timestamp, peer_num, dht, download_speed, upload_speed, download_size, upload_size, eta):
         self.insert_status_messages_row([cs_id, timestamp, peer_num, dht, download_speed, upload_speed, download_size, upload_size, eta])
 
-    def select_status_messages(self, show=True, cs_id=-1, restrictArray=None):
+    def select_status_messages(self, show=False, cs_id=-1, restrictArray=None):
         pass
 
     def delete_status_messages(self, cs_id=-1):
@@ -95,7 +95,7 @@ class DatabaseAccess:
     def insert_verbose_messages(self, cs_id, timestamp, direction, peer_ip, peer_port, message_type, _index, begin, length, listen_port):
         self.insert_verbose_messages_row([cs_id, timestamp, direction, peer_ip, peer_port, message_type, _index, begin, length, listen_port])
 
-    def select_verbose_messages(self, show=True, cs_id=-1, restrictArray=None):
+    def select_verbose_messages(self, show=False, cs_id=-1, restrictArray=None):
         pass
 
     def delete_verbose_messages(self, cs_id=-1):
@@ -125,7 +125,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[swarms]An error ocurred: ", e.args[0])
 
-    def select_swarms(self, show=True, swarm_id=-1):
+    def select_swarms(self, show=False, swarm_id=-1):
         try:
             if swarm_id == -1:
                 self.cursor.execute("SELECT * FROM swarms")
@@ -158,7 +158,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[btclients]An error ocurred: ", e.args[0])
 
-    def select_btclients(self, show=True, id=-1):
+    def select_btclients(self, show=False, id=-1):
         try:
             if id == -1:
                 self.cursor.execute("""SELECT * FROM btclients""")
@@ -172,7 +172,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[btclients]An error ocurred: ", e.args[0])
 
-    def select_btclients_by_name(self, client_name, show=True):
+    def select_btclients_by_name(self, client_name, show=False):
         try:
             self.cursor.execute("""SELECT * FROM btclients WHERE name='%s'""" %client_name)
             if show == True:
@@ -198,7 +198,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
-    def select_client_sessions_by_id(self, show=True, cs_id=-1):
+    def select_client_sessions_by_id(self, show=False, cs_id=-1):
         try:
             if cs_id == -1:
                 self.cursor.execute("""SELECT * FROM client_sessions""")
@@ -212,7 +212,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
-    def select_client_sessions_by_swarm(self, show=True, swarm_id=-1, client_id=None):
+    def select_client_sessions_by_swarm(self, show=False, swarm_id=-1, client_id=None):
         try:
             if client_id == None:
                 if swarm_id == -1:
@@ -268,7 +268,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[status_messages]An error ocurred: ", e.args[0])
 
-    def select_status_messages(self, show=True, cs_id=-1, restrictArray=None):
+    def select_status_messages(self, show=False, cs_id=-1, restrictArray=None):
         try:
             if cs_id == -1:
                 self.cursor.execute("SELECT * FROM status_messages")
@@ -312,7 +312,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[verbose_messages]An error ocurred: ", e.args[0])
 
-    def select_verbose_messages(self, show=True, cs_id=-1, restrictArray=None):
+    def select_verbose_messages(self, show=False, cs_id=-1, restrictArray=None):
         try:
             if cs_id == -1:
                 self.cursor.execute("SELECT * FROM verbose_messages")

diff --git a/ppf/db/tests/test_access_sqlite.py b/ppf/db/tests/test_access_sqlite.py
index a3d4f5b..fa46776 100644 (file)
--- a/ppf/db/tests/test_access_sqlite.py
+++ b/ppf/db/tests/test_access_sqlite.py
@@ -343,7 +343,7 @@ class AccessTest(unittest.TestCase):
         """
         Select initial swarm entries. Check against expected_swarms_count.
         """
-        self.dba.select_swarms(False)
+        self.dba.select_swarms()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_swarms_count)
@@ -355,7 +355,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_swarms_row()
 
-        self.dba.select_swarms(False)
+        self.dba.select_swarms()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_swarms_count)
@@ -367,7 +367,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_swarms()
 
-        self.dba.select_swarms(False)
+        self.dba.select_swarms()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_swarms_count)
@@ -382,7 +382,7 @@ class AccessTest(unittest.TestCase):
         # No rows should longer be present in swarms table.
         self.expected_swarms_count = 0
 
-        self.dba.select_swarms(False)
+        self.dba.select_swarms()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_swarms_count)
@@ -392,7 +392,7 @@ class AccessTest(unittest.TestCase):
         Select initial btclient entries.
         Check against expected_btclients_count.
         """
-        self.dba.select_btclients(False)
+        self.dba.select_btclients()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_btclients_count)
@@ -401,7 +401,7 @@ class AccessTest(unittest.TestCase):
         """
         Select btclients by name. Use "Tribler" name resulting in one entry.
         """
-        self.dba.select_btclients_by_name("Tribler", False)
+        self.dba.select_btclients_by_name("Tribler")
         self.expected_btclients_count = 1
         num_rows = self.get_cursor_num_rows()
 
@@ -424,7 +424,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_btclients_row()
 
-        self.dba.select_btclients(False)
+        self.dba.select_btclients()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_btclients_count)
@@ -436,7 +436,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_btclients()
 
-        self.dba.select_btclients(False)
+        self.dba.select_btclients()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_btclients_count)
@@ -446,7 +446,7 @@ class AccessTest(unittest.TestCase):
         Select initial client_sessions entries.
         Check against expected_sessions_count.
         """
-        self.dba.select_client_sessions_by_id(False)
+        self.dba.select_client_sessions_by_id()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_sessions_count)
@@ -456,7 +456,7 @@ class AccessTest(unittest.TestCase):
         Select initial client_sessions entries.
         Check against expected_sessions_count.
         """
-        self.dba.select_client_sessions_by_swarm(False)
+        self.dba.select_client_sessions_by_swarm()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_sessions_count)
@@ -468,7 +468,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_client_sessions_row()
 
-        self.dba.select_client_sessions_by_id(False)
+        self.dba.select_client_sessions_by_id()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_sessions_count)
@@ -480,7 +480,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_client_sessions()
 
-        self.dba.select_client_sessions_by_id(False)
+        self.dba.select_client_sessions_by_id()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_sessions_count)
@@ -495,7 +495,7 @@ class AccessTest(unittest.TestCase):
         # Number of entries decreases by 1.
         self.expected_sessions_count = self.expected_sessions_count - 1
 
-        self.dba.select_client_sessions_by_id(False)
+        self.dba.select_client_sessions_by_id()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_sessions_count)
@@ -510,7 +510,7 @@ class AccessTest(unittest.TestCase):
         # Number of entries decreases by 2.
         self.expected_sessions_count = self.expected_sessions_count - 2
 
-        self.dba.select_client_sessions_by_id(False)
+        self.dba.select_client_sessions_by_id()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_sessions_count)
@@ -520,7 +520,7 @@ class AccessTest(unittest.TestCase):
         Select initial status messsage entries.
         Check against expected_statmsg_count.
         """
-        self.dba.select_status_messages(False)
+        self.dba.select_status_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_statmsg_count)
@@ -532,7 +532,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_status_messages_row()
 
-        self.dba.select_status_messages(False)
+        self.dba.select_status_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_statmsg_count)
@@ -548,7 +548,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_status_messages()
 
-        self.dba.select_status_messages(False)
+        self.dba.select_status_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_statmsg_count)
@@ -562,7 +562,7 @@ class AccessTest(unittest.TestCase):
         self.dba.delete_status_messages()
         self.expected_statmsg_count = 0
 
-        self.dba.select_status_messages(False)
+        self.dba.select_status_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_statmsg_count)
@@ -572,7 +572,7 @@ class AccessTest(unittest.TestCase):
         Select initial verbose messages entries.
         Check against expected_verbmsg_count.
         """
-        self.dba.select_verbose_messages(False)
+        self.dba.select_verbose_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_verbmsg_count)
@@ -584,7 +584,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_verbose_messages_row()
 
-        self.dba.select_verbose_messages(False)
+        self.dba.select_verbose_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_verbmsg_count)
@@ -596,7 +596,7 @@ class AccessTest(unittest.TestCase):
         """
         self.insert_test_verbose_messages()
 
-        self.dba.select_verbose_messages(False)
+        self.dba.select_verbose_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_verbmsg_count)
@@ -610,7 +610,7 @@ class AccessTest(unittest.TestCase):
         self.dba.delete_verbose_messages()
         self.expected_verbmsg_count = 0
 
-        self.dba.select_verbose_messages(False)
+        self.dba.select_verbose_messages()
         num_rows = self.get_cursor_num_rows()
 
         self.assertEqual(num_rows, self.expected_verbmsg_count)