Dev

dev.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_mail_thunder_dev"
-version = "0.0.33"
+version = "0.0.36"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

dev_requirements.txt

@@ -2,4 +2,5 @@ je_mail_thunder_dev
 wheel
 twine
 sphinx
-sphinx-rtd-theme
+sphinx-rtd-theme
+build

je_mail_thunder/__main__.py

@@ -21,7 +21,11 @@ def preprocess_execute_files(file_path: str):
 
 
         def preprocess_read_str_execute_action(execute_str: str):
-            execute_str = json.loads(execute_str)
+            if sys.platform in ["win32", "cygwin", "msys"]:
+                json_data = json.loads(execute_str)
+                execute_str = json.loads(json_data)
+            else:
+                execute_str = json.loads(execute_str)
             execute_action(execute_str)
 
 

je_mail_thunder/imap/imap_wrapper.py

@@ -27,7 +27,7 @@ def imap_later_init(self):
         Try to log in
         :return: None
         """
-        mail_thunder_logger.info(f"MT_imap_later_init")
+        mail_thunder_logger.info("MT_imap_later_init")
         try:
             self.imap_try_to_login_with_env_or_content()
         except Exception as error:
@@ -38,15 +38,15 @@ def imap_try_to_login_with_env_or_content(self):
         Try to find user and password on cwd /mail_thunder_content.json or env var
         :return: None
         """
-        mail_thunder_logger.info(f"imap_try_to_login_with_env_or_content")
+        mail_thunder_logger.info("imap_try_to_login_with_env_or_content")
         try:
             user_info = read_output_content()
-            if user_info is not None and type(user_info) == dict:
+            if user_info is not None and isinstance(user_info, dict):
                 if user_info.get("user", None) is not None and user_info.get("password", None) is not None:
                     self.login(user_info.get("user"), user_info.get("password"))
             else:
                 user_info = get_mail_thunder_os_environ()
-                if user_info is not None and type(user_info) == dict:
+                if user_info is not None and isinstance(user_info, dict):
                     if user_info.get("mail_thunder_user", None) is not None and user_info.get(
                             "mail_thunder_user_password", None) is not None:
                         self.login(user_info.get("mail_thunder_user"), user_info.get("mail_thunder_user_password"))

je_mail_thunder/smtp/smtp_wrapper.py

@@ -124,13 +124,13 @@ def smtp_try_to_login_with_env_or_content(self):
             user_info = read_output_content()
             self.login_state = False
             try:
-                if user_info is not None and type(user_info) == dict:
+                if user_info is not None and isinstance(user_info, dict):
                     if user_info.get("user", None) is not None and user_info.get("password", None) is not None:
                         self.login(user_info.get("user"), user_info.get("password"))
                         self.login_state = True
                 else:
                     user_info = get_mail_thunder_os_environ()
-                    if user_info is not None and type(user_info) == dict:
+                    if user_info is not None and isinstance(user_info, dict):
                         if user_info.get("mail_thunder_user", None) is not None and user_info.get(
                                 "mail_thunder_user_password", None) is not None:
                             self.login(user_info.get("mail_thunder_user"), user_info.get("mail_thunder_user_password"))
@@ -147,7 +147,7 @@ def quit(self):
         Quit service and close connect
         :return: None
         """
-        mail_thunder_logger.info(f"SMTP quit")
+        mail_thunder_logger.info("SMTP quit")
         self.login_state = False
 
     def smtp_create_message_with_attach_and_send(self, message_content: str, message_setting_dict: dict,

je_mail_thunder/utils/executor/action_executor.py

@@ -70,14 +70,12 @@ def execute_action(self, action_list: [list, dict]) -> dict:
         for loop the list and execute action
         """
         if isinstance(action_list, dict):
-            action_list: list = action_list.get("auto_control", None)
+            action_list: list = action_list.get("auto_control")
             if action_list is None:
                 raise ExecuteActionException(executor_list_error)
         execute_record_dict = dict()
         try:
-            if len(action_list) > 0 or isinstance(action_list, list):
-                pass
-            else:
+            if len(action_list) < 0 or isinstance(action_list, list) is False:
                 raise ExecuteActionException(action_is_null_error)
         except Exception as error:
             mail_thunder_logger.error(

je_mail_thunder/utils/scheduler/extend_apscheduler.py

@@ -58,7 +58,7 @@ def add_blocking_job(
         """
         params = locals()
         params.pop("self")
-        trigger_args = params.pop("trigger_args")
+        params.pop("trigger_args")
         return self._blocking_schedulers.add_job(**params, **trigger_args)
 
     def add_nonblocking_job(
@@ -92,7 +92,7 @@ def add_nonblocking_job(
         """
         params = locals()
         params.pop("self")
-        trigger_args = params.pop("trigger_args")
+        params.pop("trigger_args")
         return self._background_schedulers.add_job(**params, **trigger_args)
 
     def get_blocking_scheduler(self) -> BlockingScheduler:

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_mail_thunder"
-version = "0.0.19"
+version = "0.0.21"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]