pylinting

diff --git a/controller.py b/controller.py
index c41ef48..6f897c1 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -67,16 +67,17 @@ class MeabookController:
     def get_files_by_pattern_ex(self, key, pattern=''):
         """Gets all peoples matched pattern."""
 
-        files_dict = self.model.get_files_by_pattern(['cn', 'o', 'ou'], key, pattern, False)
+        files_dict = self.model.get_files_by_pattern(['cn', 'o', 'ou'], \
+            key, pattern, False)
         return [("%s" % files_dict[internal_name]['cn'], "%s / %s" % (
             files_dict[internal_name]['o'], files_dict[internal_name]['ou']), \
             internal_name, TYPE_FILE) for internal_name in files_dict]
 
-
     def get_files_by_pattern(self, pattern=''):
         """Gets all peoples matched pattern."""
 
-        files_dict = self.model.get_files_by_pattern(['cn', 'o', 'ou'], 'cn', pattern, True)
+        files_dict = self.model.get_files_by_pattern(['cn', 'o', 'ou'], \
+            'cn', pattern, True)
         return [("%s" % files_dict[internal_name]['cn'], "%s / %s" % (
             files_dict[internal_name]['o'], files_dict[internal_name]['ou']), \
             internal_name, TYPE_FILE) for internal_name in files_dict]

diff --git a/database/SQLite.py b/database/SQLite.py
index 62c4bc0..66b25a1 100644 (file)
--- a/database/SQLite.py
+++ b/database/SQLite.py
@@ -136,7 +136,6 @@ class SQLite:
         # update RELATION table
         execute("INSERT INTO relation values(?,?)", (_id, child_id))
 
-    
     def get_folders(self, parent=None):
         """
         Returns list of all folders (items with folders and files)
@@ -149,32 +148,32 @@ class SQLite:
         else:
             return self.conn.execute("SELECT DISTINCT name, id FROM struct \
                 WHERE parent=? ORDER BY name ASC", (parent,)).fetchall()
-    
+
     def get_files(self, fields, parent=0):
-        
+        """Finds all files with selected parent"""
+
         items_dict = {}
         execute = self.conn.execute
         fields = dict(execute("SELECT id, name FROM fields WHERE name IN (%s)" \
             % ','.join('%r' % (field,) for field in fields)).fetchall())
-        """ 
+        """
         query = "SELECT id, field_id, value FROM data \
             left join relation on relation.data_id=data.id \
             where relation.struct_id=? and field_id in (%s)"
-        """ 
-        query = "select id, field_id, value from data \
-            where id in (select data_id from relation where struct_id=?) \
-            and field_id in (%s)"
-        
-        data = execute(query % ','.join('%r' % f for f in fields.keys()), (parent,)).fetchall()
-                
-        for id, field_id, value in data:
-            if not items_dict.has_key(id):
-                items_dict[id] = {}
-            items_dict[id][fields[int(field_id)]] = value
+        """
+        query = "SELECT id, field_id, value FROM data \
+            WHERE id IN (SELECT data_id FROM relation WHERE struct_id=?) \
+            AND field_id IN (%s)"
+        data = execute(query % ','.join('%r' % f for f in fields.keys()), \
+            (parent,)).fetchall()
+        for data_id, field_id, value in data:
+            if not items_dict.has_key(data_id):
+                items_dict[data_id] = {}
+            items_dict[data_id][fields[int(field_id)]] = value
         return items_dict
 
-
-    def get_files_by_pattern(self, fields, key='cn', pattern='', search_from_start=False):
+    def get_files_by_pattern(self, fields, key='cn', pattern='', \
+        search_from_start=False):
         """Returns list of all files from DATA table."""
 
         items_dict = {}
@@ -192,33 +191,33 @@ class SQLite:
             s = '%s%%' % pattern.capitalize()
         else:
             s = '%%%s%%' % pattern
-
-        data = execute("SELECT id, field_id, value FROM data WHERE id in \
-            (select id from data where value LIKE '%s' and field_id=? LIMIT 50) \
-            and field_id in (%s)" % (s, ','.join('%r' % f for f in fields.keys())), (key_id,)).fetchall()
-        
-        for id, field_id, value in data:
-            if not items_dict.has_key(id):
-                items_dict[id] = {}
-            items_dict[id][fields[int(field_id)]] = value
+        data = execute("SELECT id, field_id, value FROM data WHERE id IN \
+            (SELECT id FROM data WHERE value LIKE '%s' AND field_id=? LIMIT \
+            50) AND field_id in (%s)" % (s, ','.join('%r' % f for f in \
+            fields.keys())), (key_id,)).fetchall()
+        for data_id, field_id, value in data:
+            if not items_dict.has_key(data_id):
+                items_dict[data_id] = {}
+            items_dict[data_id][fields[int(field_id)]] = value
         return items_dict
 
-
     def get_entry(self, _id):
         """Returns full entry by it id."""
 
         execute = self.conn.execute
         entry_dict = {}
-        entry_dict = dict(execute("select fields.name, value from data \
-            left join fields on fields.id=data.field_id \
-            where data.id=?", (_id,)).fetchall())
-        sql_res = execute('select photo from photo where data_id=?', \
+        entry_dict = dict(execute("SELECT fields.name, value FROM data \
+            LEFT JOIN fields ON fields.id=data.field_id \
+            WHERE data.id=?", (_id,)).fetchall())
+        sql_res = execute('SELECT photo FROM photo WHERE data_id=?', \
             (_id,)).fetchone()
         if sql_res is not None:
             entry_dict['image'] = sql_res[0]
         return entry_dict
 
+
+
 if __name__ == "__main__":
     db = SQLite('/tmp')
-    #print db.get_files(('cn', 'o', 'ou'), 0)
-    print db._get_files_by_pattern(('cn', 'o', 'ou'), 'cn', 'Ра', True)
+    # put test code here
+    db.close()