use constants

diff --git a/controller.py b/controller.py
index b59af1b..f696a7c 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,9 +2,8 @@
 Meabook controller class
 """
 
-import gettext
-
-_ = gettext.gettext
+from meabook.constants import *
+from gettext import gettext as _
 
 
 class MeabookController:
@@ -24,7 +23,7 @@ class MeabookController:
         """Gets from model items with selected level."""
 
         folders_list = list(self.get_all_folders(parent))
-        files_list = [(fields['cn'], internal_name, 'f') for internal_name, \
+        files_list = [(fields['cn'], int_name, TYPE_FILE) for int_name, \
             fields in self.model.get_files(['cn'], parent).items()]
         return folders_list + files_list
 
@@ -49,27 +48,26 @@ class MeabookController:
     def get_all_folders(self, parent=0):
         """Gets all filials."""
 
-        return [(name, internal_name, 'd') for name, internal_name in \
-            self.model.get_folders(parent)]
+        return [(name, internal_name, TYPE_DIRECTORY) for name, internal_name \
+            in self.model.get_folders(parent)]
 
     def get_all_subfolders(self):
         """Gets all departments."""
 
-        return [(name, internal_name, 'd') for name, internal_name in \
-            self.model.get_folders()]
+        return self.get_all_folders(parent=None)
 
     def get_all_files(self):
         """Gets all peoples."""
 
         # FIXME: read field names from Config
-        files_dict = self.model.get_files(['cn'], pattern=pattern)
-        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
-            internal_name in files_dict]
+        files_dict = self.model.get_files(['cn'])
+        return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
+            for internal_name in files_dict]
 
     def get_all_files_by_pattern(self, pattern):
         """Gets all peoples matched pattern."""
 
-        return [(name, internal_name, 'f') for internal_name, name in \
+        return [(name, internal_name, TYPE_FILE) for internal_name, name in \
             self.model.get_files_by_pattern(pattern)]
 
     def get_fields(self):

diff --git a/database/SQLite.py b/database/SQLite.py
index a38a706..e8d371b 100644 (file)
--- a/database/SQLite.py
+++ b/database/SQLite.py
@@ -4,13 +4,10 @@
 
 import os
 import sqlite3
+from meabook.constants import *
 
 DATABASE_NAME = 'contacts.db'
 
-TOPLEVEL_FIELD = 'o'
-MIDDLELEVEL_FIELD = 'ou'
-LOWLEVEL_FIELD = 'cn'
-
 SCHEMA = """
     begin;
 
@@ -118,19 +115,19 @@ class SQLite:
                     (_id, field_id, value))
 
         # update STRUCT table
-        name = entry[TOPLEVEL_FIELD][0]
+        name = entry[FIELD_TOPLEVEL][0]
         parent_id = execute("SELECT id FROM struct WHERE name=? ", \
             (name,)).fetchone()
-        if parent_id is None: # update STRUCT table (TOPLEVEL_FIELD)
+        if parent_id is None: # update STRUCT table (FIELD_TOPLEVEL)
             execute("INSERT INTO struct values(NULL,?,0)", (name,))
             parent_id = execute("SELECT last_insert_rowid()").fetchone()[0]
         else:
             parent_id = parent_id[0]
 
-        name = entry[MIDDLELEVEL_FIELD][0]
+        name = entry[FIELD_MIDDLELEVEL][0]
         child_id = execute("SELECT id FROM struct WHERE name=? AND parent=?", \
             (name, parent_id)).fetchone()
-        if child_id is None: # update STRUCT table (MIDDLELEVEL_FIELD)
+        if child_id is None: # update STRUCT table (FIELD_MIDDLELEVEL)
             execute("INSERT INTO struct values(NULL,?,?)", (name, parent_id))
             child_id = execute("SELECT last_insert_rowid()").fetchone()[0]
         else:

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index 52f88c5..171f60b 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -6,13 +6,10 @@ import gtk
 import hildon
 import gobject
 from gettext import gettext as _
+from meabook.constants import *
 from meabook.ui.ui import MeabookUI
 
 
-TYPE_FOLDER = 'd'
-TYPE_FILE = 'f'
-
-
 def create_button(title, value):
     """Creates HildonButton."""
 
@@ -285,7 +282,7 @@ class HildonMeabook(MeabookUI):
 
         item_name, internal_name, item_type = \
             widget.get_model(0)[widget.get_active(0)]
-        if item_type == TYPE_FOLDER:
+        if item_type == TYPE_DIRECTORY:
             self._show_items_dialog(item_name, self.controller.get_items( \
                 internal_name))
         else: