simple-rule34 0.1.5.1__py3-none-any.whl → 0.1.5.4__py3-none-any.whl

SimpleRule34/aio/ARule34.py

@@ -47,8 +47,10 @@ async def parse_result(post_element):
     return main_post, sample_post, preview_post
 
 class Rule34Api:
+    def __init__(self):
+        self.header = {'User-Agent': 'rule34-simple-api 0.1.5.3 (Request)'}
     async def get_post_count(self, tags: str = '') -> int:
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(headers=self.header) as session:
             async with session.get(f'https://api.rule34.xxx/index.php?'
                                    f'page=dapi&s=post&q=index&tags={tags}') as response:
                 xml_data = await response.text()
@@ -60,7 +62,7 @@ class Rule34Api:
     async def get_post(self, id: int):
         st = time.time()
 
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(headers=self.header) as session:
             async with session.get(f'https://api.rule34.xxx/index.php?'
                                    f'page=dapi&s=post&q=index&id={id}') as response:
                 xml_data = await response.text()
@@ -113,14 +115,19 @@ class Rule34Api:
         st = time.time()
 
         request_count = 1
+        true_count = count*20
 
         post_list = []
 
-        if count > 1000:
-            request_count = count // 1000
+        if true_count > 1000:
+            request_count = true_count // 1000
+
+        post_count = await self.get_post_count(tags)
+        page_id = int(random.randint(0, int(post_count / true_count)) / 8)  if post_count >= true_count else 0
 
         for pid in range(request_count + 1):
-            post_list += await self.get_post_list(tags=tags, forbidden_tags=forbidden_tags)
+            post_list += await self.get_post_list(tags=tags, forbidden_tags=forbidden_tags,
+                                                  page_id=page_id, limit=true_count if true_count <= 1000 else 1000)
 
         getted = []
 
@@ -136,7 +143,7 @@ class Rule34Api:
 
     async def get_post_list(self, limit: int = 1000, page_id: int = 0, tags: str = '', forbidden_tags: list[str] = [])\
             -> list[Rule34PostData]:
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(headers=self.header) as session:
             if limit > 1000:
                 raise ToBigRequestException(f"The max size of request is 1000 when you tried to request {limit}")
 

SimpleRule34/aio/types.py

@@ -1,4 +1,6 @@
 import typing
+
+import aiofiles
 import aiohttp
 import os
 import datetime
@@ -34,8 +36,8 @@ class Rule34Post:
 
                     file_name = os.path.basename(self.url)
                     save_path = os.path.join(path, file_name)
-                    with open(save_path, 'wb') as file:
-                        file.write(await response.read())
+                    with aiofiles.open(save_path, 'wb') as file:
+                        await file.write(await response.read())
 
                     return save_path
                 else:

SimpleRule34/types.py

@@ -6,9 +6,9 @@ from .utils import get_file_type, get_file_size
 
 
 class Rule34Post:
-    def __init__(self, height: int, width: int, url: str, id: int, session: requests.Session):
+    def __init__(self, height: int, width: int, url: str, id: int):
         self.path = r'./rule34_download'
-        self.s = session
+        self.s = requests.Session()
 
         self.height = height
         self.width = width
@@ -49,8 +49,8 @@ class Rule34Post:
 class Rule34MainPost(Rule34Post):
     def __init__(self, score: int, rating: str, creator_id: int, tags: str, has_children: bool,
                  created_date: datetime.datetime, status: str, source: str, has_notes: bool, has_comments: bool,
-                 height: int, width: int, url: str, id: int, s):
-        super().__init__(height, width, url, id, s)
+                 height: int, width: int, url: str, id: int):
+        super().__init__(height, width, url, id)
         self.score = score
         self.rating = rating
         self.creator_id = creator_id

{simple_rule34-0.1.5.1.dist-info → simple_rule34-0.1.5.4.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
-Name: simple-rule34
-Version: 0.1.5.1
+Name: simple_rule34
+Version: 0.1.5.4
 Summary: Simple api wrapper of rule34.xxx for python with asynchronous support
 Author-email: StarMan12 <author@example.com>
-Project-URL: Homepage, https://github.com/Loshok229/rule34-simple-api
-Project-URL: Bug Tracker, https://github.com/Loshok229/rule34-simple-api/issues
+Project-URL: Homepage, https://github.com/SyperAlexKomp/simple-rule34-api
+Project-URL: Bug Tracker, https://github.com/SyperAlexKomp/simple-rule34-api/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

simple_rule34-0.1.5.4.dist-info/RECORD

@@ -0,0 +1,14 @@
+SimpleRule34/Rule34.py,sha256=3eMo_5a20g8eQVlSwm3EBJVZVlxdiB354EejMRWnqMs,7136
+SimpleRule34/__init__.py,sha256=C4IbcJ_rjqBhpENXImVGuEQxf81GUwNaycqNNAY_ROc,31
+SimpleRule34/exceptions.py,sha256=8MbvBbdb254UaYWfPg3xo_GbSDO6L9iI0d2AFaet9AM,354
+SimpleRule34/setup.py,sha256=7hNDTD52EAs7W00-Nd5LzvH8H4-Dvc59W8a999LqvW4,735
+SimpleRule34/types.py,sha256=PpIHfMlFfRvXAZ_0Seaj9HJH6f_9JpJHCELIoSbeyuo,3278
+SimpleRule34/utils.py,sha256=lVbM6w2z9QwdOhVpff4q73_DfPLxDEXPVlxI2M6aK6I,854
+SimpleRule34/aio/ARule34.py,sha256=nZwxmMNo_g_a16U9dJmxFGUIkDtgNB-W0uFH8LJ8tSI,6858
+SimpleRule34/aio/types.py,sha256=XvhZAYG7AzrT2iKRVlXGwS_EIqrn406vG7P2OnPfcx8,3713
+SimpleRule34/aio/utils.py,sha256=fWx-ntJ672NoktH5Ws9-FcO0gtCNVmd8VfxFxjWqsD0,616
+simple_rule34-0.1.5.4.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+simple_rule34-0.1.5.4.dist-info/METADATA,sha256=23_XOZltBacTOjrNr1vyGPLYGr7FwneROn_kRmEBaE4,2089
+simple_rule34-0.1.5.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simple_rule34-0.1.5.4.dist-info/top_level.txt,sha256=IrrcPxvAx-V0ikmhRaLYkjYt-hZ9SRGTcUdtAcbMzGE,13
+simple_rule34-0.1.5.4.dist-info/RECORD,,

{simple_rule34-0.1.5.1.dist-info → simple_rule34-0.1.5.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

simple_rule34-0.1.5.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-SimpleRule34/Rule34.py,sha256=3eMo_5a20g8eQVlSwm3EBJVZVlxdiB354EejMRWnqMs,7136
-SimpleRule34/__init__.py,sha256=C4IbcJ_rjqBhpENXImVGuEQxf81GUwNaycqNNAY_ROc,31
-SimpleRule34/exceptions.py,sha256=8MbvBbdb254UaYWfPg3xo_GbSDO6L9iI0d2AFaet9AM,354
-SimpleRule34/setup.py,sha256=7hNDTD52EAs7W00-Nd5LzvH8H4-Dvc59W8a999LqvW4,735
-SimpleRule34/types.py,sha256=kkdd__XAC3-7rvmekfNnwudM8Lhqmk0914xAcgII1Eg,3300
-SimpleRule34/utils.py,sha256=lVbM6w2z9QwdOhVpff4q73_DfPLxDEXPVlxI2M6aK6I,854
-SimpleRule34/aio/ARule34.py,sha256=cUFEqDL84qCQ3R9B3W-75l7Cu9st21GbcExvkqvENh0,6372
-SimpleRule34/aio/types.py,sha256=1FvHd8ZXaUu6hoJIptPbBTXCPgZlk6MlOyR7CQWhxvQ,3679
-SimpleRule34/aio/utils.py,sha256=fWx-ntJ672NoktH5Ws9-FcO0gtCNVmd8VfxFxjWqsD0,616
-simple_rule34-0.1.5.1.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-simple_rule34-0.1.5.1.dist-info/METADATA,sha256=jiap6exu3JxysMG8MRHdwRJ2z0-xZ5ncm_X6K1fZ6iw,2081
-simple_rule34-0.1.5.1.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-simple_rule34-0.1.5.1.dist-info/top_level.txt,sha256=IrrcPxvAx-V0ikmhRaLYkjYt-hZ9SRGTcUdtAcbMzGE,13
-simple_rule34-0.1.5.1.dist-info/RECORD,,