Revert "Fix fatal error and keep index of id which from file"

diff --git a/nhentai/cmdline.py b/nhentai/cmdline.py
index 6e6c8d67448b4da62a75ea9cf571ac671bbe0b6c..9decc8810c77407dabdcff7068152a772a04589c 100644 (file)
--- a/nhentai/cmdline.py
+++ b/nhentai/cmdline.py
@@ -186,10 +186,8 @@ def cmd_parser():
 
     if args.file:
         with open(args.file, 'r') as f:
-            _ = [int(i.strip()) for i in f.readlines() if i.strip().isdigit()]
-            # args.id = list(set(int(i) for i in _ if i.isdigit()))
-            args.id = list(set(_))
-            args.id.sort(key=_.index)
+            _ = [i.strip() for i in f.readlines()]
+            args.id = set(int(i) for i in _ if i.isdigit())
 
     if (args.is_download or args.is_show) and not args.id and not args.keyword and \
             not args.tag and not args.artist and not args.character and \
@@ -206,8 +204,8 @@ def cmd_parser():
     if args.threads <= 0:
         args.threads = 1
 
-    # elif args.threads > 15:
-    #     logger.critical('Maximum number of used threads is 15')
-    #     exit(1)
+    elif args.threads > 15:
+        logger.critical('Maximum number of used threads is 15')
+        exit(1)
 
     return args

diff --git a/nhentai/parser.py b/nhentai/parser.py
index a95e03e3683a01fa2af0f10087fac2ef85c271b8..97ea3549937befd9b946282f370d3058fd51caa8 100644 (file)
--- a/nhentai/parser.py
+++ b/nhentai/parser.py
@@ -178,21 +178,21 @@ def doujinshi_parser(id_):
     doujinshi['img_id'] = img_id.group(1)
     doujinshi['ext'] = ext
 
-    # pages = 0
-    # for _ in doujinshi_info.find_all('div', class_=''):
-    #     pages = re.search('([\d]+) pages', _.text)
-    #     if pages:
-    #         pages = pages.group(1)
-    #         break
-    # doujinshi['pages'] = int(pages)
-    doujinshi['pages'] = len(ext)
+    pages = 0
+    for _ in doujinshi_info.find_all('div', class_=''):
+        pages = re.search('([\d]+) pages', _.text)
+        if pages:
+            pages = pages.group(1)
+            break
+    doujinshi['pages'] = int(pages)
+
     # gain information of the doujinshi
     information_fields = doujinshi_info.find_all('div', attrs={'class': 'field-name'})
     needed_fields = ['Characters', 'Artists', 'Languages', 'Tags', 'Parodies', 'Groups', 'Categories']
     for field in information_fields:
         field_name = field.contents[0].strip().strip(':')
         if field_name in needed_fields:
-            data = [sub_field.contents[0].text.strip() for sub_field in
+            data = [sub_field.contents[0].strip() for sub_field in
                     field.find_all('a', attrs={'class': 'tag'})]
             doujinshi[field_name.lower()] = ', '.join(data)