fix bug of proxy while downloading doujinshi

Changed write_comic_info from False to True

README.rst

@@ -67,6 +67,15 @@ Set your nhentai cookie against captcha:
 
 **NOTE**: The format of the cookie is `"csrftoken=TOKEN; sessionid=ID"`
 
+| To get csrftoken and sessionid, first login to your nhentai account in web browser, then:
+| (Chrome) |ve| |ld| More tools    |ld| Developer tools     |ld| Application |ld| Storage |ld| Cookies |ld| https://nhentai.net
+| (Firefox) |hv| |ld| Web Developer |ld| Web Developer Tools                  |ld| Storage |ld| Cookies |ld| https://nhentai.net
+| 
+
+.. |hv| unicode:: U+2630 .. https://www.compart.com/en/unicode/U+2630
+.. |ve| unicode:: U+22EE .. https://www.compart.com/en/unicode/U+22EE
+.. |ld| unicode:: U+2014 .. https://www.compart.com/en/unicode/U+2014
+
 Download specified doujinshi:
 
 .. code-block:: bash

nhentai/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.4.14'
+__version__ = '0.4.15'
 __author__ = 'RicterZ'
 __email__ = 'ricterzheng@gmail.com'

nhentai/command.py

@@ -65,11 +65,11 @@ def main():
     if options.is_download and doujinshis:
         doujinshi_ids = [i['id'] for i in doujinshis]
 
-        if options.is_save_download_history:
-            with DB() as db:
-                data = map(int, db.get_all())
+    if options.is_save_download_history:
+        with DB() as db:
+            data = map(int, db.get_all())
 
-            doujinshi_ids = list(set(doujinshi_ids) - set(data))
+        doujinshi_ids = list(set(map(int, doujinshi_ids)) - set(data))
 
     if doujinshi_ids:
         for i, id_ in enumerate(doujinshi_ids):

nhentai/constant.py

@@ -29,10 +29,16 @@ NHENTAI_HOME = os.path.join(os.getenv('HOME', tempfile.gettempdir()), '.nhentai'
 NHENTAI_HISTORY = os.path.join(NHENTAI_HOME, 'history.sqlite3')
 NHENTAI_CONFIG_FILE = os.path.join(NHENTAI_HOME, 'config.json')
 
-
 CONFIG = {
     'proxy': {'http': '', 'https': ''},
     'cookie': '',
     'language': '',
     'template': '',
 }
+
+LANGUAGEISO ={
+    'english' : 'en',
+    'chinese' : 'zh',
+    'japanese' : 'ja',
+    'translated' : 'translated'
+}

nhentai/downloader.py

@@ -14,6 +14,7 @@ try:
 except ImportError:
     from urlparse import urlparse
 
+from nhentai import constant
 from nhentai.logger import logger
 from nhentai.parser import request
 from nhentai.utils import Singleton
@@ -34,7 +35,7 @@ class Downloader(Singleton):
         self.timeout = timeout
         self.delay = delay
 
-    def download_(self, url, folder='', filename='', retried=0):
+    def download_(self, url, folder='', filename='', retried=0, proxy=None):
         if self.delay:
             time.sleep(self.delay)
         logger.info('Starting to download {0} ...'.format(url))
@@ -51,7 +52,7 @@ class Downloader(Singleton):
                 i = 0
                 while i < 10:
                     try:
-                        response = request('get', url, stream=True, timeout=self.timeout)
+                        response = request('get', url, stream=True, timeout=self.timeout, proxies=proxy)
                         if response.status_code != 200:
                             raise NHentaiImageNotExistException
 
@@ -77,7 +78,8 @@ class Downloader(Singleton):
         except (requests.HTTPError, requests.Timeout) as e:
             if retried < 3:
                 logger.warning('Warning: {0}, retrying({1}) ...'.format(str(e), retried))
-                return 0, self.download_(url=url, folder=folder, filename=filename, retried=retried+1)
+                return 0, self.download_(url=url, folder=folder, filename=filename,
+                                         retried=retried+1, proxy=proxy)
             else:
                 return 0, None
 
@@ -128,7 +130,7 @@ class Downloader(Singleton):
         else:
             logger.warning('Path \'{0}\' already exist.'.format(folder))
 
-        queue = [(self, url, folder) for url in queue]
+        queue = [(self, url, folder, constant.CONFIG['proxy']) for url in queue]
 
         pool = multiprocessing.Pool(self.size, init_worker)
         [pool.apply_async(download_wrapper, args=item) for item in queue]
@@ -137,9 +139,9 @@ class Downloader(Singleton):
         pool.join()
 
 
-def download_wrapper(obj, url, folder=''):
+def download_wrapper(obj, url, folder='', proxy=None):
     if sys.platform == 'darwin' or semaphore.get_value():
-        return Downloader.download_(obj, url=url, folder=folder)
+        return Downloader.download_(obj, url=url, folder=folder, proxy=proxy)
     else:
         return -3, None
 

nhentai/serializer.py

@@ -2,7 +2,7 @@
 import json
 import os
 from xml.sax.saxutils import escape
-
+from nhentai.constant import LANGUAGEISO
 
 def serialize_json(doujinshi, dir):
     metadata = {'title': doujinshi.name,
@@ -65,7 +65,8 @@ def serialize_comicxml(doujinshi, dir):
         if doujinshi.info.languages:
             languages = [i.strip() for i in doujinshi.info.languages.split(',')]
             xml_write_simple_tag(f, 'Translated', 'Yes' if 'translated' in languages else 'No')
-            [xml_write_simple_tag(f, 'Language', i) for i in languages if i != 'translated']
+            [xml_write_simple_tag(f, 'LanguageISO', LANGUAGEISO[i]) for i in languages \
+                if (i != 'translated' and i in LANGUAGEISO)]
 
         f.write('</ComicInfo>')
 

nhentai/utils.py

@@ -20,7 +20,11 @@ def request(method, url, **kwargs):
         'User-Agent': 'nhentai command line client (https://github.com/RicterZ/nhentai)',
         'Cookie': constant.CONFIG['cookie']
     })
-    return getattr(session, method)(url, proxies=constant.CONFIG['proxy'], verify=False, **kwargs)
+
+    if not kwargs.get('proxies', None):
+        kwargs['proxies'] = constant.CONFIG['proxy']
+
+    return getattr(session, method)(url, verify=False, **kwargs)
 
 
 def check_cookie():
@@ -166,7 +170,7 @@ def generate_main_html(output_dir='./'):
         logger.warning('Writing Main Viewer failed ({})'.format(str(e)))
 
 
-def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=False):
+def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=True):
     if doujinshi_obj is not None:
         doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
         if write_comic_info:
@@ -194,36 +198,36 @@ def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_
 def generate_pdf(output_dir='.', doujinshi_obj=None, rm_origin_dir=False):
     try:
         import img2pdf
+        
+        """Write images to a PDF file using img2pdf."""
+        if doujinshi_obj is not None:
+            doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
+            pdf_filename = os.path.join(
+                os.path.join(doujinshi_dir, '..'),
+                '{}.pdf'.format(doujinshi_obj.filename)
+            )
+        else:
+            pdf_filename = './doujinshi.pdf'
+            doujinshi_dir = '.'
+
+        file_list = os.listdir(doujinshi_dir)
+        file_list.sort()
+
+        logger.info('Writing PDF file to path: {}'.format(pdf_filename))
+        with open(pdf_filename, 'wb') as pdf_f:
+            full_path_list = (
+                [os.path.join(doujinshi_dir, image) for image in file_list]
+            )
+            pdf_f.write(img2pdf.convert(full_path_list))
+
+        if rm_origin_dir:
+            shutil.rmtree(doujinshi_dir, ignore_errors=True)
+
+        logger.log(15, 'PDF file has been written to \'{0}\''.format(doujinshi_dir))
+        
     except ImportError:
         logger.error("Please install img2pdf package by using pip.")
 
-    """Write images to a PDF file using img2pdf."""
-    if doujinshi_obj is not None:
-        doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
-        pdf_filename = os.path.join(
-            os.path.join(doujinshi_dir, '..'),
-            '{}.pdf'.format(doujinshi_obj.filename)
-        )
-    else:
-        pdf_filename = './doujinshi.pdf'
-        doujinshi_dir = '.'
-
-    file_list = os.listdir(doujinshi_dir)
-    file_list.sort()
-
-    logger.info('Writing PDF file to path: {}'.format(pdf_filename))
-    with open(pdf_filename, 'wb') as pdf_f:
-        full_path_list = (
-            [os.path.join(doujinshi_dir, image) for image in file_list]
-        )
-        pdf_f.write(img2pdf.convert(full_path_list))
-
-    if rm_origin_dir:
-        shutil.rmtree(doujinshi_dir, ignore_errors=True)
-
-    logger.log(15, 'PDF file has been written to \'{0}\''.format(doujinshi_dir))
-
-
 def unicode_truncate(s, length, encoding='utf-8'):
     """https://stackoverflow.com/questions/1809531/truncating-unicode-so-it-fits-a-maximum-size-when-encoded-for-wire-transfer
     """

requirements.txt

@@ -1,7 +1,6 @@
 requests>=2.5.0
-soupsieve<2.0
+soupsieve
 BeautifulSoup4>=4.0.0
-threadpool>=1.2.7
 tabulate>=0.7.5
 future>=0.15.2
 iso8601 >= 0.1