nyapy 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

nyapy/__init__.py

@@ -1,5 +1,5 @@
-from .enums import Filter, NyaaFunCategories, SukebeiCategories
+from .nyaa import BadResponse
 from .nyaafun import NyaaFun
 from .sukebei import Sukebei
 
-__all__ = ['Filter', 'NyaaFunCategories', 'SukebeiCategories', 'NyaaFun', 'Sukebei']
+__all__ = ['NyaaFun', 'Sukebei', 'BadResponse']

nyapy/client.py

@@ -8,5 +8,5 @@ def get_client(base_url: str) -> AsyncClient:
             'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36'
         },
         timeout=10.0,
-        transport=AsyncHTTPTransport(retries=6),
+        transport=AsyncHTTPTransport(retries=10),
     )

nyapy/enums.py

@@ -40,8 +40,8 @@ class NyaaFunCategories(StrEnum):
 
 
 class Filter(IntEnum):
-    NO_REMAKES = 1
-    TRUSTED_ONLY = 2
+    no_remakes = 1
+    trusted_only = 2
 
 
 class NyaaSite(StrEnum):

nyapy/nyaa.py

@@ -3,8 +3,9 @@ import re
 from bs4 import BeautifulSoup
 
 from .client import get_client
-from .enums import NyaaSite
-from .types.nyaa import ContentData, ResponseData
+from .enums import Filter as FilterEnum
+from .enums import NyaaFunCategories, NyaaSite, SukebeiCategories
+from .types.nyaa import ContentData, Filter, Order, ResponseData, Sort
 
 
 class BadResponse(Exception):
@@ -12,25 +13,36 @@ class BadResponse(Exception):
         super().__init__(message)
 
 
-class Nyaa:
+class Nyaa[T: str]:
     def __init__(self, site: NyaaSite) -> None:
-        self.client = get_client(site)
+        self._client = get_client(site)
+        self._categories_enum = (
+            NyaaFunCategories if NyaaSite.FUN == site else SukebeiCategories
+        )
 
     async def get_content(
-        self, *, filter, category, query, sort, order, page
+        self,
+        *,
+        filter: Filter | None = None,
+        category: T | None = None,
+        query: str | None = None,
+        page: int = 1,
+        sort: Sort | None = None,
+        order: Order = 'desc',
     ) -> ResponseData:
-        if sort == 'date':
-            sort = 'id'
+        sortval = 'id' if sort == 'date' else None
+        catval = self._categories_enum[category] if category else None
+        filterval = FilterEnum[filter] if filter else None
 
-        res = await self.client.get(
+        res = await self._client.get(
             '',
             params={
-                'f': filter,
-                'c': category,
+                'f': filterval,
                 'q': query,
                 'p': page,
-                's': sort,
+                's': sortval,
                 'o': order,
+                'c': catval,
             },
         )
 
@@ -54,7 +66,9 @@ class Nyaa:
             torrent = properties[2].find('i', {'class': 'fa-download'})
             torrent = torrent.parent if torrent else None
             torrent = torrent.get('href') if torrent else None
-            torrent = str(self.client.base_url)[:-1] + str(torrent) if torrent else None
+            torrent = (
+                str(self._client.base_url)[:-1] + str(torrent) if torrent else None
+            )
             magnet = properties[2].find('i', {'class': 'fa-magnet'})
             magnet = magnet.parent if magnet else None
             magnet = str(magnet.get('href')) if magnet else None
@@ -83,4 +97,4 @@ class Nyaa:
 
     async def close(self):
         """Closes connection to nyaa"""
-        await self.client.aclose()
+        await self._client.aclose()

nyapy/nyaafun.py

@@ -1,27 +1,8 @@
-from .enums import Filter, NyaaFunCategories, NyaaSite
+from .enums import NyaaSite
 from .nyaa import Nyaa
-from .types.nyaa import Order, ResponseData, Sort
+from .types.nyaa import NyaaFunCategories
 
 
-class NyaaFun(Nyaa):
+class NyaaFun(Nyaa[NyaaFunCategories]):
     def __init__(self) -> None:
         super().__init__(NyaaSite.FUN)
-
-    async def get_content(
-        self,
-        *,
-        filter: Filter | None = None,
-        category: NyaaFunCategories | None = None,
-        query: str | None = None,
-        page: int = 1,
-        sort: Sort | None = None,
-        order: Order = 'desc',
-    ) -> ResponseData:
-        return await super().get_content(
-            filter=filter,
-            category=category,
-            query=query,
-            sort=sort,
-            page=page,
-            order=order,
-        )

nyapy/sukebei.py

@@ -1,27 +1,8 @@
-from .enums import Filter, NyaaSite, SukebeiCategories
+from .enums import NyaaSite
 from .nyaa import Nyaa
-from .types.nyaa import Order, ResponseData, Sort
+from .types.nyaa import SukebeiCategories
 
 
-class Sukebei(Nyaa):
+class Sukebei(Nyaa[SukebeiCategories]):
     def __init__(self) -> None:
         super().__init__(NyaaSite.FAP)
-
-    async def get_content(
-        self,
-        *,
-        filter: Filter | None = None,
-        category: SukebeiCategories | None = None,
-        query: str | None = None,
-        page: int = 1,
-        sort: Sort | None = None,
-        order: Order = 'desc',
-    ) -> ResponseData:
-        return await super().get_content(
-            filter=filter,
-            category=category,
-            query=query,
-            sort=sort,
-            page=page,
-            order=order,
-        )

nyapy/types/nyaa.py

@@ -27,3 +27,40 @@ class ResponseData(TypedDict):
 
 type Sort = Literal['comments', 'size', 'date', 'seeders', 'leechers', 'downloads']
 type Order = Literal['asc', 'desc']
+type Filter = Literal['no_remakes', 'trusted_only']
+type SukebeiCategories = Literal[
+    'art',
+    'art_anime',
+    'art_doujinshi',
+    'art_games',
+    'art_manga',
+    'art_pictures',
+    'real_life',
+    'real_life_pictures',
+    'real_life_videos',
+]
+type NyaaFunCategories = Literal[
+    'anime',
+    'anime_amv',
+    'anime_english',
+    'anime_non_english',
+    'anime_raw',
+    'audio',
+    'audio_lossless',
+    'audio_lossy',
+    'literature',
+    'literature_english',
+    'literature_non_english',
+    'literature_raw',
+    'live_action',
+    'live_action_english',
+    'live_action_idol_pv',
+    'live_action_non_english',
+    'live_action_raw',
+    'pictures',
+    'pictures_graphics',
+    'pictures_photos',
+    'software',
+    'software_apps',
+    'software_games',
+]

{nyapy-0.1.3.dist-info → nyapy-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nyapy
-Version: 0.1.3
+Version: 0.1.5
 Summary: A nyaa scrapper
 Author: mikel39
 Author-email: mikel39 <202028875+mikel39@users.noreply.github.com>

nyapy-0.1.5.dist-info/RECORD

@@ -0,0 +1,10 @@
+nyapy/__init__.py,sha256=Vne0XdJw_CBviEjfe1y2cOI7N75OxeFZZeGHLVZ9Ed0,137
+nyapy/client.py,sha256=JQH9Rln_9vuySjBOw9CRLJ-qtGM2f0Dhp22oq7qRYa4,386
+nyapy/enums.py,sha256=Nw7iCWTvohcDqjIE16L-HDuXW5NSq3jZHFvwyQ9MdV4,1087
+nyapy/nyaa.py,sha256=UFySVClr55NGfdolcLisUWATJ6XraQKRnhxkJ1IWTSE,3482
+nyapy/nyaafun.py,sha256=rM-qWjox_9FCoitypRlo2apr14mdL7Ktd_8Tro2SzIQ,206
+nyapy/sukebei.py,sha256=1wp5OS_ky0-OxSUEDO20jRbb492FIZPbiVRCSqrCUiM,206
+nyapy/types/nyaa.py,sha256=jhCrNJ0OEN737yOd0CKY8gmPHtlcR1t-shmUZiGUNhw,1307
+nyapy-0.1.5.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+nyapy-0.1.5.dist-info/METADATA,sha256=FNpjuOrxB7IKR_pMidXhjw-u9KciGDBycWe_X4MQVz8,338
+nyapy-0.1.5.dist-info/RECORD,,

nyapy-0.1.3.dist-info/RECORD

@@ -1,10 +0,0 @@
-nyapy/__init__.py,sha256=Q85n2fc9xfJPjy1nGcWjHo092HhL-wECjRH_YzNzAjo,208
-nyapy/client.py,sha256=9LeOHoqLjgeKTxHDZApfSigDlOZG1qlN8yOB6ApCUzw,385
-nyapy/enums.py,sha256=AEY7OpuW3I5tSQ1XuwGHPzv-DYQSYmPBJ6ChzS47pRo,1087
-nyapy/nyaa.py,sha256=wfI2RtriFPspjP2veLVcsZJ3L6qkNx6cakkRJydKWeo,2924
-nyapy/nyaafun.py,sha256=gWqSQ4yNiLrzs8flFibRAL4lEmy6A9EvHh1E981EzWU,715
-nyapy/sukebei.py,sha256=FFkcJ47tR-aeapSUYQQYlDIZKRo0_srnpYYP_d-ylwk,715
-nyapy/types/nyaa.py,sha256=zpnQdPRVL-GKoRQ25-YzxzGvSoFbSWESW8wQnKs3Hzw,520
-nyapy-0.1.3.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-nyapy-0.1.3.dist-info/METADATA,sha256=azIVT5-Zr1uLVEsfcwZWgGFWvqLJ5AgPG1XcdZkIXkY,338
-nyapy-0.1.3.dist-info/RECORD,,