fixed conflicts

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index a928930..1505a67 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,16 +2,17 @@
 Meabook controller class
 """
 
+from meabook.constants import *
 import gettext
 
 _ = gettext.gettext
 
 
 class MeabookController:
-    def __init__(self, model, view_class, config):
+    def __init__(self, model, view_class, renderer_class, config):
         self.config = config
         self.model = model
-        self.view = view_class(self)
+        self.view = view_class(self, renderer_class(), self.config)
         self.view.start()
 
     def stop(self):
@@ -24,7 +25,7 @@ class MeabookController:
         """Gets from model items with selected level."""
 
         folders_list = list(self.get_all_folders(parent))
-        files_list = [(fields['cn'], internal_name, 'fi') for internal_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
 
@@ -34,23 +35,28 @@ class MeabookController:
         info = []
         entry = self.model.get_entry(_id)
         entry_fields = entry.keys()
-        ordered_fields = []
         fields_to_show = self.config.get_fields()
-        for field in dict().fromkeys(self.config.get_order()).keys():
+        ordered_fields = []
+        for field in self.config.get_order():
+            if field not in ordered_fields:
+                ordered_fields.append(field)
+        for field in ordered_fields:
             if (field in fields_to_show) and (field in entry_fields):
                 info.append((field, entry[field]))
+        if not 'image' in fields_to_show and 'image' in entry.keys():
+            info.append(('image', entry['image']))
         return info
 
     def get_all_folders(self, parent=0):
         """Gets all filials."""
 
-        return [(name, internal_name, 'fo') for name, internal_name in \
+        return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders(parent)]
 
     def get_all_subfolders(self):
         """Gets all departments."""
 
-        return [(name, internal_name, 'fo') for name, internal_name in \
+        return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders()]
 
     def get_all_files(self):
@@ -58,8 +64,20 @@ class MeabookController:
 
         # FIXME: read field names from Config
         files_dict = self.model.get_files(['cn'])
-        return [(files_dict[internal_name]['cn'], internal_name, 'file') for \
-            internal_name in files_dict]
+        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):
+        """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]
 
     def get_fields(self):
         """Returns all exists fields from model."""
@@ -76,6 +94,11 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_search_dialog(self):
+        """Shows view Search Dialog."""
+
+        self.view.create_search_dialog(self)
+
     def show_import_dialog(self):
         """Shows view IMport Dialog."""
 
@@ -86,9 +109,11 @@ class MeabookController:
         from meabook.parsers.ldif_parser import MeabookLDIFParser
         parser = MeabookLDIFParser(open(path), self.model)
         try:
-            self.view.create_progress_dialog(_('Importing...'))
+            self.view.create_progress_dialog(_('Importing'))
             #FIXME: implement update_fraction
             parser.parse()
+            self.config.set_fields(self.model.get_fields())
+            self.config.set_order(self.model.get_fields())
         except:
             self.view.create_information_dialog(_('Import error'), \
                 _('Unsupported file format!'))