finished working on extended import

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index 9397daf..c1fc9d0 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,6 +2,7 @@
 Meabook controller class
 """
 
+import shutil
 from meabook.constants import *
 from meabook.caller import PhoneCaller
 from gettext import gettext as _
@@ -31,7 +32,7 @@ class MeabookController:
 
         folders_list = list(self.get_all_folders(parent))
         files_list = [(fields['cn'], internal_name, 'f') for internal_name, \
-            fields in self.model._get_files(['cn'], parent).items()]
+            fields in self.model.get_files(['cn'], parent).items()]
         return folders_list + files_list
 
     def get_item(self, _id):
@@ -64,25 +65,23 @@ class MeabookController:
         return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders()]
 
-    #def get_all_files(self):
-    #    """Gets all peoples."""
+    def get_files_by_pattern_ex(self, key, pattern=''):
+        """Gets all peoples matched pattern."""
 
-    #    # 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]
+        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, 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'], '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]
+        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."""
@@ -103,7 +102,8 @@ class MeabookController:
     def show_configuration_dialog(self):
         """Shows view Configuration Dialog."""
 
-        self.view.create_configuration_dialog(self, self.config)
+        self.view.create_configuration_dialog(self, self.config.get_fields(), \
+            self.config.get_order())
 
     def show_fields_configuration_dialog(self, parent):
         """Shows FieldsConfigurationDialog."""
@@ -112,6 +112,7 @@ class MeabookController:
             self.get_localized_fields(), self.config.get_fields(), parent)
         if selected_fields is not None:
             self.config.set_fields(selected_fields)
+        return selected_fields
 
     def show_fields_order_configuration_dialog(self):
         """Shows FieldsOrderConfigurationDialog."""
@@ -120,6 +121,7 @@ class MeabookController:
             self.get_localized_fields(), self.config.get_order())
         if selected_fields is not None:
             self.config.set_order(selected_fields)
+        return selected_fields
 
     def show_search_dialog(self):
         """Shows view Search Dialog."""
@@ -129,20 +131,34 @@ class MeabookController:
     def show_import_dialog(self):
         """Shows view IMport Dialog."""
 
-        path = self.view.create_import_dialog()
-        if not path:
+        result = self.view.create_import_dialog()
+        if not result:
             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
+        import_type, path = result
+        if import_type == 'ldif':
+            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()
+            except:
+                self.view.create_information_dialog(_('Import error'), \
+                    _('Unsupported file format!'))
+                return False
+        elif import_type == 'db':
+            self.model.close()
+            try:
+                shutil.copy(path, self.model._path)
+            except:
+                self.model.connect()                
+                self.view.create_information_dialog(_('Import error'), \
+                    _('Unable to copy database file!'))
+                return False
+            else:
+                self.model.connect()                
+        
+        self.config.set_fields(self.model.get_fields())
+        self.config.set_order(self.model.get_fields())
+        return True