mirror of
https://github.com/RicterZ/nhentai.git
synced 2025-04-19 18:31:24 +02:00
changed every map(lambda) to listcomp
This commit is contained in:
parent
9f2f57248b
commit
25e5acf671
@ -98,7 +98,8 @@ def cmd_parser():
|
||||
help='set cookie of nhentai to bypass Google recaptcha')
|
||||
|
||||
try:
|
||||
sys.argv = list(map(lambda x: unicode(x.decode(sys.stdin.encoding)), sys.argv))
|
||||
sys.argv = [unicode(i.decode(sys.stdin.encoding)) for i in sys.argv]
|
||||
print()
|
||||
except (NameError, TypeError):
|
||||
pass
|
||||
except UnicodeDecodeError:
|
||||
@ -163,13 +164,13 @@ def cmd_parser():
|
||||
exit(1)
|
||||
|
||||
if args.id:
|
||||
_ = map(lambda id_: id_.strip(), args.id.split(','))
|
||||
args.id = set(map(int, filter(lambda id_: id_.isdigit(), _)))
|
||||
_ = [i.strip() for i in args.id.split(',')]
|
||||
args.id = set(int(i) for i in _ if i.isdigit())
|
||||
|
||||
if args.file:
|
||||
with open(args.file, 'r') as f:
|
||||
_ = map(lambda id: id.strip(), f.readlines())
|
||||
args.id = set(map(int, filter(lambda id_: id_.isdigit(), _)))
|
||||
_ = [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 \
|
||||
|
@ -38,43 +38,43 @@ def main():
|
||||
doujinshis = favorites_parser()
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif options.tag:
|
||||
doujinshis = tag_parser(options.tag, sorting=options.sorting, max_page=options.max_page)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif options.artist:
|
||||
doujinshis = tag_parser(options.artist, max_page=options.max_page, index=1)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif options.character:
|
||||
doujinshis = tag_parser(options.character, max_page=options.max_page, index=2)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif options.parody:
|
||||
doujinshis = tag_parser(options.parody, max_page=options.max_page, index=3)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif options.group:
|
||||
doujinshis = tag_parser(options.group, max_page=options.max_page, index=4)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download and doujinshis:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif options.keyword:
|
||||
doujinshis = search_parser(options.keyword, sorting=options.sorting, page=options.page)
|
||||
print_doujinshi(doujinshis)
|
||||
if options.is_download:
|
||||
doujinshi_ids = map(lambda d: d['id'], doujinshis)
|
||||
doujinshi_ids = [i['id'] for i in doujinshis]
|
||||
|
||||
elif not doujinshi_ids:
|
||||
doujinshi_ids = options.id
|
||||
@ -90,7 +90,7 @@ def main():
|
||||
doujinshi_list.append(Doujinshi(name_format=options.name_format, **doujinshi_info))
|
||||
|
||||
if (i + 1) % 10 == 0:
|
||||
logger.info('Progress: %d / %d' % (i + 1, len(doujinshi_ids)))
|
||||
logger.info('Progress: %d / %d' % (i + 1, len(list(doujinshi_ids))))
|
||||
|
||||
if not options.is_show:
|
||||
downloader = Downloader(path=options.output_dir, size=options.threads,
|
||||
|
@ -298,7 +298,7 @@ def __api_suspended_doujinshi_parser(id_):
|
||||
doujinshi['name'] = response['title']['english']
|
||||
doujinshi['subtitle'] = response['title']['japanese']
|
||||
doujinshi['img_id'] = response['media_id']
|
||||
doujinshi['ext'] = ''.join(map(lambda s: s['t'], response['images']['pages']))
|
||||
doujinshi['ext'] = ''.join([i['t'] for i in response['images']['pages']])
|
||||
doujinshi['pages'] = len(response['images']['pages'])
|
||||
|
||||
# gain information of the doujinshi
|
||||
|
Loading…
x
Reference in New Issue
Block a user