sedd 2.4.0__tar.gz → 2.4.2__tar.gz

{sedd-2.4.0/sedd.egg-info → sedd-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sedd
-Version: 2.4.0
+Version: 2.4.2
 Summary: Unofficial, community-made tool for downloading the Stack Exchange data dumps
 Author-email: LunarWatcher <oliviawolfie@pm.me>
 License-Expression: MIT

{sedd-2.4.0 → sedd-2.4.2}/sedd/main.py

@@ -1,3 +1,4 @@
+import traceback
 from selenium.webdriver.common.by import By
 from selenium.webdriver.firefox.webdriver import WebDriver
 from selenium.common.exceptions import NoSuchElementException
@@ -391,7 +392,9 @@ def clear_part_files():
 
 def normalize_meta(url: str):
     if (url.startswith("meta.") and url != "meta.stackexchange.com"):
-        return url.replace("meta.", "")
+        return url.replace("meta.", "", 1)
+    elif (".meta." in url):
+        return url.replace(".meta.", "", 1)
     return url
 
 def try_recover_fucked_download(
@@ -399,7 +402,7 @@ def try_recover_fucked_download(
         state: DownloadState
 ):
     # TODO: This is a very naive approach. Can we get the information directly
-    # form the webdriver?
+    # from the webdriver?
     for path in state.pending:
         # The path is in the form of the full site URL with the .zip
         # The .part file is in the form `[first path component].[garbage].[rest]`
@@ -505,10 +508,16 @@ try:
                 break
             else:
                 if args.wipe_part_files:
-                    try_recover_fucked_download(
-                        last_sizes,
-                        state
-                    )
+                    try:
+                        try_recover_fucked_download(
+                            last_sizes,
+                            state
+                        )
+                    except Exception as e:
+                        logger.error(
+                            "Failed to error recovery; will continue retrying"
+                        )
+                        logger.error("{}", traceback.format_exc())
                 sleep(1)
 
     notifications.notify(

{sedd-2.4.0 → sedd-2.4.2}/sedd/meta/notifications.py

@@ -15,15 +15,16 @@ def native(message: str, _):
     )
 
 def ntfy(message: str, config):
-    requests.post(
+    r = requests.post(
         config["url"],
         headers={
             "Authorization": f"Bearer {config['bearer']}",
             "Title": "Sedd update"
         },
         data=message,
-
     )
+    if r.status_code >= 400:
+        logger.error("Ntfy failure: {}", r.status_code)
 
 notification_providers = {
     "native": native,
@@ -36,7 +37,7 @@ def notify(message: str, config: SEDDConfig):
     provider = config.get_notifications_provider()
 
     if provider is None:
-        logger.info(message)
+        logger.info("Notification (CLI fallback): {}", message)
         return
 
     notification_providers[provider](message, config.notifications)

{sedd-2.4.0 → sedd-2.4.2/sedd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sedd
-Version: 2.4.0
+Version: 2.4.2
 Summary: Unofficial, community-made tool for downloading the Stack Exchange data dumps
 Author-email: LunarWatcher <oliviawolfie@pm.me>
 License-Expression: MIT