simple-rule34 1.0.0.1__py3-none-any.whl → 1.0.0.3__py3-none-any.whl

SimpleRule34/main.py

@@ -17,7 +17,7 @@ class Rule34BaseApi:
             **kwargs,
         }
 
-    async def _get(self, json_: bool = True, **params) -> dict | str:
+    async def _get(self, json_: bool = True, **params) -> dict | str | None:
         """
         Raw request method
 
@@ -29,8 +29,10 @@ class Rule34BaseApi:
 
         async with aiohttp.ClientSession(headers=self._header) as session:
             async with session.get(self._url, params={**self._params, **params, 'json': json_parsed}) as response:
-                if not response.ok:
+                if not response.ok and response.status not in [404, ]:
                     raise ApiException(await response.text())
+                elif response.status == 404:
+                    return None
 
                 # Used for handling XML response
                 if not json_:
@@ -47,7 +49,7 @@ class Rule34PostApi(Rule34BaseApi):
         super().__init__(user_id, api_key, **kwargs)
         self._params['s'] = "post"
 
-    async def get(self, id: int) -> Rule34Post:
+    async def get(self, id: int) -> Rule34Post | None:
         """
         Method used to obtain a post by its ID
 
@@ -56,7 +58,7 @@ class Rule34PostApi(Rule34BaseApi):
         """
 
         post = await self._get(id=id)
-        return Rule34Post(**post[0])
+        return Rule34Post(**post[0]) if post else None
 
     async def get_count(self, tags: list[str] = None) -> int:
         """
@@ -71,6 +73,8 @@ class Rule34PostApi(Rule34BaseApi):
             tags = []
 
         xml_data = await self._get(json_=False, tags=" ".join(tags))
+        if xml_data is None: return 0
+
         xml_root = ET.fromstring(xml_data)
 
         return int(xml_root.get('count'))
@@ -96,6 +100,8 @@ class Rule34PostApi(Rule34BaseApi):
             raise ValueError(f"The max size of request is 1000 when you tried to request {amount}")
 
         raw_list = await self._get(limit=amount, pid=page, tags=" ".join(tags))
+        if raw_list is None: return []
+
         post_list = [Rule34Post(**data) for data in raw_list]
 
         # Fast return if not sort is needed
@@ -126,6 +132,8 @@ class Rule34CommentsApi(Rule34BaseApi):
         """
 
         xml_data = await self._get(post_id=post_id, json_=False)
+        if xml_data is None: return []
+
         xml_root = ET.fromstring(xml_data)
 
         return [Rule34Comment(**comment_e.attrib) for comment_e in xml_root.findall("comment")]
@@ -145,6 +153,8 @@ class Rule34TagsApi(Rule34BaseApi):
         """
 
         xml_data = await self._get(id=id, json_=False)
+        if xml_data is None: return None
+
         xml_root = ET.fromstring(xml_data)
 
         raw_tag_data = xml_root.find("tag")
@@ -162,6 +172,8 @@ class Rule34TagsApi(Rule34BaseApi):
         """
 
         xml_data = await self._get(json_=False, limit=amount, pid=page)
+        if xml_data is None: return []
+
         xml_root = ET.fromstring(xml_data)
 
         return [Rule34Tag(**tag_e.attrib) for tag_e in xml_root.findall("tag")]

{simple_rule34-1.0.0.1.dist-info → simple_rule34-1.0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_rule34
-Version: 1.0.0.1
+Version: 1.0.0.3
 Summary: Simple api wrapper of rule34.xxx for python with asynchronous support
 Author-email: StarMan12 <author@example.com>
 Project-URL: Homepage, https://github.com/SyperAlexKomp/simple-rule34-api

{simple_rule34-1.0.0.1.dist-info → simple_rule34-1.0.0.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 __init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 SimpleRule34/__init__.py,sha256=9VMHjQsFOoSFNj_Ufq6VJLcTXHJPvqxeEozHpIpXSe0,29
 SimpleRule34/exceptions.py,sha256=7tjDPPoOmXTBaMbfsSjaLsXkzgChdKLBsDyCMClMIAo,341
-SimpleRule34/main.py,sha256=L_JIw45Y8UcBWiRvmeeB5zSimjHLOjVoNf1Hg29rMKY,7080
+SimpleRule34/main.py,sha256=cT2Gif-EL-RPd9pgPD27xa0v98-TIEGq30BhAzbC7lc,7437
 SimpleRule34/types.py,sha256=RBX7Wt26Q1vffVKF1kaHd5ivhk4o_p5kN4dprZ36s6w,3554
 SimpleRule34/utils.py,sha256=q4ohygRV4J88mNUQnCQ_-_A2-syIZpnO_UifIt_vpFc,689
-simple_rule34-1.0.0.1.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-simple_rule34-1.0.0.1.dist-info/METADATA,sha256=6y-CjmnUD6W_I6sGTvVPgoqFvxEl_yNU4akvec7RIvs,801
-simple_rule34-1.0.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-simple_rule34-1.0.0.1.dist-info/top_level.txt,sha256=YI-Z1ijzIjlJw2WeM95PSmClCzIvm24KAlyZi80YVNs,22
-simple_rule34-1.0.0.1.dist-info/RECORD,,
+simple_rule34-1.0.0.3.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+simple_rule34-1.0.0.3.dist-info/METADATA,sha256=ELLR4Lm0qpDFqEp99KWlApSVVhHVq9KLml5Epw_QW6I,801
+simple_rule34-1.0.0.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+simple_rule34-1.0.0.3.dist-info/top_level.txt,sha256=YI-Z1ijzIjlJw2WeM95PSmClCzIvm24KAlyZi80YVNs,22
+simple_rule34-1.0.0.3.dist-info/RECORD,,