diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2014-08-14 14:36:00 -0300 |
|---|---|---|
| committer | Alexandre Pretto Nunes <anunes@thoughtworks.com> | 2014-08-14 15:19:46 -0300 |
| commit | 5b1ad127f11519f519f75be9148d17d4e034b1e6 (patch) | |
| tree | 0938199acaf6819beb978caaebb02928e742c851 /py-fake-service | |
| parent | 57fc01e061808cf6ed006b70fe573b8a502c4517 (diff) | |
initial fake html attemp
Diffstat (limited to 'py-fake-service')
| -rw-r--r-- | py-fake-service/app/adapter/mail.py | 15 | ||||
| -rw-r--r-- | py-fake-service/app/search/search_query.py | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/py-fake-service/app/adapter/mail.py b/py-fake-service/app/adapter/mail.py index 8116129d..1cbe065f 100644 --- a/py-fake-service/app/adapter/mail.py +++ b/py-fake-service/app/adapter/mail.py @@ -23,12 +23,23 @@ class Mail: if mbox_mail: self.header = self._get_headers(mbox_mail) self.ident = ident - self.body = mbox_mail.get_payload() + self.body = self._get_body(mbox_mail) self.tags = self._get_tags(mbox_mail) self.security_casing = {} self.status = self._get_status() self.draft_reply_for = -1 + def _get_body(self, message): + if message.is_multipart(): + boundary = message.get_boundary() + start_boundary = '--'+boundary + join_boundary = start_boundary+'\n' + + return join_boundary + join_boundary.join([x.as_string() for x in message.get_payload()]) + start_boundary+ '--' + else: + return message.get_payload() + + def _get_status(self): status = [] if 'sent' in self.tags: @@ -42,6 +53,8 @@ class Mail: headers['to'] = [mbox_mail.get('To')] headers['subject'] = mbox_mail.get('Subject') headers['date'] = datetime.fromtimestamp(random.randrange(1222222222, self.NOW)).isoformat() + headers['Content-Type'] = mbox_mail.get('Content-Type') + return headers def _get_tags(self, mbox_mail): diff --git a/py-fake-service/app/search/search_query.py b/py-fake-service/app/search/search_query.py index 2d13851d..83c0bbca 100644 --- a/py-fake-service/app/search/search_query.py +++ b/py-fake-service/app/search/search_query.py @@ -57,7 +57,7 @@ class SearchQuery: if self.compiled.get('general'): search_terms = re.compile(self.compiled['general'], flags=re.IGNORECASE) - if search_terms.match(mail.body) or search_terms.match(mail.subject): + if search_terms.search(mail.body) or search_terms.search(mail.subject): return True if not [v for v in self.compiled.values() if v]: |