diff options
author | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
---|---|---|
committer | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
commit | 42f31aa607750eb7c00224e7c1c353b27cbd7519 (patch) | |
tree | 4bbfae731c8427c526f22bacb9136e5ed3e69d8c /service/pixelated/resources | |
parent | 7f349abe67b8e1a71798478f6c26b08773f2d869 (diff) | |
parent | 0b179c61043a9854fa23b8fd40fd252864ecd021 (diff) |
Merge branch 'master' into floatlabel_for_compose
Diffstat (limited to 'service/pixelated/resources')
-rw-r--r-- | service/pixelated/resources/attachments_resource.py | 12 | ||||
-rw-r--r-- | service/pixelated/resources/root_resource.py | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py index e0ba1bd1..83c7156d 100644 --- a/service/pixelated/resources/attachments_resource.py +++ b/service/pixelated/resources/attachments_resource.py @@ -27,15 +27,15 @@ class AttachmentResource(Resource): isLeaf = True - def __init__(self, attachment_id, querier): + def __init__(self, mail_service, attachment_id): Resource.__init__(self) self.attachment_id = attachment_id - self.querier = querier + self.mail_service = mail_service def render_GET(self, request): encoding = request.args.get('encoding', [None])[0] filename = request.args.get('filename', [self.attachment_id])[0] - attachment = self.querier.attachment(self.attachment_id, encoding) + attachment = self.mail_service.attachment(self.attachment_id, encoding) request.setHeader(b'Content-Type', b'application/force-download') request.setHeader(b'Content-Disposition', bytes('attachment; filename=' + filename)) @@ -57,9 +57,9 @@ class AttachmentResource(Resource): class AttachmentsResource(Resource): - def __init__(self, querier): + def __init__(self, mail_service): Resource.__init__(self) - self.querier = querier + self.mail_service = mail_service def getChild(self, attachment_id, request): - return AttachmentResource(attachment_id, self.querier) + return AttachmentResource(self.mail_service, attachment_id) diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index 4c0c47ac..c1111269 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -21,10 +21,10 @@ class RootResource(Resource): return self return Resource.getChild(self, path, request) - def initialize(self, querier, keymanager, search_engine, mail_service, draft_service): + def initialize(self, keymanager, search_engine, mail_service, draft_service): self.putChild('assets', File(self._static_folder)) self.putChild('keys', KeysResource(keymanager)) - self.putChild('attachment', AttachmentsResource(querier)) + self.putChild('attachment', AttachmentsResource(mail_service)) self.putChild('contacts', ContactsResource(search_engine)) self.putChild('features', FeaturesResource()) self.putChild('tags', TagsResource(search_engine)) @@ -32,7 +32,6 @@ class RootResource(Resource): self.putChild('mail', MailResource(mail_service)) def _get_static_folder(self): - static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app")) # this is a workaround for packaging if not os.path.exists(static_folder): |