Added whoosh as search engine (issue #94).

1 files changed, 7 insertions, 11 deletions

diff --git a/service/pixelated/adapter/pixelated_mailboxes.py b/service/pixelated/adapter/pixelated_mailboxes.py
index aa39a5c4..c87b7ab3 100644
--- a/service/pixelated/adapter/pixelated_mailboxes.py
+++ b/service/pixelated/adapter/pixelated_mailboxes.py
@@ -14,12 +14,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from pixelated.adapter.pixelated_mailbox import PixelatedMailbox
+from pixelated.adapter.soledad_querier import SoledadQuerier
 
 
 class PixelatedMailBoxes():
 
     def __init__(self, account):
         self.account = account
+        self.querier = SoledadQuerier.get_instance()
 
     def _create_or_get(self, mailbox_name):
         mailbox_name = mailbox_name.upper()
@@ -51,18 +53,12 @@ class PixelatedMailBoxes():
 
         return mails
 
-    def add_draft(self, mail):
-        self.drafts().add(mail)
-        return mail
-
-    def update_draft(self, ident, new_version):
-        new_mail = self.add_draft(new_version)
-        self.drafts().remove(ident)
-        return new_mail
-
     def move_to_trash(self, mail_id):
-        new_mail_id = self.trash().add_existing(mail_id)
-        return new_mail_id
+        mail = self.querier.mail(mail_id)
+        mail.remove_all_tags()
+        mail.set_mailbox(self.trash().mailbox_name)
+        mail.save()
+        return mail
 
     def mail(self, mail_id):
         for mailbox in self.mailboxes: