From b173a6c28f79db8cbe5dbc17b56ba712779fd19b Mon Sep 17 00:00:00 2001 From: RicterZ Date: Sat, 4 May 2019 12:12:57 +0800 Subject: [PATCH] slow down #50 --- nhentai/command.py | 7 ++++++- nhentai/doujinshi.py | 2 +- nhentai/parser.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nhentai/command.py b/nhentai/command.py index c7fa00d..a325f64 100644 --- a/nhentai/command.py +++ b/nhentai/command.py @@ -26,10 +26,14 @@ def main(): logger.info('Logging in to nhentai using credential pair \'%s:%s\'' % (username, '*' * len(password))) login(username, password) - if options.is_download: + if options.is_download or options.is_show: for doujinshi_info in login_parser(): doujinshi_list.append(Doujinshi(**doujinshi_info)) + if options.is_show and not options.is_download: + print_doujinshi([{'id': i.id, 'title': i.name} for i in doujinshi_list]) + exit(0) + if options.tag: doujinshis = tag_parser(options.tag, max_page=options.max_page) print_doujinshi(doujinshis) @@ -38,6 +42,7 @@ def main(): if options.keyword: doujinshis = search_parser(options.keyword, options.page) + print(doujinshis) print_doujinshi(doujinshis) if options.is_download: doujinshi_ids = map(lambda d: d['id'], doujinshis) diff --git a/nhentai/doujinshi.py b/nhentai/doujinshi.py index 6cb17e8..88e0925 100644 --- a/nhentai/doujinshi.py +++ b/nhentai/doujinshi.py @@ -48,7 +48,7 @@ class Doujinshi(object): ["Characters", self.info.character], ["Authors", self.info.artist], ["Language", self.info.language], - ["Tags", ', '.join(self.info.tag.keys())], + ["Tags", self.info.tags], ["URL", self.url], ["Pages", self.pages], ] diff --git a/nhentai/parser.py b/nhentai/parser.py index a753b33..9feb89c 100644 --- a/nhentai/parser.py +++ b/nhentai/parser.py @@ -95,7 +95,7 @@ def login_parser(): ret.append(result) # TODO: reduce threads number ... - thread_pool = threadpool.ThreadPool(3) + thread_pool = threadpool.ThreadPool(1) for page in range(1, pages + 1): try: