Dead links (gofile notFound/404, 0807 404/410) fail immediately without retry

dlphelper/gofile.py

@@ -53,6 +53,13 @@ class GoFilePasswordRequired(GoFileError):
     """The content is password protected and none (or a wrong one) was given."""
 
 
+class GoFileNotFound(GoFileError):
+    """The content/file no longer exists (404 / status notFound).
+
+    Dead links never come back, so the orchestrator must not retry these.
+    """
+
+
 class GoFileAuthError(GoFileError):
     """The account token was rejected; the client can re-auth once."""
 
@@ -153,6 +160,8 @@ class GoFileClient:
         except requests.RequestException as exc:
             raise GoFileError(f"content request for {cid} failed: {exc}") from exc
 
+        if resp.status_code == 404:
+            raise GoFileNotFound(f"content {cid} not found (dead link)")
         if resp.status_code in (401, 403):
             raise GoFileAuthError(f"content request denied ({resp.status_code}) for {cid}")
         try:
@@ -160,6 +169,8 @@ class GoFileClient:
         except ValueError as exc:
             raise GoFileError(f"non-JSON response for {cid}: {resp.text[:200]}") from exc
 
+        if data.get("status") == "notFound":
+            raise GoFileNotFound(f"content {cid} does not exist anymore (dead link)")
         if data.get("status") != "ok":
             raise GoFileError(f"content request failed for {cid}: {data.get('status')}")
 
@@ -199,6 +210,8 @@ class GoFileClient:
             with self.session.get(
                 link, headers=headers, stream=True, timeout=(10, 60), allow_redirects=True
             ) as resp:
+                if resp.status_code == 404:
+                    raise GoFileNotFound(f"file {dest.name} not found (dead link)")
                 if resp.status_code != 200:
                     raise GoFileError(f"HTTP {resp.status_code} while downloading {dest.name}")
                 total = int(resp.headers.get("Content-Length") or 0)

dlphelper/zero807.py

@@ -29,6 +29,10 @@ class Zero807Error(Exception):
     """Base error for 0807 downloads."""
 
 
+class Zero807NotFound(Zero807Error):
+    """The file no longer exists (HTTP 404/410). Not retryable."""
+
+
 def target_name(url: str) -> str:
     """Derive the filename from the URL path (e.g. /6saCNie.zip -> 6saCNie.zip)."""
     name = Path(urlparse(url).path).name
@@ -71,7 +75,11 @@ def download(
     proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
     if proc.returncode != 0:
         tail = [line for line in proc.stderr.strip().splitlines() if line][-3:]
-        raise Zero807Error(f"curl exit code {proc.returncode}: {' | '.join(tail)}")
+        stderr = " | ".join(tail)
+        # -f makes curl exit 22 on any HTTP error; dead links fail for good
+        if "404" in stderr or "410" in stderr:
+            raise Zero807NotFound(f"dead link (HTTP 404/410): {stderr}")
+        raise Zero807Error(f"curl exit code {proc.returncode}: {stderr}")
 
     size = tmp.stat().st_size if tmp.exists() else 0
     if size == 0: