NussNougate/nhentai
4
0
Fork 0
mirror of https://github.com/RicterZ/nhentai.git synced 2025-04-20 02:41:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug of --tag in python2.7

Browse Source
This commit is contained in:
RicterZ 2020-03-15 00:41:40 +08:00
parent 56153015b1
commit d5f41bf37c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nhentai/parser.py
View File

@ -1,10 +1,9 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
import sys
import os import os
import re import re
import threadpool
import requests
import time import time
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from tabulate import tabulate from tabulate import tabulate
@ -105,6 +104,7 @@ def favorites_parser(page_range=''):
return result return result
def page_range_parser(page_range, max_page_num): def page_range_parser(page_range, max_page_num):
pages = set() pages = set()
ranges = str.split(page_range, ',') ranges = str.split(page_range, ',')
@ -130,6 +130,7 @@ def page_range_parser(page_range, max_page_num):
return list(pages) return list(pages)
def doujinshi_parser(id_): def doujinshi_parser(id_):
if not isinstance(id_, (int,)) and (isinstance(id_, (str,)) and not id_.isdigit()): if not isinstance(id_, (int,)) and (isinstance(id_, (str,)) and not id_.isdigit()):
raise Exception('Doujinshi id({0}) is not valid'.format(id_)) raise Exception('Doujinshi id({0}) is not valid'.format(id_))
@ -232,7 +233,12 @@ def tag_parser(tag_name, sorting='date', max_page=1, index=0):
sorting = '' sorting = ''
for p in range(1, max_page + 1): for p in range(1, max_page + 1):
if isinstance(tag_name, str): if sys.version_info >= (3, 0, 0):
unicode_ = str
else:
unicode_ = unicode
if isinstance(tag_name, (str, unicode_)):
logger.debug('Fetching page {0} for doujinshi with tag \'{1}\''.format(p, tag_name)) logger.debug('Fetching page {0} for doujinshi with tag \'{1}\''.format(p, tag_name))
response = request('get', url='%s/%s/%s?page=%d' % (constant.TAG_URL[index], tag_name, sorting, p)).content response = request('get', url='%s/%s/%s?page=%d' % (constant.TAG_URL[index], tag_name, sorting, p)).content
result += _get_title_and_id(response) result += _get_title_and_id(response)