nyapy 0.1.2__tar.gz → 0.1.4__tar.gz

{nyapy-0.1.2 → nyapy-0.1.4}/PKG-INFO

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

{nyapy-0.1.2 → nyapy-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nyapy"
-version = "0.1.2"
+version = "0.1.4"
 authors = [
     { name = "mikel39", email = "202028875+mikel39@users.noreply.github.com" }
 ]

{nyapy-0.1.2 → nyapy-0.1.4}/src/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-0.1.2 → nyapy-0.1.4}/src/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-0.1.4/src/nyapy/nyaafun.py

@@ -0,0 +1,8 @@
+from .enums import NyaaSite
+from .nyaa import Nyaa
+from .types.nyaa import NyaaFunCategories
+
+
+class NyaaFun(Nyaa[NyaaFunCategories]):
+    def __init__(self) -> None:
+        super().__init__(NyaaSite.FUN)

nyapy-0.1.4/src/nyapy/sukebei.py

@@ -0,0 +1,8 @@
+from .enums import NyaaSite
+from .nyaa import Nyaa
+from .types.nyaa import SukebeiCategories
+
+
+class Sukebei(Nyaa[SukebeiCategories]):
+    def __init__(self) -> None:
+        super().__init__(NyaaSite.FAP)

nyapy-0.1.4/src/nyapy/types/nyaa.py

@@ -0,0 +1,66 @@
+from typing import Literal, TypedDict
+
+
+class _Links(TypedDict):
+    torrent: str | None
+    magnet: str | None
+
+
+class ContentData(TypedDict):
+    id: int
+    category: str
+    name: str
+    comments: int
+    size: str
+    date: str
+    seeders: int
+    leechers: int
+    downloads: int
+    links: _Links
+
+
+class ResponseData(TypedDict):
+    page: int
+    results: int
+    data: list[ContentData]
+
+
+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.2/src/nyapy/nyaafun.py

@@ -1,27 +0,0 @@
-from .enums import Filter, NyaaFunCategories, NyaaSite
-from .nyaa import Nyaa
-from .types.nyaa import Order, ResponseData, Sort
-
-
-class NyaaFun(Nyaa):
-    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-0.1.2/src/nyapy/sukebei.py

@@ -1,27 +0,0 @@
-from .enums import Filter, NyaaSite, SukebeiCategories
-from .nyaa import Nyaa
-from .types.nyaa import Order, ResponseData, Sort
-
-
-class Sukebei(Nyaa):
-    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-0.1.2/src/nyapy/types/nyaa.py

@@ -1,29 +0,0 @@
-from typing import Literal, TypedDict
-
-
-class _Links(TypedDict):
-    torrent: str | None
-    magnet: str | None
-
-
-class ContentData(TypedDict):
-    id: int
-    category: str
-    name: str
-    comments: int
-    size: str
-    date: str
-    seeders: int
-    leechers: int
-    downloads: int
-    links: _Links
-
-
-class ResponseData(TypedDict):
-    page: int
-    results: int
-    data: list[ContentData]
-
-
-type Sort = Literal['comments', 'size', 'date', 'seeders', 'leechers', 'downloads']
-type Order = Literal['asc', 'desc']