ppf: Do coding style "arrangements" in access.py.

diff --git a/ppf/db/access.py b/ppf/db/access.py
index ef0dee9..544a5e2 100644 (file)
--- a/ppf/db/access.py
+++ b/ppf/db/access.py
@@ -16,7 +16,15 @@ class DatabaseAccess:
                         arguments
     """
 
-    operators = {'eq':'=', 'neq':'<>', 'gt':'>', 'gte':'>=', 'lt':'<', 'lte':'<=', 'lk':'LIKE'}
+    operators = {
+            'eq'  : '=',
+            'neq' : '<>',
+            'gt'  : '>',
+            'gte' : '>=',
+            'lt'  : '<',
+            'lte' : '<=',
+            'lk'  : 'LIKE'
+            }
 
     def __init__(self):
         pass
@@ -41,10 +49,10 @@ 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=False, swarm_id=-1):
+    def select_swarms(self, show=False, swarm_id=None):
         pass
 
-    def delete_swarms(self, swarm_id=-1):
+    def delete_swarms(self, swarm_id=None):
         pass
 
     def insert_btclients_row(self, row):
@@ -53,7 +61,7 @@ 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=False, id=-1):
+    def select_btclients(self, show=False, id=None):
         pass
 
     def select_btclients_by_name(self, client_name, show=False):
@@ -65,43 +73,56 @@ class DatabaseAccess:
     def insert_client_sessions_row(self, row):
         pass
 
-    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 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=False, cs_id=-1):
+    def select_client_sessions_by_id(self, show=False, cs_id=None):
         pass
 
-    def select_client_sessions_by_swarm(self, show=False, swarm_id=-1, client_id=None):
+    def select_client_sessions_by_swarm(self, show=False, swarm_id=None,
+            client_id=None):
         pass
 
-    def delete_client_sessions_by_id(self, cs_id=-1):
+    def delete_client_sessions_by_id(self, cs_id=None):
         pass
 
-    def delete_client_sessions_by_swarm(self, swarm_id=-1, client_id=None):
+    def delete_client_sessions_by_swarm(self, swarm_id=None, client_id=None):
         pass
 
     def insert_status_messages_row(self, row):
         pass
 
-    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 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=False, cs_id=-1, restrictArray=None):
+    def select_status_messages(self, show=False, cs_id=None,
+            restrictArray=None):
         pass
 
-    def delete_status_messages(self, cs_id=-1):
+    def delete_status_messages(self, cs_id=None):
         pass
 
     def insert_verbose_messages_row(self, row):
         pass
 
-    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 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=False, cs_id=-1, restrictArray=None):
+    def select_verbose_messages(self, show=False, cs_id=None,
+            restrictArray=None):
         pass
 
-    def delete_verbose_messages(self, cs_id=-1):
+    def delete_verbose_messages(self, cs_id=None):
         pass
 
 
@@ -123,17 +144,24 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def insert_swarms_row(self, row):
         try:
-            self.cursor.execute("INSERT INTO swarms(torrent, filesize, purpose, source) VALUES(?,?,?,?)", row)
+            self.cursor.execute("""
+                    INSERT INTO swarms(torrent, filesize, purpose, source)
+                    VALUES(?,?,?,?)
+                    """, row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[swarms]An error ocurred: ", e.args[0])
 
-    def select_swarms(self, show=False, swarm_id=-1):
+    def select_swarms(self, show=False, swarm_id=None):
         try:
-            if swarm_id == -1:
-                self.cursor.execute("SELECT * FROM swarms")
+            if swarm_id == None:
+                self.cursor.execute("""
+                        SELECT * FROM swarms
+                        """)
             else:
-                self.cursor.execute("SELECT * FROM swarms WHERE id='%s'" %swarm_id)
+                self.cursor.execute("""
+                        SELECT * FROM swarms WHERE id='%s'
+                        """ %swarm_id)
 
             if show == True:
                 for row in self.cursor:
@@ -144,29 +172,40 @@ class SQLiteDatabaseAccess(DatabaseAccess):
             print("[swarms]An error ocurred: ", e.args[0])
             return None
 
-    def delete_swarms(self, swarm_id=-1):
+    def delete_swarms(self, swarm_id=None):
         try:
-            if swarm_id == -1:
-                self.cursor.execute("DELETE FROM swarms")
+            if swarm_id == None:
+                self.cursor.execute("""
+                        DELETE FROM swarms
+                        """)
             else:
-                self.cursor.execute("DELETE FROM swarms WHERE id=?", (swarm_id,))
+                self.cursor.execute("""
+                        DELETE FROM swarms WHERE id=?
+                        """, (swarm_id,))
             self.conn.commit()
         except sqlite3.Error, e:
             print("[swarms]An error ocurred: ", e.args[0])
 
     def insert_btclients_row(self, row):
         try:
-            self.cursor.execute("INSERT INTO btclients(name, language, dht, streaming) VALUES(?,?,?,?)", row)
+            self.cursor.execute("""
+                    INSERT INTO btclients(name, language, dht, streaming)
+                    VALUES(?,?,?,?)
+                    """, row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[btclients]An error ocurred: ", e.args[0])
 
-    def select_btclients(self, show=False, id=-1):
+    def select_btclients(self, show=False, id=None):
         try:
-            if id == -1:
-                self.cursor.execute("""SELECT * FROM btclients""")
+            if id == None:
+                self.cursor.execute("""
+                        SELECT * FROM btclients
+                        """)
             else:
-                self.cursor.execute("""SELECT * FROM btclients WHERE id='%s'""" %id)
+                self.cursor.execute("""
+                        SELECT * FROM btclients WHERE id='%s'
+                        """ %id)
             if show == True:
                 for row in self.cursor:
                     print row
@@ -177,7 +216,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def select_btclients_by_name(self, client_name, show=False):
         try:
-            self.cursor.execute("""SELECT * FROM btclients WHERE name='%s'""" %client_name)
+            self.cursor.execute("""
+                    SELECT * FROM btclients WHERE name='%s'
+                    """ %client_name)
             if show == True:
                 for row in self.cursor:
                     print row
@@ -188,7 +229,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def select_btclients_id_by_name(self, client_name):
         try:
-            self.cursor.execute("""SELECT * FROM btclients WHERE name='%s'""" %client_name)
+            self.cursor.execute("""
+                    SELECT * FROM btclients WHERE name='%s'
+                    """ %client_name)
             for row in self.cursor:
                 return row[0]
         except sqlite3.Error, e:
@@ -196,17 +239,27 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def insert_client_sessions_row(self, row):
         try:
-            self.cursor.execute("INSERT INTO client_sessions(swarm_id, client_id, system_os, system_os_version, system_ram, system_cpu, public_ip, public_port, ds_limit, us_limit, start_time) VALUES(?,?,?,?,?,?,?,?,?,?,?)", row)
+            self.cursor.execute("""
+                    INSERT INTO client_sessions(swarm_id, client_id,
+                        system_os, system_os_version, system_ram,
+                        system_cpu,public_ip, public_port, ds_limit,
+                        us_limit, start_time)
+                        VALUES(?,?,?,?,?,?,?,?,?,?,?)
+                        """, row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
-    def select_client_sessions_by_id(self, show=False, cs_id=-1):
+    def select_client_sessions_by_id(self, show=False, cs_id=None):
         try:
-            if cs_id == -1:
-                self.cursor.execute("""SELECT * FROM client_sessions""")
+            if cs_id == None:
+                self.cursor.execute("""
+                        SELECT * FROM client_sessions
+                        """)
             else:
-                self.cursor.execute("""SELECT * FROM client_sessions WHERE id='%s'""" %cs_id)
+                self.cursor.execute("""
+                        SELECT * FROM client_sessions WHERE id='%s'
+                        """ %cs_id)
             if show == True:
                 for row in self.cursor:
                     print row
@@ -215,18 +268,28 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
-    def select_client_sessions_by_swarm(self, show=False, swarm_id=-1, client_id=None):
+    def select_client_sessions_by_swarm(self, show=False, swarm_id=None,
+            client_id=None):
         try:
             if client_id == None:
-                if swarm_id == -1:
-                    self.cursor.execute("""SELECT * FROM client_sessions""")
+                if swarm_id == None:
+                    self.cursor.execute("""
+                            SELECT * FROM client_sessions
+                            """)
                 else:
-                    self.cursor.execute("""SELECT * FROM client_sessions WHERE swarm_id=?""", (swarm_id, ))
+                    self.cursor.execute("""
+                            SELECT * FROM client_sessions WHERE swarm_id='%s'
+                            """ %swarm_id)
             else:
-                if swarm_id == -1:
-                    self.cursor.execute("""SELECT * FROM client_sessions WHERE client_id=?""", (client_id, ))
+                if swarm_id == None:
+                    self.cursor.execute("""
+                            SELECT * FROM client_sessions WHERE client_id='%s'
+                            """ %client_id)
                 else:
-                    self.cursor.execute("""SELECT * FROM client_sessions WHERE swarm_id=? and client_id=?""", (swarm_id, client_id))
+                    self.cursor.execute("""
+                            SELECT * FROM client_sessions
+                                WHERE swarm_id=? and client_id=?
+                                """, (swarm_id, client_id))
 
             if show == True:
                 for row in self.cursor:
@@ -236,28 +299,41 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
-    def delete_client_sessions_by_id(self, cs_id=-1):
+    def delete_client_sessions_by_id(self, cs_id=None):
         try:
-            if cs_id == -1:
-                self.cursor.execute("""DELETE FROM client_sessions""")
+            if cs_id == None:
+                self.cursor.execute("""
+                        DELETE FROM client_sessions
+                        """)
             else:
-                self.cursor.execute("""DELETE FROM client_sessions WHERE id=?""", (cs_id, ))
+                self.cursor.execute("""
+                    DELETE FROM client_sessions WHERE id='%s'
+                    """ %cs_id)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
-    def delete_client_sessions_by_swarm(self, swarm_id=-1, client_id=None):
+    def delete_client_sessions_by_swarm(self, swarm_id=None, client_id=None):
         try:
             if client_id == None:
-                if swarm_id == -1:
-                    self.cursor.execute("""DELETE FROM client_sessions""")
+                if swarm_id == None:
+                    self.cursor.execute("""
+                            DELETE FROM client_sessions
+                            """)
                 else:
-                    self.cursor.execute("""DELETE FROM client_sessions WHERE swarm_id=?""", (swarm_id, ))
+                    self.cursor.execute("""
+                            DELETE FROM client_sessions WHERE swarm_id='%s'
+                            """ %swarm_id)
             else:
-                if swarm_id == -1:
-                    self.cursor.execute("""DELETE FROM client_sessions WHERE client_id=?""", (client_id, ))
+                if swarm_id == None:
+                    self.cursor.execute("""
+                            DELETE FROM client_sessions WHERE client_id='%s'
+                            """ %client_id)
                 else:
-                    self.cursor.execute("""DELETE FROM client_sessions WHERE swarm_id=? and client_id=?""", (swarm_id, client_id))
+                    self.cursor.execute("""
+                            DELETE FROM client_sessions
+                            WHERE swarm_id=? and client_id=?
+                            """, (swarm_id, client_id))
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
@@ -266,15 +342,20 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         if DEBUG == True:
             print "[status_messages] INSERT row", row
         try:
-            self.cursor.execute("INSERT INTO status_messages VALUES(?,?,?,?,?,?,?,?,?)", row)
+            self.cursor.execute("""
+                    INSERT INTO status_messages VALUES(?,?,?,?,?,?,?,?,?)
+                    """, row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[status_messages]An error ocurred: ", e.args[0])
 
-    def select_status_messages(self, show=False, cs_id=-1, restrictArray=None):
+    def select_status_messages(self, show=False, cs_id=None,
+            restrictArray=None):
         try:
-            if cs_id == -1:
-                self.cursor.execute("SELECT * FROM status_messages")
+            if cs_id == None:
+                self.cursor.execute("""
+                        SELECT * FROM status_messages
+                        """)
             else:
                 values = (cs_id, )
                 query = "SELECT * FROM status_messages WHERE cs_id=? and "
@@ -296,12 +377,16 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])
 
-    def delete_status_messages(self, cs_id=-1):
+    def delete_status_messages(self, cs_id=None):
         try:
-            if cs_id == -1:
-                self.cursor.execute("DELETE FROM status_messages")
+            if cs_id == None:
+                self.cursor.execute("""
+                        DELETE FROM status_messages
+                        """)
             else:
-                self.cursor.execute("DELETE FROM status_messages WHERE cs_id=?", (cs_id, ))
+                self.cursor.execute("""
+                        DELETE FROM status_messages WHERE cs_id='%s'
+                        """ %cs_id)
             self.conn.commit()
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])
@@ -310,15 +395,20 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         if DEBUG == True:
             print "[verbose_messages] insert row", row
         try:
-            self.cursor.execute("INSERT INTO verbose_messages VALUES(?,?,?,?,?,?,?,?,?,?)", row)
+            self.cursor.execute("""
+                    INSERT INTO verbose_messages VALUES(?,?,?,?,?,?,?,?,?,?)
+                    """, row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[verbose_messages]An error ocurred: ", e.args[0])
 
-    def select_verbose_messages(self, show=False, cs_id=-1, restrictArray=None):
+    def select_verbose_messages(self, show=False, cs_id=None,
+            restrictArray=None):
         try:
-            if cs_id == -1:
-                self.cursor.execute("SELECT * FROM verbose_messages")
+            if cs_id == None:
+                self.cursor.execute("""
+                        SELECT * FROM verbose_messages
+                        """)
             else:
                 values = (cs_id, )
                 query = "SELECT * FROM verbose_messages WHERE cs_id=? and "
@@ -338,12 +428,16 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])
 
-    def delete_verbose_messages(self, cs_id=-1):
+    def delete_verbose_messages(self, cs_id=None):
         try:
-            if cs_id == -1:
-                self.cursor.execute("DELETE FROM verbose_messages")
+            if cs_id == None:
+                self.cursor.execute("""
+                        DELETE FROM verbose_messages
+                        """)
             else:
-                self.cursor.execute("DELETE FROM verbose_messages WHERE cs_id=?", (cs_id, ))
+                self.cursor.execute("""
+                        DELETE FROM verbose_messages WHERE cs_id='%s'
+                        """ %cs_id)
             self.conn.commit()
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])