simple-rule34 0.1.5.1__tar.gz → 0.1.5.4__tar.gz

simple_rule34-0.1.5.4/PKG-INFO

@@ -0,0 +1,55 @@
+Metadata-Version: 2.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/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
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohttp==3.8.4
+Requires-Dist: aiosignal==1.3.1
+Requires-Dist: alabaster==0.7.13
+Requires-Dist: async-timeout==4.0.2
+Requires-Dist: attrs==23.1.0
+Requires-Dist: Babel==2.9.1
+Requires-Dist: build==0.10.0
+Requires-Dist: certifi==2023.5.7
+Requires-Dist: charset-normalizer==3.2.0
+Requires-Dist: colorama==0.4.6
+Requires-Dist: docopt==0.6.2
+Requires-Dist: docutils==0.18.1
+Requires-Dist: frozenlist==1.4.0
+Requires-Dist: idna==3.4
+Requires-Dist: imagesize==1.4.1
+Requires-Dist: importlib-metadata==6.8.0
+Requires-Dist: Jinja2==3.1.2
+Requires-Dist: MarkupSafe==2.1.3
+Requires-Dist: multidict==6.0.4
+Requires-Dist: packaging==23.1
+Requires-Dist: pipreqs==0.4.13
+Requires-Dist: Pygments==2.15.1
+Requires-Dist: pyproject_hooks==1.0.0
+Requires-Dist: requests==2.31.0
+Requires-Dist: snowballstemmer==2.2.0
+Requires-Dist: Sphinx==6.2.1
+Requires-Dist: sphinx-rtd-theme==1.2.2
+Requires-Dist: sphinxcontrib-applehelp==1.0.4
+Requires-Dist: sphinxcontrib-devhelp==1.0.2
+Requires-Dist: sphinxcontrib-htmlhelp==2.0.1
+Requires-Dist: sphinxcontrib-jquery==4.1
+Requires-Dist: sphinxcontrib-jsmath==1.0.1
+Requires-Dist: sphinxcontrib-qthelp==1.0.3
+Requires-Dist: sphinxcontrib-serializinghtml==1.1.5
+Requires-Dist: tomli==2.0.1
+Requires-Dist: urllib3==2.0.3
+Requires-Dist: yarg==0.1.9
+Requires-Dist: yarl==1.9.2
+Requires-Dist: zipp==3.16.2
+
+# rule34-simple-api
+Simple api wrapper of rule34.xxx for python with asynchronous support

{simple_rule34-0.1.5.1 → simple_rule34-0.1.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simple_rule34"
-version = "0.1.5.1"
+version = "0.1.5.4"
 authors = [
   { name="StarMan12", email="author@example.com" },
 ]
@@ -57,5 +57,5 @@ dependencies = ['aiohttp==3.8.4',
     'zipp==3.16.2']
 
 [project.urls]
-"Homepage" = "https://github.com/Loshok229/rule34-simple-api"
-"Bug Tracker" = "https://github.com/Loshok229/rule34-simple-api/issues"
+"Homepage" = "https://github.com/SyperAlexKomp/simple-rule34-api"
+"Bug Tracker" = "https://github.com/SyperAlexKomp/simple-rule34-api/issues"

{simple_rule34-0.1.5.1 → simple_rule34-0.1.5.4}/src/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}")
 

{simple_rule34-0.1.5.1 → simple_rule34-0.1.5.4}/src/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:

{simple_rule34-0.1.5.1 → simple_rule34-0.1.5.4}/src/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.4/src/simple_rule34.egg-info/PKG-INFO

@@ -0,0 +1,55 @@
+Metadata-Version: 2.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/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
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohttp==3.8.4
+Requires-Dist: aiosignal==1.3.1
+Requires-Dist: alabaster==0.7.13
+Requires-Dist: async-timeout==4.0.2
+Requires-Dist: attrs==23.1.0
+Requires-Dist: Babel==2.9.1
+Requires-Dist: build==0.10.0
+Requires-Dist: certifi==2023.5.7
+Requires-Dist: charset-normalizer==3.2.0
+Requires-Dist: colorama==0.4.6
+Requires-Dist: docopt==0.6.2
+Requires-Dist: docutils==0.18.1
+Requires-Dist: frozenlist==1.4.0
+Requires-Dist: idna==3.4
+Requires-Dist: imagesize==1.4.1
+Requires-Dist: importlib-metadata==6.8.0
+Requires-Dist: Jinja2==3.1.2
+Requires-Dist: MarkupSafe==2.1.3
+Requires-Dist: multidict==6.0.4
+Requires-Dist: packaging==23.1
+Requires-Dist: pipreqs==0.4.13
+Requires-Dist: Pygments==2.15.1
+Requires-Dist: pyproject_hooks==1.0.0
+Requires-Dist: requests==2.31.0
+Requires-Dist: snowballstemmer==2.2.0
+Requires-Dist: Sphinx==6.2.1
+Requires-Dist: sphinx-rtd-theme==1.2.2
+Requires-Dist: sphinxcontrib-applehelp==1.0.4
+Requires-Dist: sphinxcontrib-devhelp==1.0.2
+Requires-Dist: sphinxcontrib-htmlhelp==2.0.1
+Requires-Dist: sphinxcontrib-jquery==4.1
+Requires-Dist: sphinxcontrib-jsmath==1.0.1
+Requires-Dist: sphinxcontrib-qthelp==1.0.3
+Requires-Dist: sphinxcontrib-serializinghtml==1.1.5
+Requires-Dist: tomli==2.0.1
+Requires-Dist: urllib3==2.0.3
+Requires-Dist: yarg==0.1.9
+Requires-Dist: yarl==1.9.2
+Requires-Dist: zipp==3.16.2
+
+# rule34-simple-api
+Simple api wrapper of rule34.xxx for python with asynchronous support

simple_rule34-0.1.5.4/tests/test.py

@@ -0,0 +1,62 @@
+from SimpleRule34.src.SimpleRule34.aio.ARule34 import Rule34Api
+from SimpleRule34.src.SimpleRule34 import Rule34Api
+import asyncio
+
+
+async def main1():
+
+    r = Rule34Api()
+    print("=====ALL 10=====")
+    lis = await r.get_post_list(tags='', limit=10)
+
+    for x in lis:
+        print(x)
+
+    print("=====FIRST 5=====")
+    lis = await r.get_post_list(tags='brawl_stars', limit=5)
+
+    for x in lis:
+        print(x)
+
+    print("=====SECOND 5=====")
+    lis = await r.get_post_list(tags='brawl_stars', limit=5, page_id=1)
+
+    for x in lis:
+        print(x)
+
+    print("=====EDITED=====")
+    post_list_ = await r.get_post_list(tags='brawl_stars', limit=100, page_id=0,
+                                            forbidden_tags=['male'])
+
+    chunk_size = 5
+    for i in range(0, len(post_list_), chunk_size):
+        chunk = post_list_[i:i + chunk_size]
+        print(f"=====CHUNK {i}=====")
+        for x in chunk:
+            print(x)
+    i = 4
+    chunk = post_list_[i:i + chunk_size]
+    print(f"=====CHUNK {i}=====")
+    for x in chunk:
+        print(x)
+
+
+    print("=====TEST=====")
+    original_list = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+
+    chunk_size = 5
+    for i in range(0, len(original_list), chunk_size):
+        print(i)
+        chunk = original_list[i:i + chunk_size]
+        print(chunk)
+
+    return
+
+
+async def main():
+    r = Rule34Api()
+    p = r.get_post(213)
+    print(p)
+
+if __name__ == '__main__':
+    asyncio.run(main())

simple_rule34-0.1.5.1/PKG-INFO

@@ -1,16 +0,0 @@
-Metadata-Version: 2.1
-Name: simple_rule34
-Version: 0.1.5.1
-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
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# rule34-simple-api
-Simple api wrapper of rule34.xxx for python with asynchronous support

simple_rule34-0.1.5.1/src/simple_rule34.egg-info/PKG-INFO

@@ -1,16 +0,0 @@
-Metadata-Version: 2.1
-Name: simple-rule34
-Version: 0.1.5.1
-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
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# rule34-simple-api
-Simple api wrapper of rule34.xxx for python with asynchronous support

simple_rule34-0.1.5.1/tests/test.py

@@ -1,20 +0,0 @@
-from SimpleRule34.src.SimpleRule34.aio.ARule34 import Rule34Api
-import asyncio
-
-
-async def main():
-
-    r = Rule34Api()
-
-    lis = await r.get_post_list(tags='1girl', limit=5, forbidden_tags=['male'])
-
-    print(lis)
-
-    for x in lis:
-        print(x)
-
-    return
-
-
-if __name__ == '__main__':
-    asyncio.run(main())