Quoted printable decoding support

attachment_downloader/encoding.py

@@ -0,0 +1,18 @@
+import base64
+import quopri
+import re
+
+
+class QuoPriEncoding:
+    @staticmethod
+    def decode(encoded_text):
+        encoded_word_regex = r'=\?{1}(.+)\?{1}([B|Q|b|q])\?{1}(.+)\?{1}='
+        matches = re.match(encoded_word_regex, encoded_text)
+        if matches is None:
+            return encoded_text
+        charset, encoding, encoded_text = matches.groups()
+        if encoding.upper() == 'B':
+            byte_string = base64.b64decode(encoded_text)
+        elif encoding.upper() == 'Q':
+            byte_string = quopri.decodestring(encoded_text)
+        return byte_string.decode(charset)

attachment_downloader/version_info.py

@@ -1,6 +1,7 @@
 import os
 import platform
 import subprocess
+import sys
 
 VERSION_FILENAME = os.path.abspath(os.path.join(os.path.dirname(__file__), 'version.py'))
 
@@ -37,4 +38,4 @@ def get(retry=True):
     @staticmethod
     def get_env_info():
         os_info = f"Release: {platform.release()}, Platform: {platform.platform()}"
-        return f"(Python: {platform.python_version()}), OS: ({os_info})"
+        return f"(Python: {platform.python_version()}), OS: ({os_info}). Default Encoding: {sys.getdefaultencoding()}"

bin/attachment-downloader

@@ -11,6 +11,7 @@ from imbox import Imbox
 from jinja2 import Template, UndefinedError
 
 from attachment_downloader.cli import valid_date, get_password
+from attachment_downloader.encoding import QuoPriEncoding
 from attachment_downloader.logging import Logger
 from attachment_downloader.version_info import Version
 
@@ -108,7 +109,7 @@ if __name__ == '__main__':
         for (uid, message) in messages:
             subject = ''
             if hasattr(message, 'subject'):
-                subject = message.subject
+                subject = QuoPriEncoding.decode(message.subject)
 
             try:
                 parsed_message_date = dateparser.parse(message.date)
@@ -141,7 +142,8 @@ if __name__ == '__main__':
 
             for idx, attachment in enumerate(message.attachments):
                 try:
-                    download_filename = filename_template.render(attachment_name=attachment.get('filename'),
+                    attachment_filename = QuoPriEncoding.decode(attachment.get('filename'))
+                    download_filename = filename_template.render(attachment_name=attachment_filename,
                                                                  attachment_idx=idx,
                                                                  subject=subject,
                                                                  message_id=message.message_id,
@@ -150,7 +152,7 @@ if __name__ == '__main__':
 
                     download_path = os.path.join(options.download_folder, download_filename)
                     os.makedirs(os.path.dirname(os.path.abspath(download_path)), exist_ok=True)
-                    logging.info("Downloading attachment '%s' to path %s", attachment.get('filename'), download_path)
+                    logging.info("Downloading attachment '%s' to path %s", attachment_filename, download_path)
 
                     if os.path.isfile(download_path):
                         logging.warning("Overwriting file: '%s'", download_path)

tests/attachment_downloader/test_encoding.py

@@ -0,0 +1,10 @@
+from assertpy import assert_that
+
+from attachment_downloader.encoding import QuoPriEncoding
+
+
+class TestQuoPriEncoding:
+    def test_decode(self):
+        assert_that(QuoPriEncoding.decode('=?utf-8?b?2LPZhNin2YU=?=')).is_equal_to('سلام')
+        assert_that(QuoPriEncoding.decode('=?UTF-8?B?2LPZhNin2YU=?=')).is_equal_to('سلام')
+        assert_that(QuoPriEncoding.decode('Hello')).is_equal_to('Hello')