fixed bug with fields order

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index 9878d23..63bacfa 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,42 +2,60 @@
 Meabook controller class
 """
 
+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):
         """Exit the program."""
 
-        self.config.set_last_active_level(self.view.get_current_level())
+        self.config.save()
         self.model.close()
 
     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'], internal_name, 'file') 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
 
     def get_item(self, _id):
         """Gets person info."""
 
-        return self.model.get_entry_by_id(_id)
+        info = []
+        entry = self.model.get_entry(_id)
+        entry_fields = entry.keys()
+        fields_to_show = self.config.get_fields()
+        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, 'folder') 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, 'folder') for name, internal_name in \
+        return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders()]
 
     def get_all_files(self):
@@ -45,10 +63,41 @@ 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 \
+        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
             internal_name in files_dict]
 
     def get_fields(self):
         """Returns all exists fields from model."""
 
         return self.model.get_fields()
+
+    def show_about_dialog(self):
+        """Shows view About Dialog."""
+
+        self.view.create_about_dialog()
+
+    def show_configuration_dialog(self):
+        """Shows view Configuration Dialog."""
+
+        self.view.create_configuration_dialog(self, self.config)
+
+    def show_import_dialog(self):
+        """Shows view IMport Dialog."""
+
+        path = self.view.create_import_dialog()
+        if not path:
+            return False
+
+        from meabook.parsers.ldif_parser import MeabookLDIFParser
+        parser = MeabookLDIFParser(open(path), self.model)
+        try:
+            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!'))
+        else:
+            return True