PyEmailerAJM 1.9.4__tar.gz → 1.9.4.2__tar.gz

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: PyEmailerAJM
-Version: 1.9.4
+Version: 1.9.4.2
 Summary: Allows for automating sending Email with the Outlook Desktop client. Future releases will add more client support
 Home-page: https://github.com/amcsparron2793-Water/PyEmailer
-Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.4.tar.gz
+Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.4.2.tar.gz
 Author: Amcsparron
 Author-email: amcsparron@albanyny.gov
 License: MIT License

pyemailerajm-1.9.4.2/PyEmailerAJM/_version.py

@@ -0,0 +1 @@
+__version__ = '1.9.4.2'

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PyEmailerAJM/backend/logger.py

@@ -1,10 +1,14 @@
 from logging import Filter, DEBUG, ERROR, Handler, FileHandler, StreamHandler, Logger, WARNING
-from typing import Union
+from typing import Union, TYPE_CHECKING
 
 from EasyLoggerAJM import EasyLogger
 from EasyLoggerAJM.logger_parts import OutlookEmailHandler, StreamHandlerIgnoreExecInfo
 from PyEmailerAJM.msg import Msg
 
+if TYPE_CHECKING:
+    # noinspection PyProtectedMember
+    from EasyLoggerAJM.easy_logger import _EasyLoggerCustomLogger
+
 
 class DupeDebugFilter(Filter):
     PREFIXES_TO_IGNORE = ["FW:", "RE:"]

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PyEmailerAJM/backend/the_sandman.py

@@ -64,6 +64,7 @@ class TheSandman:
 
     def _setup_sleep_in_rounds(self, **kwargs):
         self.sleep_time_start = datetime.now().strftime('%m/%d/%Y %H:%M')
+        kwargs.setdefault('print_msg', True)
         if self.use_visual_sleep:
             kwargs['print_msg'] = False
         self._is_time_remaining = False
@@ -77,7 +78,6 @@ class TheSandman:
 
     def sleep_in_rounds(self, rounds=2, **kwargs):
         kwargs = self._setup_sleep_in_rounds(**kwargs)
-
         for sleep_round in range(rounds):
             self._sleep_round(sleep_round, rounds, **kwargs)
 
@@ -95,6 +95,12 @@ class TheSandman:
             else:
                 raise
 
+    def _basic_log_or_print_sleep_time_string(self, **kwargs):
+        if hasattr(self, 'logger'):
+            self.logger.info(self.sleep_time_string, **kwargs)
+        if kwargs.get('print_msg', False) and not hasattr(self, 'logger'):
+            print(self.sleep_time_string)
+
     def sleep(self, sleep_time_seconds: int, **kwargs):
         """
         :param sleep_time_seconds: The number of seconds the function should pause execution.
@@ -104,12 +110,14 @@ class TheSandman:
         """
 
         self.sleep_time_string = self.sleep_time if not self._is_time_remaining else sleep_time_seconds
-        self.logger.info(self.sleep_time_string, **kwargs)
+        self._basic_log_or_print_sleep_time_string(**kwargs)
+
         if self.use_visual_sleep:
             self.visual_sleep(sleep_time_seconds)
         else:
             sleep(sleep_time_seconds)
 
+    # TODO: this stays if standalone sandman is used
     @classmethod
     def is_snooze_expired(cls, snoozed_at: datetime, snooze_expiration_limit_hours: Optional[int] = None):
         if not snooze_expiration_limit_hours:

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PyEmailerAJM/continuous_monitor/continuous_monitor.py

@@ -91,7 +91,7 @@ class ContinuousMonitor(ContinuousMonitorBase):
 
         self.snooze_tracker.snooze_msgs(self.all_messages)
 
-    def endless_watch(self, stop_condition: Callable[[], bool] = None):
+    def endless_watch(self, stop_condition: Callable[[], bool] = None, **kwargs):
         if not self.dev_mode:
             self._set_args_for_endless_watch()
 
@@ -102,9 +102,9 @@ class ContinuousMonitor(ContinuousMonitorBase):
 
         while not stop_condition():
             try:
-                self.check_for_alerts()
+                self.check_for_alerts(**kwargs)
                 self._was_refreshed = False
-                self.sleep_timer.sleep_in_rounds()
+                self.sleep_timer.sleep_in_rounds(**kwargs)
             except KeyboardInterrupt:
                 self.logger.error("KeyboardInterrupt detected, exiting program.")
                 break

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PyEmailerAJM/continuous_monitor/continuous_monitor_alert_send.py

@@ -11,6 +11,7 @@ NO_COLORIZER = False
 
 
 # TODO: create a version that does not monitor the inbox and only sends emails when triggered
+#  IE get rid of _AlertMsg etc for this new class - see HTTPServerMonitorEmail
 class ContinuousMonitorAlertSend(ContinuousMonitor):
     ADMIN_EMAIL_LOGGER = []
     ADMIN_EMAIL = []

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PyEmailerAJM/msg/alert_messages.py

@@ -144,6 +144,7 @@ class _AlertMsgBase(Msg, _AlertCheckMethods):
         if not snooze_checker_entry and self.msg_snoozed_time:
             # FIXME: is this the cause of the "\snooze_tracking.py", line 102, in write_entry
             #  TypeError: fromisoformat: argument must be str
+            # TODO: change this to be able to accept a passed in class
             snooze_expired = TheSandman.is_snooze_expired(self.msg_snoozed_time)
         elif not snooze_checker_entry and not self.msg_snoozed_time:
             snooze_expired = True

{pyemailerajm-1.9.4 → pyemailerajm-1.9.4.2}/PyEmailerAJM.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: PyEmailerAJM
-Version: 1.9.4
+Version: 1.9.4.2
 Summary: Allows for automating sending Email with the Outlook Desktop client. Future releases will add more client support
 Home-page: https://github.com/amcsparron2793-Water/PyEmailer
-Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.4.tar.gz
+Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.4.2.tar.gz
 Author: Amcsparron
 Author-email: amcsparron@albanyny.gov
 License: MIT License

pyemailerajm-1.9.4/PyEmailerAJM/_version.py

@@ -1 +0,0 @@
-__version__ = '1.9.4'