From e37836a40bd38feb7f2f616852883578b7153a6c Mon Sep 17 00:00:00 2001 From: Riceball LEE Date: Wed, 16 Dec 2020 10:31:52 +0800 Subject: [PATCH] feat: add arguments to specify the playlist first, last, page-size options --- src/you_get/common.py | 17 ++++++++++++++++- src/you_get/extractors/lrts.py | 26 ++++++++++++++++++++------ 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/you_get/common.py b/src/you_get/common.py index 2b6e05d2..7fe9d51d 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -1557,6 +1557,21 @@ def script_main(download, download_playlist, **kwargs): '-l', '--playlist', action='store_true', help='Prefer to download a playlist' ) + + playlist_grp = parser.add_argument_group('Playlist optional options') + playlist_grp.add_argument( + '-first', '--first', metavar='FIRST', + help='the first number' + ) + playlist_grp.add_argument( + '-last', '--last', metavar='LAST', + help='the last number' + ) + playlist_grp.add_argument( + '-size', '--page-size', metavar='PAGE_SIZE', + help='the page size number' + ) + download_grp.add_argument( '-a', '--auto-rename', action='store_true', default=False, help='Auto rename same name different files' @@ -1674,7 +1689,7 @@ def script_main(download, download_playlist, **kwargs): socket.setdefaulttimeout(args.timeout) try: - extra = {} + extra = {'args': args} if extractor_proxy: extra['extractor_proxy'] = extractor_proxy if stream_id: diff --git a/src/you_get/extractors/lrts.py b/src/you_get/extractors/lrts.py index 23abab5c..d206491d 100644 --- a/src/you_get/extractors/lrts.py +++ b/src/you_get/extractors/lrts.py @@ -4,15 +4,18 @@ __all__ = ['lrts_download'] import logging from ..common import * +from ..util import log, term def lrts_download(url, output_dir='.', merge=True, info_only=False, **kwargs): html = get_html(url) + args = kwargs.get('args') + if not args: args = {} matched = re.search(r"/book/(\d+)", url) if not matched: raise AssertionError("not found book number: %s" % url) book_no = matched.group(1) book_title = book_no - matched = re.search(r"(.*)-(.*)", html) + matched = re.search(r"([^-]*)[-](.*)[,](.*)", html) if matched: book_title = matched.group(1) @@ -20,15 +23,25 @@ def lrts_download(url, output_dir='.', merge=True, info_only=False, **kwargs): if not matched: raise AssertionError("not found total count in html") total_count = int(matched.group(1)) - logging.debug('total: %s' % total_count) + log.i('%s total: %s' % (book_title, total_count)) + first_page = 0 + if ('first' in args and args.first!= None): + first_page = int(args.first) + page_size = 10 - logging.debug('total page count: %s' % ((total_count // page_size) + 1)) + if ('page_size' in args and args.page_size != None): + page_size = int(args.page_size) + last_page = (total_count // page_size) + 1 + if ('last' in args and args.last != None): + last_page = int(args.last) + + log.i('page size is %s, page from %s to %s' % (page_size, first_page, last_page)) headers = { 'Referer': url } items = [] if (total_count > page_size): - for page in range((total_count // page_size) + 1): + for page in range(first_page, last_page): page_url = 'http://www.lrts.me/ajax/book/%s/%s/%s' % (book_no, page, page_size) response_content = json.loads(post_content(page_url, headers)) if response_content['status'] != 'success': @@ -48,13 +61,14 @@ def lrts_download(url, output_dir='.', merge=True, info_only=False, **kwargs): for item in items: i_url = 'http://www.lrts.me/ajax/path/4/%s/%s' % (item['fatherResId'], item['resId']) response_content = json.loads(post_content(i_url, headers)) - # logging.debug(response_content) + logging.debug(response_content) if response_content['status'] == 'success' and response_content['data']: item['ok'] = True item['url'] = response_content['data'] + logging.debug('ok') items = list(filter(lambda i: 'ok' in i and i['ok'], items)) - print('Downloading %s: %s count ...' % (book_title, len(items))) + log.i('Downloading %s: %s count ...' % (book_title, len(items))) for item in items: title = item['resName']