1 files changed, 29 insertions, 19 deletions

diff --git a/distixlib/plugins/import_mail_plugin.py b/distixlib/plugins/import_mail_plugin.py
index 58f9627..6e3fb84 100644
--- a/distixlib/plugins/import_mail_plugin.py
+++ b/distixlib/plugins/import_mail_plugin.py
@@ -61,10 +61,10 @@ class ImportMailPlugin(cliapp.Plugin):
         repo = distixlib.Repository(repo_dirname)
         repo.require_clean_working_tree()
         ticket_store = repo.open_ticket_store(distixlib.tickets_dir_name)
-        all_tickets = ticket_store.get_tickets()
+        all_ticket_ids = ticket_store.get_ticket_ids()
         cache = _MessageIdCache()
         filenames = self._import_msg_to_ticket_store(
-            repo, ticket_store, all_tickets, msg, cache, key, value)
+            repo, ticket_store, all_ticket_ids, msg, cache, key, value)
         if filenames:
             repo.commit_changes(filenames, self.commit_msg)
 
@@ -88,27 +88,29 @@ class ImportMailPlugin(cliapp.Plugin):
             return email.message_from_file(f)
 
     def _import_msg_to_ticket_store(
-            self, repo, ticket_store, all_tickets, msg, cache, key, value):
+            self, repo, ticket_store, all_ticket_ids, msg, cache, key, value):
 
         referenced_tickets = self._find_tickets_with_mails_referenced_by_msg(
-            all_tickets, msg, cache)
+            ticket_store, all_ticket_ids, msg, cache)
         msg_ids = self._get_message_ids(msg)
         filenames = []
 
         if referenced_tickets:
             for ticket in referenced_tickets:
-                if not self._contains_message(ticket_store, ticket, msg):
+                if not self._contains_message(
+                        ticket_store, ticket.get_ticket_id(), msg):
                     ticket.add_message(msg)
                     self._set_key_value(ticket, key, value)
                     cache.add_msg_ids_for_ticket_id(
                         ticket.get_ticket_id(), msg_ids)
         else:
-            if not self._is_already_imported(ticket_store, msg, all_tickets):
+            if not self._is_already_imported(
+                    ticket_store, msg, all_ticket_ids):
                 new_ticket = self._create_ticket_from_msg(repo, msg)
                 self._set_key_value(new_ticket, key, value)
                 cache.add_msg_ids_for_ticket_id(
                     new_ticket.get_ticket_id(), msg_ids)
-                all_tickets.append(new_ticket)
+                all_ticket_ids.append(new_ticket.get_ticket_id())
                 filenames = ticket_store.add_ticket(new_ticket)
 
         filenames += ticket_store.save_changes()
@@ -122,24 +124,32 @@ class ImportMailPlugin(cliapp.Plugin):
             metadata.add(key, value)
             ticket.set_ticket_metadata(metadata)
 
-    def _contains_message(self, store, ticket, msg):
-        return store.ticket_has_message_with_text(ticket, msg.as_string())
+    def _contains_message(self, store, ticket_id, msg):
+        return store.ticket_has_message_with_text(
+            ticket_id, msg.as_string())
 
-    def _is_already_imported(self, store, msg, all_tickets):
-        for ticket in all_tickets:
-            if self._contains_message(store, ticket, msg):
+    def _is_already_imported(self, store, msg, all_ticket_ids):
+        for ticket_id in all_ticket_ids:
+            if self._contains_message(store, ticket_id, msg):
                 return True
         return False
 
     def _find_tickets_with_mails_referenced_by_msg(
-            self, all_tickets, msg, cache):
+            self, store, all_ticket_ids, msg, cache):
 
         tickets = []
         msg_ids = self._get_message_ids(msg)
-        for ticket in all_tickets:
-            ticket_msg_ids = self._get_message_ids_for_ticket(ticket, cache)
-            if msg_ids.intersection(ticket_msg_ids):
-                tickets.append(ticket)
+
+        for ticket_id in all_ticket_ids:
+            filenames = store.get_message_filenames(ticket_id)
+            for filename in filenames:
+                with open(filename) as f:
+                    other_msg = email.message_from_file(f)
+                other_ids = self._get_message_ids(other_msg)
+                if other_ids.intersection(msg_ids):
+                    ticket = store.get_ticket(ticket_id)
+                    tickets.append(ticket)
+
         return tickets
 
     def _get_message_ids(self, msg):
@@ -212,7 +222,7 @@ class ImportMailPlugin(cliapp.Plugin):
         repo = distixlib.Repository(repo_dirname)
         repo.require_clean_working_tree()
         ticket_store = repo.open_ticket_store(distixlib.tickets_dir_name)
-        all_tickets = ticket_store.get_tickets()
+        all_ticket_ids = ticket_store.get_ticket_ids()
         cache = _MessageIdCache()
         filenames = []
         if self.app.settings['quiet']:
@@ -223,7 +233,7 @@ class ImportMailPlugin(cliapp.Plugin):
             for msg in folder:
                 progress.next_msg()
                 filenames += self._import_msg_to_ticket_store(
-                    repo, ticket_store, all_tickets, msg, cache, key, value)
+                    repo, ticket_store, all_ticket_ids, msg, cache, key, value)
         filenames += ticket_store.save_changes()
         if filenames:
             repo.commit_changes(filenames, self.commit_msg)