xenoslib 0.1.29.13__tar.gz → 0.1.29.15__tar.gz

{xenoslib-0.1.29.13/xenoslib.egg-info → xenoslib-0.1.29.15}/PKG-INFO

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

{xenoslib-0.1.29.13 → xenoslib-0.1.29.15}/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.13"
+__version__ = "0.1.29.15"

{xenoslib-0.1.29.13 → xenoslib-0.1.29.15}/xenoslib/mail.py

@@ -40,13 +40,14 @@ class MailFetcher:
     """
 
     def __new__(
-        cls, imap_server, mail_addr, mail_pwd, interval=30, days=1, skip_current=True, endless=True
+        cls, imap_server, mail_addr, mail_pwd, interval=30, days=1, timeout=30, skip_current=True, endless=True
     ):
         self = super().__new__(cls)
         self.imap_server = imap_server
         self.mail_addr = mail_addr
         self.mail_pwd = mail_pwd
         self.days = days
+        self.timeout=timeout
 
         self.msg_ids = deque(maxlen=999)
         if not endless:
@@ -95,7 +96,7 @@ class MailFetcher:
         logger.debug(f"Fetching emails since {from_date:%Y-%m-%d %H:%M:%S} ({self.days} days ago)")
         for i in range(5):
             try:
-                with IMAPClient(self.imap_server, timeout=30) as client:
+                with IMAPClient(self.imap_server, timeout=self.timeout) as client:
                     client.login(self.mail_addr, self.mail_pwd)
                     client.select_folder("INBOX", readonly=True)
                     messages = client.search(["SINCE", from_date])
@@ -104,7 +105,7 @@ class MailFetcher:
             except Exception as exc:
                 logger.warning(exc)
                 sleep(30)
-        raise Exception("Reached maximum retry attempts. Giving up connection.")
+        raise Exception("Reached maximum retry attempts when connect IMAP server. Giving up connection.")
 
 
 class SMTPMail:
@@ -127,24 +128,19 @@ class SMTPMail:
             receivers.append(receiver)
         elif isinstance(receiver, (list, tuple)):
             receivers.extend(receiver)
-        msg = MIMEMultipart()
-        msg["Subject"] = Header(subject, "utf-8")
-        msg["From"] = Header(self.sender, "utf-8")
-        msg["To"] = ";".join(receivers)
+        msg = self.construct_msg(
+            subject=subject,
+            message=message,
+            receivers=receivers,
+            cc=cc,
+            filename=filename,
+        )
         if cc:
             msg["Cc"] = ";".join(cc)
             receivers.extend(cc)
         if bcc:
             receivers.extend(bcc)
-        msg["Message-ID"] = make_msgid()
-        msg.attach(MIMEText(message, "html", "utf-8"))
-        if filename:
-            attachment = MIMEApplication(open(filename, "rb").read())
-            attachment.add_header("Content-Disposition", "attachment", filename=filename)
-            msg.attach(attachment)
-
         with self.SMTP(self.smtp_server, self.port) as smtp:
-            print(smtp.has_extn("STARTTLS"))
             if smtp.has_extn("STARTTLS"):
                 smtp.starttls()
             try:
@@ -155,6 +151,19 @@ class SMTPMail:
             smtp.sendmail(self.sender, receivers, msg.as_string())
             return True
 
+    def construct_msg(self, subject, message, receivers=None, cc=None, filename=None):
+        msg = MIMEMultipart()
+        msg["Subject"] = Header(subject, "utf-8")
+        msg["From"] = Header(self.sender, "utf-8")
+        msg["To"] = ";".join(receivers)
+        msg["Message-ID"] = make_msgid()
+        msg.attach(MIMEText(message, "html", "utf-8"))
+        if filename:
+            attachment = MIMEApplication(open(filename, "rb").read())
+            attachment.add_header("Content-Disposition", "attachment", filename=filename)
+            msg.attach(attachment)
+        return msg
+
 
 def test_imap():
     try:
@@ -173,7 +182,7 @@ def test_imap():
         # ~ print(email_data.keys())
 
 
-def test():
+def test_smtp():
     try:
         import env  # noqa
     except ModuleNotFoundError:
@@ -185,9 +194,12 @@ def test():
     message = '<span style="color:red">This is a test email.</span>'
     email_sender = SMTPMail(smtp_server, sender=mail_addr, password=mail_pwd, port=465)
     # email_sender = SMTPMail(smtp_server, sender=mail_addr, password=mail_pwd, port=587)
-    email_sender.send(subject=subject, message=message, receiver=os.environ["RECEIVER"])
+    # ~ email_sender.send(subject=subject, message=message, receiver=os.environ["RECEIVER"],bcc=["haiwe.lu@sap.com"])
+    email_sender.send(
+        subject=subject, message=message, receiver="luhw@cndatacom.com", bcc=["haiwei.lu@sap.com"]
+    )
 
 
 if __name__ == "__main__":
-    test_imap()
-    # ~ test()
+    # ~ test_imap()
+    test_smtp()

{xenoslib-0.1.29.13 → xenoslib-0.1.29.15/xenoslib.egg-info}/PKG-INFO

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