🐛 persistent error notifications

camply/config/notification_config.py

@@ -21,11 +21,11 @@
     """
 
     PUSHOVER_API_ENDPOINT: str = "https://api.pushover.net/1/messages.json"
-    PUSHOVER_DEFAULT_API_TOKEN: bytes = b"YWpjN3M1a2hhYTRlOG1zYWhncnFnaHduZGdtbmI3"
+    PUSHOVER_DEFAULT_API_TOKEN: bytes = b"YXBqOWlzNjRrdm5zZWt3YmEyeDZxaDV0cWhxbXI5"
     API_HEADERS: dict = {"Content-Type": "application/json"}
 
     PUSH_TOKEN: str = getenv("PUSHOVER_PUSH_TOKEN", None)
     PUSH_USER: str = getenv("PUSHOVER_PUSH_USER", None)
 
 
 class AppriseConfig:
@@ -33,7 +33,7 @@
     Apprise Notification Config Class
     """
 
     APPRISE_URL: str = getenv("APPRISE_URL", None)
 
 
 class EmailConfig:
@@ -81,7 +81,7 @@
     """
 
     PUSHBULLET_API_ENDPOINT: str = "https://api.pushbullet.com/v2/pushes"
     API_HEADERS: dict = {"Content-Type": "application/json"}
 
     API_TOKEN = getenv("PUSHBULLET_API_TOKEN", None)
 

camply/notifications/pushover.py

@@ -34,6 +34,11 @@ def __init__(self, level: Optional[int] = logging.INFO):
             )
             logger.error(warning_message)
             raise EnvironmentError(warning_message)
+        self.pushover_token = PushoverConfig.PUSH_TOKEN
+        if self.pushover_token in [None, ""]:
+            self.pushover_token = base64.b64decode(
+                PushoverConfig.PUSHOVER_DEFAULT_API_TOKEN
+            ).decode("utf-8")
 
     def send_message(self, message: str, **kwargs) -> requests.Response:
         """
@@ -47,17 +52,13 @@ def send_message(self, message: str, **kwargs) -> requests.Response:
         -------
         requests.Response
         """
-        token = (
-            PushoverConfig.PUSH_TOKEN
-            if PushoverConfig.PUSH_TOKEN not in [None, ""]
-            else base64.b64decode(PushoverConfig.PUSHOVER_DEFAULT_API_TOKEN).decode(
-                "utf-8"
-            )
-        )
         response = self.session.post(
             url=PushoverConfig.PUSHOVER_API_ENDPOINT,
             params=dict(
-                token=token, user=PushoverConfig.PUSH_USER, message=message, **kwargs
+                token=self.pushover_token,
+                user=PushoverConfig.PUSH_USER,
+                message=message,
+                **kwargs,
             ),
         )
         try:

camply/search/base_search.py

@@ -117,6 +117,7 @@ def __init__(
                 AvailableCampsite
             ] = self.load_campsites_from_file()
             self.loaded_campsites: Set[AvailableCampsite] = self.campsites_found.copy()
+        self.search_attempts: int = 0
 
     @property
     def search_days(self) -> List[datetime]:
@@ -274,6 +275,7 @@ def _search_matching_campsites_available(
             )
             logger.info(campsite_availability_message)
             raise CampsiteNotFoundError(campsite_availability_message)
+        self.search_attempts += 1
         return matching_campgrounds
 
     @classmethod
@@ -581,7 +583,8 @@ def get_matching_campsites(
                     search_once=search_once,
                 )
             except Exception as e:
-                self.notifier.last_gasp(error=e)
+                if self.search_attempts >= 1:
+                    self.notifier.last_gasp(error=e)
                 raise e
         else:
             starting_count = len(self.campsites_found)