ehentai 0.2.1__py2.py3-none-any.whl → 0.2.2__py2.py3-none-any.whl

ehentai/__version__.py

@@ -8,7 +8,7 @@
 """
 __title__="ehentai"
 __description__="Python for viewing e-hentai"
-__version__="0.2.1"
+__version__="0.2.2"
 __url__="https://github.com/Homoarea/hentai"
 __build__=0x3f3f3f
 __author__="Homoarea"

ehentai/api.py

@@ -1,10 +1,10 @@
 from ehentai.fetch import Gallery,Page
-from ehentai.connect import URL, get_sp, keyword
+from ehentai.connect import URL_E, get_sp, keyword
 
-def get_Page(url: str=URL,params=None,encoding: str=None,direct: bool=False)->Page:
+def get_Page(url: str=URL_E,params=None,encoding: str=None,direct: bool=False)->Page:
     """
     Args:
-        url (str, optional): ehentai has the galleries. Defaults to URL.
+        url (str, optional): ehentai has the galleries. Defaults to URL_E.
         params (fetch.keyword, optional): use this to search. Defaults to None.
         encoding (str, optional): 'utf-8'..,use this when encoding is wrong. Defaults to None.
         direct  (bool,optional): enable this to connect directly
@@ -16,7 +16,7 @@ def get_Page(url: str=URL,params=None,encoding: str=None,direct: bool=False)->Pa
 
 def get_search(search_content,cats_code=None,rating=None,expunged=None,torrent=None,cats_list=None,**args)->Page:
     return get_Page(
-        url=URL,
+        url=URL_E,
         params=keyword(
             f_search=search_content,
             f_cats=cats_code,

ehentai/connect.py

@@ -3,12 +3,14 @@ import time
 from ehentai.conf import CATS
 from curl_cffi import requests
 
-DOMAIN="e-hentai.org"
-URL="https://e-hentai.org"
+DOMAIN_E="e-hentai.org"
+URL_E="https://e-hentai.org"
 
 headers={
-    "User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3",
+    "User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
     "Referer":"http://www.google.com",
+    "Accept":"image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8",
+    "Accept-Language":"zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7"
 }
 
 hosts=["104.20.19.168", "172.67.2.238", "104.20.18.168"]
@@ -17,11 +19,11 @@ def get_response(url: str,direct: bool=False,hosts=hosts,headers=headers,params=
     
     if not direct:
         for ip in hosts:
-            if url.find(DOMAIN)!=-1:
-                headers['Host']=DOMAIN
-                url=url[:url.find(DOMAIN)]+ip+url[url.find(DOMAIN)+len(DOMAIN):]
+            if url.find(DOMAIN_E)!=-1:
+                domain=url.split('/')[2]
+                headers['Host']=domain
+                url=f"{url[:url.find(domain)]}{ip}{url[url.find(domain)+len(domain):]}"
             try:
-                print(url)
                 response = requests.get(
                     url,
                     params=params,

ehentai/eh.py

@@ -74,13 +74,14 @@ def list(detailed):
 @click.option('--download/--no-download','-d/',default=False,help="select this to download gallery")
 @click.option('--rename',default=None,type=str,help="rename gallery when download")
 @click.option('--path','-p',default=None,type=click.Path(),help="download path,default is current directory")
+@click.option('--stream/--no-stream','-s/',default=True,type=bool,help="enable stream download")
 @click.option('--comment/--no-comment', '-c/',default=False,help="echo the comment of gallery")
-def view(id,download,rename,path,comment):
+def view(id,download,rename,path,stream,comment):
     page=load_json("page.json",Page)
     gl=page.gl_table[id]
     echo(gl)
     if download:
-        gl.download(name=rename,path=path)
+        gl.download(name=rename,path=path,stream=stream)
     elif comment:
         comment=gl.comment()
         if comment:
@@ -99,8 +100,8 @@ def popular(use_direct):
     save_json("page.json",page)
 
 # testing
-@cli.command()
-@click.option('--params','-p',default=None)
-def t(params):
-    echo(params if params else "DEFAULT")
-    pass
+# @cli.command()
+# @click.option('--params','-p',default=None)
+# def t(params):
+#     echo(params if params else "DEFAULT")
+#     pass

ehentai/fetch.py

@@ -2,6 +2,7 @@ from bs4 import BeautifulSoup
 import os
 from ehentai.conf import FONT_STYLE,CATS_BG_COLOR,RESET
 from ehentai.connect import get_sp,next_view,get_response
+import time
 # book
 class Gallery:
     name=""#名字
@@ -23,7 +24,8 @@ class Gallery:
     def __repr__(self):
         return f"<{self.name}>"
     
-    def download(self,name=None,path=None,img_suffix="webp",show=True,chunk_size=8192):
+    def download(self,name=None,path=None,img_suffix="webp",show=True,stream=True,chunk_size=8192):
+        start_time=time.time()
         if show:
             print("fetching the URL...")
         path=path if path else "./"
@@ -49,15 +51,18 @@ class Gallery:
                 print(f"Downloading...{i+1}/{totals}")
 
             img_src=get_sp(v).find('img',id="img").get('src')
-            img=get_response(img_src,stream=True)
+            img=get_response(img_src,stream=stream)
             with open(os.path.join(fdir,f"{i}.{img_suffix}"),"wb") as f:
-                for chunk in img.iter_content(chunk_size=chunk_size):
-                    if chunk:
-                        f.write(chunk)
-                        f.flush()
+                if stream:
+                    for chunk in img.iter_content(chunk_size=chunk_size):
+                        if chunk:
+                            f.write(chunk)
+                            f.flush()
+                else:
+                    f.write(img.content)
             
         if show:
-            print("Completed!!")
+            print(f"Completed!! consum:{time.time()-start_time}")
     
     # @return:list(author,list[str])
     def comment(self):

{ehentai-0.2.1.dist-info → ehentai-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ehentai
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python for viewing e-hentai
 Home-page: https://github.com/Homoarea/hentai
 Author: Homoarea

ehentai-0.2.2.dist-info/RECORD

@@ -0,0 +1,14 @@
+ehentai/__init__.py,sha256=2nj4ZQ3qwERHMUCSE1S0I3wy0mDkCNwCxeSFk-QMZo4,52
+ehentai/__version__.py,sha256=kgvFd5p-NAoTPoLjOlA4IFV8peVOaT53_w6zhX5i8sQ,1012
+ehentai/api.py,sha256=IGCwJiGgQBu9Q0XNJb4_vbNsO7VPOzx31KkqQC2FmtI,1123
+ehentai/conf.py,sha256=_58VU-o5T4k7X1bHLNp_iZXimj9T-JOYYP6PPmeIaFA,1115
+ehentai/connect.py,sha256=AdmYBewqvCSMs-satHwB33BGbZOaYAmxq9M762NK5ss,3632
+ehentai/eh.py,sha256=Ju4jgWXaoRf_XzlzwJh_14SlPpVRNZ1L4DMnWBk0nbY,4613
+ehentai/fetch.py,sha256=UxBFd8FpKXQ3KO746IpA7p3o8B0T7PKDt8ZLpoQ3Zo8,5171
+ehentai-0.2.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ehentai-0.2.2.dist-info/licenses/NOTICE,sha256=mTsYLHfcXGcFMSSdkQX-LbKWxxieIA2L4sMNXitGN4k,30
+ehentai-0.2.2.dist-info/METADATA,sha256=VuIX9XRzY1zRJWjXS6Cghfc4GhcqoMGY5sUEqpU8Woc,606
+ehentai-0.2.2.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+ehentai-0.2.2.dist-info/entry_points.txt,sha256=lc9qUbtXSHccaXX_CLtlh605pt2r3zfw6Lbuem3mQO8,38
+ehentai-0.2.2.dist-info/top_level.txt,sha256=NzB7Gi8Sxv8D3VNP4b9wiNdC-zQ4yntM0Uo9TAXnScE,8
+ehentai-0.2.2.dist-info/RECORD,,

ehentai-0.2.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-ehentai/__init__.py,sha256=2nj4ZQ3qwERHMUCSE1S0I3wy0mDkCNwCxeSFk-QMZo4,52
-ehentai/__version__.py,sha256=tEY2wJZdUS7tYb5RmztuKRSgueXqaNjuVbuxO-E1h0A,1012
-ehentai/api.py,sha256=pSZUt_tYSyKz4HLVAvfrrNilRWjUnh7qIaLUTjUPruw,1115
-ehentai/conf.py,sha256=_58VU-o5T4k7X1bHLNp_iZXimj9T-JOYYP6PPmeIaFA,1115
-ehentai/connect.py,sha256=65ZXrWIZkBk6IhMqBHpXKMJmR5L2ARFZGCTrNhEESbQ,3467
-ehentai/eh.py,sha256=bkwYJF3mW1Vk5WxupvREWp0imKWTXSdH356aQBr5uBo,4485
-ehentai/fetch.py,sha256=UsSKZLem3RwCsPJi4KO5sRnHjK6TYpDzD6UZJ0_j3EY,4975
-ehentai-0.2.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ehentai-0.2.1.dist-info/licenses/NOTICE,sha256=mTsYLHfcXGcFMSSdkQX-LbKWxxieIA2L4sMNXitGN4k,30
-ehentai-0.2.1.dist-info/METADATA,sha256=7CaX-ZL_IcECJZlBaOfONVDyPDvVTwr2R8Vm9TtBG_E,606
-ehentai-0.2.1.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-ehentai-0.2.1.dist-info/entry_points.txt,sha256=lc9qUbtXSHccaXX_CLtlh605pt2r3zfw6Lbuem3mQO8,38
-ehentai-0.2.1.dist-info/top_level.txt,sha256=NzB7Gi8Sxv8D3VNP4b9wiNdC-zQ4yntM0Uo9TAXnScE,8
-ehentai-0.2.1.dist-info/RECORD,,