xenoslib 0.1.29.8__tar.gz → 0.1.29.10__tar.gz

{xenoslib-0.1.29.8/xenoslib.egg-info → xenoslib-0.1.29.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xenoslib
-Version: 0.1.29.8
+Version: 0.1.29.10
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider

{xenoslib-0.1.29.8 → xenoslib-0.1.29.10}/xenoslib/about.py

@@ -4,4 +4,4 @@ __url__ = "https://github.com/XenosLu/xenoslib.git"
 __author__ = "Xenocider"
 __author_email__ = "xenos.lu@gmail.com"
 __license__ = "MIT License"
-__version__ = "0.1.29.8"
+__version__ = "0.1.29.10"

{xenoslib-0.1.29.8 → xenoslib-0.1.29.10}/xenoslib/mail.py

@@ -72,9 +72,17 @@ class MailFetcher:
                 continue
             body = email.message_from_bytes(msg[b"BODY[]"])
             subject = str(email.header.make_header(email.header.decode_header(body["Subject"])))
-            payload = body.get_payload(decode=True)
-            if payload:
-                payload = payload.decode()
+            if body.is_multipart():
+                for part in body.walk():
+                    if "text/plain" in part.get_content_type():
+                        payload = part.get_payload(decode=True)
+            else:
+                payload = body.get_payload(decode=True)
+            if isinstance(payload, bytes):
+                try:
+                    payload = payload.decode()
+                except UnicodeDecodeError:
+                    payload = payload.decode("latin1")  # failover decode
             body["raw"] = msg[b"BODY[]"]
             body["subjectx"] = subject
             body["payload"] = payload
@@ -158,9 +166,12 @@ def test_imap():
     mail_addr = os.environ["IMAP_ADDR"]
     mail_pwd = os.environ["IMAP_PASS"]
     for email_data in MailFetcher(
-        imap_server, mail_addr, mail_pwd, interval=1, days=30, skip_current=True
+        imap_server, mail_addr, mail_pwd, interval=1, days=1, skip_current=False
     ):
-        print(email_data["subject"])
+        # ~ print(email_data["subject"])
+        print(email_data["subjectx"])
+        print(email_data["payload"])
+        # ~ print(email_data.keys())
 
 
 def test():
@@ -179,5 +190,5 @@ def test():
 
 
 if __name__ == "__main__":
-    # test_imap()
-    test()
+    test_imap()
+    # ~ test()

{xenoslib-0.1.29.8 → xenoslib-0.1.29.10/xenoslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xenoslib
-Version: 0.1.29.8
+Version: 0.1.29.10
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider