diff --git a/PixivUtil2.py b/PixivUtil2.py index 58724fb3..ae039eae 100644 --- a/PixivUtil2.py +++ b/PixivUtil2.py @@ -396,7 +396,7 @@ def menu_download_by_tags(opisvalid, args, options): else: print("Valid values are 'a', 'i', or 'm'.") - if bookmark_count is not None and len(bookmark_count) > 0: + if bookmark_count is not None and bookmark_count != -1 and len(bookmark_count) > 0: bookmark_count = int(bookmark_count) PixivTagsHandler.process_tags(sys.modules[__name__], @@ -529,7 +529,7 @@ def menu_download_from_online_user_bookmark(opisvalid, args, options): (start_page, end_page) = PixivHelper.get_start_and_end_number(total_number_of_page=options.number_of_pages) bookmark_count = input('Bookmark Count: ').rstrip("\r") or None - if bookmark_count is not None and len(bookmark_count) > 0: + if bookmark_count is not None and bookmark_count != -1 and len(bookmark_count) > 0: bookmark_count = int(bookmark_count) PixivBookmarkHandler.process_bookmark(sys.modules[__name__], @@ -620,7 +620,7 @@ def menu_download_from_tags_list(opisvalid, args, options): (page, end_page) = PixivHelper.get_start_and_end_number(total_number_of_page=options.number_of_pages) (start_date, end_date) = PixivHelper.get_start_and_end_date() - if bookmark_count is not None and len(bookmark_count) > 0: + if bookmark_count is not None and bookmark_count != -1 and len(bookmark_count) > 0: bookmark_count = int(bookmark_count) PixivListHandler.process_tags_list(sys.modules[__name__], @@ -646,7 +646,7 @@ def menu_download_new_illust_from_bookmark(opisvalid, args, options): (page_num, end_page_num) = PixivHelper.get_start_and_end_number(total_number_of_page=options.number_of_pages) bookmark_count = input('Bookmark Count: ').rstrip("\r") or None - if bookmark_count is not None and len(bookmark_count) > 0: + if bookmark_count is not None and bookmark_count != -1 and len(bookmark_count) > 0: bookmark_count = int(bookmark_count) PixivBookmarkHandler.process_new_illust_from_bookmark(sys.modules[__name__],