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

resolve #265

Browse Source
This commit is contained in:
Ricter Z 2023-02-04 19:47:24 +08:00
parent e9f9651d07
commit 0fb81599dc
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nhentai/cmdline.py
View File

@ -124,6 +124,8 @@ def cmd_parser():
help='clean download history') help='clean download history')
parser.add_option('--template', dest='viewer_template', action='store', parser.add_option('--template', dest='viewer_template', action='store',
help='set viewer template', default='') help='set viewer template', default='')
parser.add_option('--legacy', dest='legacy', action='store_true', default=False,
help='use legacy searching method')
try: try:
sys.argv = [unicode(i.decode(sys.stdin.encoding)) for i in sys.argv] sys.argv = [unicode(i.decode(sys.stdin.encoding)) for i in sys.argv]

8
nhentai/command.py
View File

@ -8,7 +8,7 @@ import time
from nhentai import constant from nhentai import constant
from nhentai.cmdline import cmd_parser, banner from nhentai.cmdline import cmd_parser, banner
from nhentai.parser import doujinshi_parser, search_parser, print_doujinshi, favorites_parser from nhentai.parser import doujinshi_parser, search_parser, legacy_search_parser, print_doujinshi, favorites_parser
from nhentai.doujinshi import Doujinshi from nhentai.doujinshi import Doujinshi
from nhentai.downloader import Downloader from nhentai.downloader import Downloader
from nhentai.logger import logger from nhentai.logger import logger
@ -55,8 +55,10 @@ def main():
if constant.CONFIG['language']: if constant.CONFIG['language']:
logger.info('Using default language: {0}'.format(constant.CONFIG['language'])) logger.info('Using default language: {0}'.format(constant.CONFIG['language']))
options.keyword += ' language:{}'.format(constant.CONFIG['language']) options.keyword += ' language:{}'.format(constant.CONFIG['language'])
doujinshis = search_parser(options.keyword, sorting=options.sorting, page=page_list,
is_page_all=options.page_all) _search_parser = legacy_search_parser if options.legacy else search_parser
doujinshis = _search_parser(options.keyword, sorting=options.sorting, page=page_list,
is_page_all=options.page_all)
elif not doujinshi_ids: elif not doujinshi_ids:
doujinshi_ids = options.id doujinshi_ids = options.id

1
nhentai/constant.py
View File

@ -14,6 +14,7 @@ BASE_URL = os.getenv('NHENTAI', 'https://nhentai.net')
__api_suspended_DETAIL_URL = '%s/api/gallery' % BASE_URL __api_suspended_DETAIL_URL = '%s/api/gallery' % BASE_URL
DETAIL_URL = '%s/g' % BASE_URL DETAIL_URL = '%s/g' % BASE_URL
LEGACY_SEARCH_URL = '%s/search/' % BASE_URL
SEARCH_URL = '%s/api/galleries/search' % BASE_URL SEARCH_URL = '%s/api/galleries/search' % BASE_URL

6
nhentai/parser.py
View File

@ -177,9 +177,11 @@ def doujinshi_parser(id_):
return doujinshi return doujinshi
def old_search_parser(keyword, sorting='date', page=1): def legacy_search_parser(keyword, sorting='date', page=1, is_page_all=False):
logger.warning('Using legacy searching method, `--all` options will not be supported')
logger.debug('Searching doujinshis of keyword {0}'.format(keyword)) logger.debug('Searching doujinshis of keyword {0}'.format(keyword))
response = request('get', url=constant.SEARCH_URL, params={'q': keyword, 'page': page, 'sort': sorting}).content response = request('get', url=constant.LEGACY_SEARCH_URL,
params={'q': keyword, 'page': page, 'sort': sorting}).content
result = _get_title_and_id(response) result = _get_title_and_id(response)
if not result: if not result: