Hello community, here is the log from the commit of package you-get for openSUSE:Factory checked in at 2018-08-12 20:55:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/you-get (Old) and /work/SRC/openSUSE:Factory/.you-get.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "you-get" Sun Aug 12 20:55:05 2018 rev:9 rq:628647 version:0.4.1128 Changes: -------- --- /work/SRC/openSUSE:Factory/you-get/you-get.changes 2018-08-10 09:49:29.742242650 +0200 +++ /work/SRC/openSUSE:Factory/.you-get.new/you-get.changes 2018-08-12 20:55:05.969433933 +0200 @@ -1,0 +2,5 @@ +Fri Aug 10 14:55:25 UTC 2018 - [email protected] + +- Update to version 0.4.1128 (no changelog supplied) + +------------------------------------------------------------------- Old: ---- you-get-0.4.1120.tar.gz New: ---- you-get-0.4.1128.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ you-get.spec ++++++ --- /var/tmp/diff_new_pack.1a6hb2/_old 2018-08-12 20:55:06.309434624 +0200 +++ /var/tmp/diff_new_pack.1a6hb2/_new 2018-08-12 20:55:06.309434624 +0200 @@ -17,7 +17,7 @@ Name: you-get -Version: 0.4.1120 +Version: 0.4.1128 Release: 0 Summary: Dumb downloader that scrapes the web License: MIT ++++++ you-get-0.4.1120.tar.gz -> you-get-0.4.1128.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1120/src/you_get/extractors/bilibili.py new/you-get-0.4.1128/src/you_get/extractors/bilibili.py --- old/you-get-0.4.1120/src/you_get/extractors/bilibili.py 2018-08-08 17:12:11.000000000 +0200 +++ new/you-get-0.4.1128/src/you_get/extractors/bilibili.py 2018-08-10 16:40:12.000000000 +0200 @@ -32,13 +32,13 @@ SEC1 = '94aba54af9065f71de72f5508f1cd42e' SEC2 = '9b288147e5474dd2aa67085f716c560d' stream_types = [ - {'id': 'hdflv'}, - {'id': 'flv720'}, - {'id': 'flv'}, - {'id': 'hdmp4'}, - {'id': 'mp4'}, - {'id': 'live'}, - {'id': 'vc'} + {'id': 'hdflv'}, + {'id': 'flv720'}, + {'id': 'flv'}, + {'id': 'hdmp4'}, + {'id': 'mp4'}, + {'id': 'live'}, + {'id': 'vc'} ] fmt2qlt = dict(hdflv=4, flv=3, hdmp4=2, mp4=1) @@ -348,6 +348,36 @@ log.w(e) return [], 0 +def download_video_from_favlist(url, **kwargs): + # the url has format: https://space.bilibili.com/64169458/#/favlist?fid=1840028 + + m = re.search(r'space\.bilibili\.com/(\d+)/.*?fid=(\d+).*?', url) + vmid = "" + favid = "" + if m is not None: + vmid = m.group(1) + favid = m.group(2) + jsonresult = json.loads(get_content("https://api.bilibili.com/x/space/fav/arc?vmid={}&ps=300&fid={}&order=fav_time&tid=0&keyword=&pn=1&jsonp=jsonp".format(vmid, favid))) + + # log.wtf("Got files list for vmid" + vmid + " favid:" + favid) + if jsonresult['code'] != 0: + log.wtf("Fail to get the files of page " + jsonresult) + sys.exit(2) + + else: + videos = jsonresult['data']['archives'] + videocount = len(videos) + for i in range(videocount): + videoid = videos[i]["aid"] + videotitle = videos[i]["title"] + videourl = "https://www.bilibili.com/video/av{}".format(videoid) + print("Start downloading ", videotitle, " video ", videotitle) + Bilibili().download_by_url(videourl, subtitle=videotitle, **kwargs) + + else: + log.wtf("Fail to parse the fav title" + url, "") + + def bilibili_download_playlist_by_url(url, **kwargs): url = url_locations([url])[0] kwargs['playlist'] = True @@ -363,6 +393,9 @@ for ep_id in ep_ids: ep_url = '#'.join([base_url, ep_id]) Bilibili().download_by_url(ep_url, **kwargs) + elif 'favlist' in url: + # this a fav list folder + download_video_from_favlist(url, **kwargs) else: aid = re.search(r'av(\d+)', url).group(1) page_list = json.loads(get_content('http://www.bilibili.com/widget/getPageList?aid={}'.format(aid))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1120/src/you_get/extractors/youku.py new/you-get-0.4.1128/src/you_get/extractors/youku.py --- old/you-get-0.4.1120/src/you_get/extractors/youku.py 2018-08-08 17:12:11.000000000 +0200 +++ new/you-get-0.4.1128/src/you_get/extractors/youku.py 2018-08-10 16:40:12.000000000 +0200 @@ -78,8 +78,8 @@ self.api_error_code = None self.api_error_msg = None - self.ccode = '0510' - # Found in http://g.alicdn.com/player/ykplayer/0.5.28/youku-player.min.js + self.ccode = '0508' + # Found in http://g.alicdn.com/player/ykplayer/0.5.64/youku-player.min.js # grep -oE '"[0-9a-zA-Z+/=]{256}"' youku-player.min.js self.ckey = 'DIl58SLFxFNndSV1GFNnMQVYkx1PP5tKe1siZu/86PR1u/Wh1Ptd+WOZsHHWxysSfAOhNJpdVWsdVJNsfJ8Sxd8WKVvNfAS8aS8fAOzYARzPyPc3JvtnPHjTdKfESTdnuTW6ZPvk2pNDh4uFzotgdMEFkzQ5wZVXl2Pf1/Y6hLK0OnCNxBj3+nb0v72gZ6b0td+WOZsHHWxysSo/0y9D2K42SaB8Y/+aD2K42SaB8Y/+ahU+WOZsHcrxysooUeND' self.utid = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1120/src/you_get/processor/ffmpeg.py new/you-get-0.4.1128/src/you_get/processor/ffmpeg.py --- old/you-get-0.4.1120/src/you_get/processor/ffmpeg.py 2018-08-08 17:12:11.000000000 +0200 +++ new/you-get-0.4.1128/src/you_get/processor/ffmpeg.py 2018-08-10 16:40:12.000000000 +0200 @@ -22,12 +22,10 @@ out, err = p.communicate() vers = str(out, 'utf-8').split('\n')[0].split() assert (vers[0] == 'ffmpeg' and vers[2][0] > '0') or (vers[0] == 'avconv') - #set version to 1.0 for nightly build and print warning try: - version = [int(i) for i in vers[2].split('.')] + v = vers[2][1:] if vers[2][0] == 'n' else vers[2] + version = [int(i) for i in v.split('.')] except: - print('It seems that your ffmpeg is a nightly build.', file=sys.stderr) - print('Please switch to the latest stable if merging failed.', file=sys.stderr) version = [1, 0] return cmd, 'ffprobe', version except: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1120/src/you_get/version.py new/you-get-0.4.1128/src/you_get/version.py --- old/you-get-0.4.1120/src/you_get/version.py 2018-08-08 17:12:11.000000000 +0200 +++ new/you-get-0.4.1128/src/you_get/version.py 2018-08-10 16:40:12.000000000 +0200 @@ -1,4 +1,4 @@ #!/usr/bin/env python script_name = 'you-get' -__version__ = '0.4.1120' +__version__ = '0.4.1128'
