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

ehentai/__init__.py

@@ -0,0 +1 @@
+from .api import Page,Gallery,get_search,get_popular

ehentai/__version__.py

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

ehentai/api.py

@@ -0,0 +1,32 @@
+from ehentai.fetch import Gallery,Page
+from ehentai.connect import URL, get_sp, keyword
+
+def get_Page(url: str=URL,params=None,encoding: str=None,direct: bool=False)->Page:
+    """
+    Args:
+        url (str, optional): ehentai has the galleries. Defaults to URL.
+        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
+    Returns:
+        Page:
+            attr:gl_table,rangebar,search_text
+    """
+    return Page(get_sp(url,params,encoding,direct))
+
+def get_search(search_content,cats_code=None,rating=None,expunged=None,torrent=None,cats_list=None,**args)->Page:
+    return get_Page(
+        url=URL,
+        params=keyword(
+            f_search=search_content,
+            f_cats=cats_code,
+            f_srdd=rating,
+            f_sh=expunged,
+            f_sto=torrent,
+            cats_list=cats_list
+        ),
+        **args
+    )
+
+def get_popular(**args):
+    return get_Page(url="https://e-hentai.org/popular",**args)

ehentai/connect.py

@@ -0,0 +1,120 @@
+from bs4 import BeautifulSoup
+import time
+from ehentai.conf import CATS
+from curl_cffi import requests
+
+DOMAIN="e-hentai.org"
+URL="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",
+    "Referer":"http://www.google.com",
+}
+
+hosts=["104.20.19.168", "172.67.2.238", "104.20.18.168"]
+
+def get_response(url: str,direct: bool=False,hosts=hosts,headers=headers,params=None,**args)->requests.Response:
+    
+    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):]
+            try:
+                print(url)
+                response = requests.get(
+                    url,
+                    params=params,
+                    impersonate="chrome",
+                    headers=headers,
+                    verify=False,
+                    **args,
+                )
+
+                if response.ok:
+                    return response
+            except requests.exceptions.ConnectionError as e:
+                time.sleep(1)
+                print("fetch again..")
+            except requests.exceptions.ReadTimeout as e:
+                time.sleep(1)
+                print("fetch again..")
+            except Exception as e:
+                time.sleep(1)
+                print("fetch again..")
+
+    return requests.get(url,params=params,headers=headers,impersonate="chrome",timeout=27.03,**args)
+
+def keyword(
+    f_search: str = None,
+    f_cats: int = None,
+    advsearch: bool = None,
+    f_sh: bool = None,
+    f_sto: bool = None,
+    f_spf: int = None,
+    f_spt: int = None,
+    f_srdd: int = None,
+    f_sfl: bool = None,
+    f_sfu: bool = None,
+    f_sft: bool = None,
+    cats_list=None
+):
+    kw={}
+    # search_kw
+    kw["f_search"]=f_search
+    # category
+    if f_cats or cats_list:kw["f_cats"]=get_f_cats(f_cats,cats_list),
+    # advanced search
+    # show advanced options
+    if advsearch or f_sh or f_sto or f_spf or f_spt or f_srdd or f_sfl or f_sfu or f_sft:kw["advsearch"]=1
+    # show expunged galleries
+    if f_sh:kw["f_sh"]="on"
+    # require Gallery torrent
+    if f_sto:kw["f_sto"]="on"
+    # between {f_spf} and {f_spt} Pages
+    if f_spf:kw["f_spf"]=f_spf,
+    if f_spt:kw["f_spt"]=f_spt,
+    # minimum_rating
+    if f_srdd:kw["f_srdd"]=f_srdd,
+    # disable filter language
+    if f_sfl:kw["f_sfl"]="on"
+    # disable filter uploader
+    if f_sfu:kw["f_sfu"]="on"
+    # disable filter tags
+    if f_sft:kw["f_sft"]="on"
+    
+    return kw
+
+
+def next_view(sp: BeautifulSoup):
+    return sp.find('table',class_="ptt").find_all('td')[-1].find('a')
+
+# url:target_URL
+# parms:search_keyword
+def get_sp(url: str,params=None,encoding=None,direct=False)->BeautifulSoup:
+    # set encoding
+    response=get_response(url,direct,params=params)
+
+    if encoding:
+        response.encoding=encoding
+
+    # response info
+    # print(response.encoding)
+    # print(response.url)
+    
+    return BeautifulSoup(response.text,"lxml")
+
+
+# switch categories: doujinshi...
+def get_f_cats(cat_code=None,cats: list=None):
+    cat_code=cat_code if cat_code else 0b0011111111
+    res=0b1111111111
+    if cats:
+        for v in list(i.value for i in cats):
+            res&=v
+        return res
+    
+    for v in list(i.value for i in CATS):
+        if cat_code&1:res&=v
+        cat_code>>=1
+    return res

ehentai/eh.py

@@ -1,15 +1,14 @@
 import sys
-import pickle
 import os
 import json
 import click
 import json
 from click import echo
 from typing import List
-from ehentai.fetch import get_sp,Page,Gallery,url
-from ehentai import fetch
 from ehentai.conf import *
 from ehentai import __version__
+from ehentai import Page,Gallery,get_search,get_popular
+
 HOME=os.path.abspath(os.path.join(os.getenv('HOME'),".hentai"))
 
 if not os.path.exists(HOME):
@@ -40,12 +39,6 @@ page: Page
 @click.group()
 def cli():
     pass
-# testing
-# @cli.command()
-# @click.option('--params','-p',default=None)
-# def t(params):
-#     echo(params if params else "DEFAULT")
-#     pass
 @cli.command(help="|show the version")
 def version():
     echo(f"""{FONT_COLOR.pink.value}
@@ -59,25 +52,16 @@ def version():
     echo(f"Version: {__version__.__version__}")
     
 @cli.command(help="|search from e-hentai")
-@click.option('--search-text','-s',default="",prompt=True,help="search content,tags")
+@click.option('--search-content','-s',default="",type=str,prompt=True,help="search content,tags")
 @click.option('--cats','-c',default=255,type=int,help="Doujinshi,Manga...")
 @click.option('--rating','-r',default=None,type=int,help="the minium rating")
-@click.option('--show-expunged/--no-show-expunged','-sh',default=False,help="show the removed galleries")
-@click.option('--show-torrent/--no-show-torrent','-sto',default=False,help="filter galleries have torrent")
-def search(search_text,cats,rating,show_expunged,show_torrent):
-    page = Page(
-        get_sp(
-            url,
-            params=fetch.keyword(
-                f_search=search_text,
-                f_cats=fetch.get_f_cats(cats),
-                f_srdd=rating,
-                f_sh=show_expunged,
-                f_sto=show_torrent,
-            ),
-        )
-    )
+@click.option('--show-expunged/--no-show-expunged','-sh/',default=False,help="show the removed galleries")
+@click.option('--show-torrent/--no-show-torrent','-sto/',default=False,help="filter galleries have torrent")
+@click.option('--use-direct/--no-direct','-u',default=False,help="enable this to connect directly")
+def search(search_content,cats,rating,show_expunged,show_torrent,use_direct):
+    page=get_search(search_content,cats,rating,show_expunged,show_torrent,direct=use_direct)
     save_json("page.json",page)
+    print(page)
 
 @cli.command(help="|show the fetched galleries")
 @click.option("--detailed/--no-detailed", "-d/", default=False)
@@ -92,26 +76,31 @@ def list(detailed):
 @click.option('--path','-p',default=None,type=click.Path(),help="download path,default is current directory")
 @click.option('--comment/--no-comment', '-c/',default=False,help="echo the comment of gallery")
 def view(id,download,rename,path,comment):
-    try:
-        page=load_json("page.json",Page)
-        gl=page.gl_table[id]
-        echo(gl)
-        if download:
-            gl.download(name=rename,path=path)
-        elif comment:
-            comment=gl.comment()
-            if comment:
-                for nick,cs in comment:
-                    echo(f"{FONT_STYLE.bold.value}{FONT_COLOR.green.value}{nick}{RESET}")
-                    for c in cs:
-                        echo(f"\t{c}")
-            else:
-                echo("no comments")
-    except Exception:
-        echo(Exception)
-        
+    page=load_json("page.json",Page)
+    gl=page.gl_table[id]
+    echo(gl)
+    if download:
+        gl.download(name=rename,path=path)
+    elif comment:
+        comment=gl.comment()
+        if comment:
+            for nick,cs in comment:
+                echo(f"{FONT_STYLE.bold.value}{FONT_COLOR.green.value}{nick}{RESET}")
+                for c in cs:
+                    echo(f"\t{c}")
+        else:
+            echo("no comments")
+    
 @cli.command(help="|fetch popular galleries")
-def popular():
-    page=Page(get_sp("https://e-hentai.org/popular"))
+@click.option('--use-direct/--no-direct','-u',default=False,help="enable this to connect directly")
+def popular(use_direct):
+    page=get_popular(direct=use_direct)
     echo(f"Currently Popular Recent Galleries:{len(page.gl_table)}")
-    save_json("page.json",page)
+    save_json("page.json",page)
+
+# testing
+@cli.command()
+@click.option('--params','-p',default=None)
+def t(params):
+    echo(params if params else "DEFAULT")
+    pass

ehentai/fetch.py

@@ -1,9 +1,7 @@
-import json
-import requests
-import chardet
 from bs4 import BeautifulSoup
 import os
-from ehentai.conf import *
+from ehentai.conf import FONT_STYLE,CATS_BG_COLOR,RESET
+from ehentai.connect import get_sp,next_view,get_response
 # book
 class Gallery:
     name=""#名字
@@ -25,7 +23,7 @@ class Gallery:
     def __repr__(self):
         return f"<{self.name}>"
     
-    def download(self,name=None,path=None,img_suffix="webp",show=True):
+    def download(self,name=None,path=None,img_suffix="webp",show=True,chunk_size=8192):
         if show:
             print("fetching the URL...")
         path=path if path else "./"
@@ -43,7 +41,7 @@ class Gallery:
             print(f"Totals:{totals}")
 
         fdir=os.path.join(path,name if name else self.name)
-        os.makedirs(fdir)
+        os.makedirs(fdir) if not os.path.exists(fdir) else None
 
         for i,v in enumerate(images):
 
@@ -51,10 +49,13 @@ class Gallery:
                 print(f"Downloading...{i+1}/{totals}")
 
             img_src=get_sp(v).find('img',id="img").get('src')
-            img=requests.get(img_src,headers=headers)
+            img=get_response(img_src,stream=True)
             with open(os.path.join(fdir,f"{i}.{img_suffix}"),"wb") as f:
-                f.write(img.content)
-        
+                for chunk in img.iter_content(chunk_size=chunk_size):
+                    if chunk:
+                        f.write(chunk)
+                        f.flush()
+            
         if show:
             print("Completed!!")
     
@@ -123,77 +124,3 @@ class Page:
                     tags=list(map(lambda x:x.get('title'),td[2].find_all('div',class_="gt"))),
                     s_tags=list(map(lambda x:x.get_text(),td[2].find_all('div',class_="gt"))),
                 ))
-
-
-def keyword(
-    f_search: str = None,
-    f_cats: int = None,
-    advsearch: bool = None,
-    f_sh: bool = None,
-    f_sto: bool = None,
-    f_spf: int = None,
-    f_spt: int = None,
-    f_srdd: int = None,
-    f_sfl: bool = None,
-    f_sfu: bool = None,
-    f_sft: bool = None,
-):
-
-    return {
-        # search_kw
-        "f_search":f_search,
-        # category
-        "f_cats":f_cats,
-        # advanced search
-        # show advanced options
-        "advsearch":1 if advsearch or f_sh or f_sto or f_spf or f_spt or f_srdd or f_sfl or f_sfu or f_sft else None,
-        # show expunged galleries
-        "f_sh":"on" if f_sh else None,
-        # require Gallery torrent
-        "f_sto":"on" if f_sto else None,
-        # between {f_spf} and {f_spt} Pages
-        "f_spf":f_spf,
-        "f_spt":f_spt,
-        # minimum_rating
-        "f_srdd":f_srdd,
-        # disable filter language
-        "f_sfl":"on" if f_sfl else None,
-        # disable filter uploader
-        "f_sfu":"on" if f_sfu else None,
-        # disable filter tags
-        "f_sft":"on" if f_sft else None,
-    }
-
-
-def next_view(sp: BeautifulSoup):
-    return sp.find('table',class_="ptt").find_all('td')[-1].find('a')
-
-# url:target_URL
-# parms:search_keyword
-def get_sp(url: str,params=None,encoding=None):
-    # set encoding
-    respone=requests.get(url,headers=headers,params=params)
-    if encoding:
-        respone.encoding=encoding
-    else:
-        encoding=chardet.detect(respone.content)["encoding"]
-        respone.encoding=encoding
-
-    return BeautifulSoup(respone.text,"lxml")
-
-
-# switch categories: doujinshi...
-def get_f_cats(cat_code=0b0011111111):
-    res=0b1111111111
-    for v in list(i.value for i in CATS):
-        if cat_code&1:res&=v
-        cat_code>>=1
-    return res
-
-
-url="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",
-    "Referer":"http://www.google.com",
-}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ehentai
-Version: 0.1
+Version: 0.2.1
 Summary: Python for viewing e-hentai
 Home-page: https://github.com/Homoarea/hentai
 Author: Homoarea
@@ -11,8 +11,7 @@ Requires-Python: >=3.8
 License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: click
-Requires-Dist: requests
-Requires-Dist: chardet
+Requires-Dist: curl_cffi
 Requires-Dist: beautifulsoup4
 Requires-Dist: lxml
 Dynamic: author

ehentai-0.2.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+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,,

ehentai-0.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-ehentai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ehentai/__version__.py,sha256=2XCu8UZLyjNvRbALSQFtl0-zvouEuBrV0xP5dRAzbjc,1010
-ehentai/conf.py,sha256=_58VU-o5T4k7X1bHLNp_iZXimj9T-JOYYP6PPmeIaFA,1115
-ehentai/eh.py,sha256=qjsFVX0HMis5LoEn1u_N2XkUHj0cQa3ptXUu5cPkbPU,4612
-ehentai/fetch.py,sha256=-WdjNDgww3XW6ogUyuYelcvOOYiFM9wyInRL_gbSg5U,6721
-ehentai-0.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ehentai-0.1.dist-info/licenses/NOTICE,sha256=mTsYLHfcXGcFMSSdkQX-LbKWxxieIA2L4sMNXitGN4k,30
-ehentai-0.1.dist-info/METADATA,sha256=3sUpjIYwJWrZPxOYQ57uBQT_Ck7l70juRAywBdRW5oc,626
-ehentai-0.1.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-ehentai-0.1.dist-info/entry_points.txt,sha256=lc9qUbtXSHccaXX_CLtlh605pt2r3zfw6Lbuem3mQO8,38
-ehentai-0.1.dist-info/top_level.txt,sha256=NzB7Gi8Sxv8D3VNP4b9wiNdC-zQ4yntM0Uo9TAXnScE,8
-ehentai-0.1.dist-info/RECORD,,