getred 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

getred/fetcher.py

@@ -1,7 +1,11 @@
 """HTTP client for fetching Reddit data."""
 
+from __future__ import annotations
+
+from typing import Any, Dict, Optional
+from urllib.parse import urlsplit, urlunsplit
+
 import httpx
-from typing import Dict, Any
 
 
 class RedditFetcher:
@@ -10,11 +14,29 @@ class RedditFetcher:
     USER_AGENT = "getred/0.1.0 (Reddit Thread Fetcher CLI)"
     TIMEOUT = 30.0
 
-    def __init__(self):
+    def __init__(self, transport: Optional[httpx.BaseTransport] = None):
         """Initialize the fetcher with custom headers."""
         self.headers = {
             "User-Agent": self.USER_AGENT
         }
+        self._transport = transport
+
+    @staticmethod
+    def _build_json_url(url: str) -> str:
+        """
+        Construct a Reddit .json endpoint URL from a thread URL.
+
+        - Preserves query parameters
+        - Avoids double-appending .json
+        - Drops fragments
+        """
+        parts = urlsplit(url)
+
+        path = parts.path or "/"
+        if not path.endswith(".json"):
+            path = path + ".json"
+
+        return urlunsplit((parts.scheme, parts.netloc, path, parts.query, ""))
 
     def fetch_thread(self, url: str) -> Dict[str, Any]:
         """
@@ -29,10 +51,21 @@ class RedditFetcher:
         Raises:
             httpx.HTTPError: If request fails
         """
-        # Ensure URL ends with .json
-        json_url = url.rstrip('/') + '.json'
+        json_url = self._build_json_url(url)
 
-        with httpx.Client(headers=self.headers, timeout=self.TIMEOUT) as client:
+        with httpx.Client(
+            headers=self.headers,
+            timeout=self.TIMEOUT,
+            follow_redirects=True,
+            transport=self._transport,
+        ) as client:
             response = client.get(json_url)
             response.raise_for_status()
-            return response.json()
+            try:
+                return response.json()
+            except ValueError as e:
+                content_type = response.headers.get("Content-Type", "<missing>")
+                raise ValueError(
+                    f"Non-JSON response from Reddit endpoint "
+                    f"(url={response.url!s}, status={response.status_code}, content_type={content_type})"
+                ) from e

getred/utils.py

@@ -16,7 +16,7 @@ def validate_reddit_url(url: str) -> bool:
     Returns:
         True if valid Reddit thread URL, False otherwise
     """
-    pattern = r'^https?://(www\.)?reddit\.com/r/[^/]+/comments/[^/]+/'
+    pattern = r'^https?://(www\.)?reddit\.com/r/[^/]+/comments/[^/]+(?:[/?#]|$)'
     return bool(re.match(pattern, url))
 
 

{getred-0.1.4.dist-info → getred-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: getred
-Version: 0.1.4
+Version: 0.1.5
 Summary: A CLI tool to fetch Reddit threads and save them as structured JSON
 Project-URL: Homepage, https://github.com/mgelei/getred
 Project-URL: Issues, https://github.com/mgelei/getred/issues

getred-0.1.5.dist-info/RECORD

@@ -0,0 +1,12 @@
+getred/__init__.py,sha256=OV8_4Tk9tyvGAfZ4flBb_clJWWhQzPyMNjbsmdo0YJc,198
+getred/__main__.py,sha256=feAHoe3sKnTtTZZQ8CQntbtVBbkDL3EqaldR6LpLU48,108
+getred/cli.py,sha256=ZcXE9yirkiwwmfohxSpsuaoC8lt_ubY4BgoPWYZQ_bI,2149
+getred/fetcher.py,sha256=Md4g39rTAOaNL9EOCWfEaQJxqZEOkaQDpGtnvcFKobU,2120
+getred/models.py,sha256=DJGHsXQJnKdgUSv_mXzsQd9luzsamw5UgkZT2WAZHBg,1613
+getred/parser.py,sha256=hx_SHTZEcCmkfS1F2E8vlj5Z-v_xYRhJtcxiEFABJK4,3066
+getred/utils.py,sha256=gcohLLJQNuu9cFpzcIpCCmUrjCWDFZL7E_EkZnP7Fag,2165
+getred-0.1.5.dist-info/METADATA,sha256=OecYZHVM-lCagnjpHAKUlOqDt8LhvbiJTUjBcr5fpwk,729
+getred-0.1.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+getred-0.1.5.dist-info/entry_points.txt,sha256=sUbiNDbmjeRZLW1zij_nhtxM9761F6DMmGeRl60xenY,43
+getred-0.1.5.dist-info/licenses/LICENSE,sha256=GJ-Sk2Q9pSMeuVlqqZQe5P5DLvOjKQRVpTA1fy_JftI,1073
+getred-0.1.5.dist-info/RECORD,,

getred-0.1.4.dist-info/RECORD

@@ -1,12 +0,0 @@
-getred/__init__.py,sha256=OV8_4Tk9tyvGAfZ4flBb_clJWWhQzPyMNjbsmdo0YJc,198
-getred/__main__.py,sha256=feAHoe3sKnTtTZZQ8CQntbtVBbkDL3EqaldR6LpLU48,108
-getred/cli.py,sha256=ZcXE9yirkiwwmfohxSpsuaoC8lt_ubY4BgoPWYZQ_bI,2149
-getred/fetcher.py,sha256=kdFb8lWAdQzEFGzGaSKI2W-YQyZyD5tclSDXC2j5o_o,1033
-getred/models.py,sha256=DJGHsXQJnKdgUSv_mXzsQd9luzsamw5UgkZT2WAZHBg,1613
-getred/parser.py,sha256=hx_SHTZEcCmkfS1F2E8vlj5Z-v_xYRhJtcxiEFABJK4,3066
-getred/utils.py,sha256=z4mKfCbME6ffi9PC7CnMcYZNFEMtVDTF5JJKMoBgirg,2155
-getred-0.1.4.dist-info/METADATA,sha256=HOdnBn4tKRk7buZokZeM99YvNvqD1CK4LVl_O5SXSFU,729
-getred-0.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-getred-0.1.4.dist-info/entry_points.txt,sha256=sUbiNDbmjeRZLW1zij_nhtxM9761F6DMmGeRl60xenY,43
-getred-0.1.4.dist-info/licenses/LICENSE,sha256=GJ-Sk2Q9pSMeuVlqqZQe5P5DLvOjKQRVpTA1fy_JftI,1073
-getred-0.1.4.dist-info/RECORD,,