Merge pull request #136 from hentai-chan/rec-hentai

v3.2.8

Author: hentai-chan

.editorconfig

@@ -0,0 +1,19 @@
+root = true
+
+[*]
+indent_style = 4
+indent_style = tab
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespaces = true
+insert_final_newline = true
+max_line_length = 160
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+indent_size = 4

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## Version 3.2.8 (28 Aug 2021)
+
+The log file path has been changed to a new, platform-specific location which is
+accessible via code through the `get_logfile_path` method. Page objects now also
+implement a download method which makes it possible to download individual pages:
+
+```python
+from hentai import Hentai
+doujin = Hentai(177013)
+
+# download the last page to the CWD
+doujin.pages[-1].download(doujin.handler)
+```
+
+Another noticeably change took place in the download method of `Hentai` objects:
+The `zip` option has been renamed to `zip_dir` to prevent conflicts with the built-in
+`zip` method from the Python standard library. On top of all of that, its implementation
+has also changed: archives created as a result of this operation use a `.zip` extension
+on Windows platforms (as it already did previously), and `.tar.gz` on macOS and
+Linux platforms (which is what's new). It also uses a more aggressive compression
+configuration, which makes for smaller archives but also increases the overall
+execution time.
+
+Additionally, a bug related to the previous implementation has been fixed
+by Shikanime Deva (<deva.shikanime@protonmail.com>) that was also caused by the
+(former) `zip` option in which the download directory was not properly cleaned up
+afterwards.
+
+The `--verbose` option in the CLI is now turned on by default. You can revert this
+change by using the `--no-verbose` flag to run this command in scripts silently.
+
+Last but not least, the underlying `RequestHandler` class experienced a few minor
+optimizations which also affects the `Hentai` class.
+
 ## Version 3.2.7 (29 June 2021)
 
 Makes the `Hentai` class hashable and changes the return type of some methods from

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://hentaichan.pythonanywhere.com/projects/hentai" title="Project Logo">
+  <a href="https://www.hentai-chan.dev/projects/hentai" title="Project Logo">
     <img height="150" style="margin-top:15px" src="https://raw.githubusercontent.com/hentai-chan/hentai/master/docs/hentai.svg">
   </a>
 </p>
@@ -164,7 +164,7 @@ doujins within the terminal:
 hentai --help
 
 # download this doujin to the CWD
-hentai --verbose download --id 177013
+hentai download --id 177013
 
 # check the module version
 hentai --version

README.zh.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://hentaichan.pythonanywhere.com/projects/hentai" title="Project Logo">
+  <a href="https://www.hentai-chan.dev/projects/hentai" title="Project Logo">
     <img height="150" style="margin-top:15px" src="https://raw.githubusercontent.com/hentai-chan/hentai/master/docs/hentai.svg">
   </a>
 </p>
@@ -155,7 +155,7 @@ Utils.export(popular_loli, filename=Path('popular_loli.json'), options=custom)
 hentai --help
 
 # 将此同人下载到CWD
-hentai --verbose download --id 177013
+hentai download --id 177013
 
 # 查看模组版本
 hentai --version

requirements/release.txt

@@ -1,2 +1,2 @@
-tqdm==4.61.1
-requests==2.25.1
+tqdm==4.62.2
+requests==2.26.0

src/hentai/__init__.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import argparse
+import errno
 import sys
 from pathlib import Path
 
@@ -16,7 +17,7 @@ def main():
     parser._optionals.title = 'Arguments'
 
     parser.add_argument('-v', '--version', action='version', version=f"%(prog)s {__version__}")
-    parser.add_argument('-V', '--verbose', action='store_true', help="increase output verbosity")
+    parser.add_argument('-V', '--verbose', default=True, action=argparse.BooleanOptionalAction, help="increase output verbosity")
 
     subparser = parser.add_subparsers(dest='command')
 
@@ -28,7 +29,7 @@ def main():
     preview_parser.add_argument('--id', type=int, nargs='+', required=True, help="magic number")
 
     args = parser.parse_args()
-    
+
     if args.command == 'download':
         count = len(args.id)
         for id_ in args.id:
@@ -38,9 +39,9 @@ def main():
             except HTTPError as error:
                 print(f"\033[31mDownloadError:\033[0m {error}", file=sys.stderr)
                 count -= 1
-        if count: print(f"Stored {count} doujin{'s' if count > 1 else ''} in {str(args.dest)!r}")
-
-    if args.command == 'preview':
+        if count:
+            print(f"Stored {count} doujin{'s' if count > 1 else ''} in {str(args.dest)!r}")
+    elif args.command == 'preview':
         for id_ in args.id:
             try:
                 doujin = Hentai(id_)
@@ -50,6 +51,9 @@ def main():
                 print(f"pages:\t{doujin.num_pages}", end='\n\n' if id_ != len(args.id) else '')
             except HTTPError as error:
                 print(f"\033[31mPreviewError:\033[0m {error}", file=sys.stderr)
+    else:
+        parser.print_help(sys.stderr)
+        sys.stderr(errno.EINVAL)
 
 if __name__ == '__main__':
     main()