improved database search functions

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index baab788..907124e 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -3,12 +3,14 @@ Meabook controller class
 """
 
 from meabook.constants import *
+from meabook.caller import PhoneCaller
 from gettext import gettext as _
 
 
 class MeabookController:
     def __init__(self, model, view_class, renderer_class, config):
         self.config = config
+        self.caller = PhoneCaller()
         self.model = model
         self.view = view_class(self, renderer_class(), self.config)
         self.view.start()
@@ -19,11 +21,16 @@ class MeabookController:
         self.config.save()
         self.model.close()
 
+    def call(self, number):
+        """Make a phone call."""
+
+        self.caller.call(number)
+
     def get_items(self, parent=0):
         """Gets from model items with selected level."""
 
         folders_list = list(self.get_all_folders(parent))
-        files_list = [(fields['cn'], int_name, TYPE_FILE) for int_name, \
+        files_list = [(fields['cn'], internal_name, 'f') for internal_name, \
             fields in self.model.get_files(['cn'], parent).items()]
         return folders_list + files_list
 
@@ -48,39 +55,35 @@ class MeabookController:
     def get_all_folders(self, parent=0):
         """Gets all filials."""
 
-        return [(name, internal_name, TYPE_DIRECTORY) for name, internal_name \
-            in self.model.get_folders(parent)]
+        return [(name, internal_name, 'd') for name, internal_name in \
+            self.model.get_folders(parent)]
 
     def get_all_subfolders(self):
         """Gets all departments."""
 
-        return self.get_all_folders(parent=None)
-
-    def get_all_files(self):
-        """Gets all peoples."""
+        return [(name, internal_name, 'd') for name, internal_name in \
+            self.model.get_folders()]
 
-        # FIXME: read field names from Config
-        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, separated=False):
+    def get_files_by_pattern(self, pattern=''):
         """Gets all peoples matched pattern."""
 
-        if not separated:
-            return [(name, internal_name, TYPE_FILE) for internal_name, name \
-                in self.model.get_files_by_pattern(pattern)]
-        else:
-            files_dict = self.model.get_files(['cn', 'o', 'ou'], pattern=pattern)
-            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]
+        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]
 
     def get_fields(self):
         """Returns all exists fields from model."""
 
         return self.model.get_fields()
 
+    def get_localized_fields(self):
+        """Returns dict with original and localized filed names."""
+
+        return dict([(_(field).decode('utf-8'), field) for field in \
+            self.model.get_fields()])
+
     def show_about_dialog(self):
         """Shows view About Dialog."""
 
@@ -91,6 +94,27 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_fields_configuration_dialog(self, parent):
+        """Shows FieldsConfigurationDialog."""
+
+        selected_fields = self.view.create_fields_configuration_dialog( \
+            self.get_localized_fields(), self.config.get_fields(), parent)
+        if selected_fields is not None:
+            self.config.set_fields(selected_fields)
+
+    def show_fields_order_configuration_dialog(self):
+        """Shows FieldsOrderConfigurationDialog."""
+
+        selected_fields = self.view.create_fields_order_configuration_dialog( \
+            self.get_localized_fields(), self.config.get_order())
+        if selected_fields is not None:
+            self.config.set_order(selected_fields)
+
+    def show_search_dialog(self):
+        """Shows view Search Dialog."""
+
+        self.view.create_search_dialog(self)
+
     def show_import_dialog(self):
         """Shows view IMport Dialog."""