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

ehentai/__version__.py

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

ehentai/connect.py

@@ -15,7 +15,7 @@ headers={
 
 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:
+def get_response(url: str,direct: bool=False,hosts=hosts,headers=headers,params=None,timeout=6.1,**args)->requests.Response:
     
     if not direct:
         for ip in hosts:
@@ -30,6 +30,7 @@ def get_response(url: str,direct: bool=False,hosts=hosts,headers=headers,params=
                     impersonate="chrome",
                     headers=headers,
                     verify=False,
+                    timeout=timeout,
                     **args,
                 )
 
@@ -37,15 +38,18 @@ def get_response(url: str,direct: bool=False,hosts=hosts,headers=headers,params=
                     return response
             except requests.exceptions.ConnectionError as e:
                 time.sleep(1)
-                print("fetch again..")
+                print("fetch again..",type(e))
+            except requests.exceptions.RequestException as e:
+                time.sleep(1)
+                print("fetch again..",type(e))
             except requests.exceptions.ReadTimeout as e:
                 time.sleep(1)
-                print("fetch again..")
+                print("fetch again..",type(e))
             except Exception as e:
                 time.sleep(1)
-                print("fetch again..")
+                print("fetch again..",type(e))
 
-    return requests.get(url,params=params,headers=headers,impersonate="chrome",timeout=27.03,**args)
+    return requests.get(url,params=params,headers=headers,impersonate="chrome",timeout=timeout,**args)
 
 def keyword(
     f_search: str = None,
@@ -65,7 +69,7 @@ def keyword(
     # search_kw
     kw["f_search"]=f_search
     # category
-    if f_cats or cats_list:kw["f_cats"]=get_f_cats(f_cats,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
@@ -94,9 +98,9 @@ def next_view(sp: BeautifulSoup):
 # 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)
 
+    # set encoding
     if encoding:
         response.encoding=encoding
 

ehentai/eh.py

@@ -1,6 +1,3 @@
-import sys
-import os
-import json
 import click
 import json
 from click import echo
@@ -8,11 +5,7 @@ from typing import List
 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):
-    os.makedirs(HOME)
+from ehentai.utils import save_Page,load_Page
 
 def echo_gl_table(detail=False,gl_table: List[Gallery]=None):
     if gl_table:
@@ -25,16 +18,11 @@ def echo_gl_table(detail=False,gl_table: List[Gallery]=None):
     else:
         echo("Page's Gallery Table is None.")
 
-
-def save_json(filename: str,data: object):
-    with open(os.path.join(HOME,filename),"w") as f:
-        f.write(json.dumps(data,default=lambda obj:obj.__dict__))
-def load_json(filename: str,data_type):
-    with open(os.path.join(HOME,filename),"r") as f:
-        return data_type(**json.loads(f.read()))
-
-page: Page
-
+def echo_gl_comment(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}")
 
 @click.group()
 def cli():
@@ -52,21 +40,20 @@ def version():
     echo(f"Version: {__version__.__version__}")
     
 @cli.command(help="|search from e-hentai")
-@click.option('--search-content','-s',default="",type=str,prompt=True,help="search content,tags")
+@click.argument('search-content',default="")
 @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")
-@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)
+def search(search_content,cats,rating,show_expunged,show_torrent):
+    page=get_search(search_content,cats,rating,show_expunged,show_torrent)
+    save_Page(page)
     print(page)
 
 @cli.command(help="|show the fetched galleries")
 @click.option("--detailed/--no-detailed", "-d/", default=False)
 def list(detailed):
-    page=load_json("page.json",Page)
+    page=load_Page()
     echo_gl_table(detailed,page.gl_table)
 
 @cli.command(help="|show and operate the gallery")
@@ -77,7 +64,7 @@ def list(detailed):
 @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,stream,comment):
-    page=load_json("page.json",Page)
+    page=load_Page()
     gl=page.gl_table[id]
     echo(gl)
     if download:
@@ -85,19 +72,15 @@ def view(id,download,rename,path,stream,comment):
     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}")
+            echo_gl_comment(comment)
         else:
             echo("no comments")
     
 @cli.command(help="|fetch popular galleries")
-@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)
+def popular():
+    page=get_popular()
     echo(f"Currently Popular Recent Galleries:{len(page.gl_table)}")
-    save_json("page.json",page)
+    save_Page(page)
 
 # testing
 # @cli.command()

ehentai/utils.py

@@ -0,0 +1,38 @@
+import json
+import os
+from PIL import Image
+import platform
+from ehentai.api import get_Page,Page
+
+# home path
+HOME:str
+match platform.system():
+    case 'Windows':HOME=os.path.abspath(os.path.join(os.getenv('TEMP'),".hentai"))
+    case _:HOME=os.path.abspath(os.path.join(os.getenv('HOME'),".cache",".hentai"))
+
+# json data
+if not os.path.exists(HOME):
+    os.makedirs(HOME)
+def save_json(filename: str,data: object):
+    with open(os.path.join(HOME,filename),"w") as f:
+        f.write(json.dumps(data,default=lambda obj:obj.__dict__))
+def load_json(filename: str,data_type):
+    with open(os.path.join(HOME,filename),"r") as f:
+        return data_type(**json.loads(f.read()))
+
+# page
+def load_Page()->Page:
+        return load_json("page.json",Page)
+def save_Page(page):
+    save_json("page.json",page)
+    
+if not os.path.exists(os.path.join(HOME,"page.json")):
+    save_Page(get_Page())
+
+# args:list[Image]
+def merge_img():
+    pass
+
+# args:list[Image]
+def img2pdf():
+    pass

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ehentai
-Version: 0.2.2
+Version: 0.2.4
 Summary: Python for viewing e-hentai
 Home-page: https://github.com/Homoarea/hentai
 Author: Homoarea
@@ -14,6 +14,7 @@ Requires-Dist: click
 Requires-Dist: curl_cffi
 Requires-Dist: beautifulsoup4
 Requires-Dist: lxml
+Requires-Dist: pillow
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

ehentai-0.2.4.dist-info/RECORD

@@ -0,0 +1,15 @@
+ehentai/__init__.py,sha256=2nj4ZQ3qwERHMUCSE1S0I3wy0mDkCNwCxeSFk-QMZo4,52
+ehentai/__version__.py,sha256=GguDToFIlSErZW130csurvT_XQLqtPKqYRqftig6Zww,1012
+ehentai/api.py,sha256=IGCwJiGgQBu9Q0XNJb4_vbNsO7VPOzx31KkqQC2FmtI,1123
+ehentai/conf.py,sha256=_58VU-o5T4k7X1bHLNp_iZXimj9T-JOYYP6PPmeIaFA,1115
+ehentai/connect.py,sha256=CgcSpTuOD-XV3cyGCSxa-4ib9xsyvorGCMLqDHZrmvY,3823
+ehentai/eh.py,sha256=4SmiWm0cCx5gA2L7ao3fAVVXw8-Qxbn-0iqAz7N5NcY,3885
+ehentai/fetch.py,sha256=UxBFd8FpKXQ3KO746IpA7p3o8B0T7PKDt8ZLpoQ3Zo8,5171
+ehentai/utils.py,sha256=n9W5GMfM_hr0Krq0JfIiAA7q2eu6VmIH1Tplp5jmWQI,983
+ehentai-0.2.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ehentai-0.2.4.dist-info/licenses/NOTICE,sha256=mTsYLHfcXGcFMSSdkQX-LbKWxxieIA2L4sMNXitGN4k,30
+ehentai-0.2.4.dist-info/METADATA,sha256=umcqJwkcmaKEi0jW5_WpU4iFsH1nxqtpB4ER6gVdU4U,628
+ehentai-0.2.4.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+ehentai-0.2.4.dist-info/entry_points.txt,sha256=lc9qUbtXSHccaXX_CLtlh605pt2r3zfw6Lbuem3mQO8,38
+ehentai-0.2.4.dist-info/top_level.txt,sha256=NzB7Gi8Sxv8D3VNP4b9wiNdC-zQ4yntM0Uo9TAXnScE,8
+ehentai-0.2.4.dist-info/RECORD,,

ehentai-0.2.2.dist-info/RECORD

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