Hello community,
here is the log from the commit of package you-get for openSUSE:Factory checked
in at 2019-02-17 12:21:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/you-get (Old)
and /work/SRC/openSUSE:Factory/.you-get.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "you-get"
Sun Feb 17 12:21:47 2019 rev:18 rq:676649 version:0.4.1210
Changes:
--------
--- /work/SRC/openSUSE:Factory/you-get/you-get.changes 2019-01-21
11:02:06.207139481 +0100
+++ /work/SRC/openSUSE:Factory/.you-get.new.28833/you-get.changes
2019-02-17 12:21:52.184191830 +0100
@@ -1,0 +2,5 @@
+Sat Feb 16 07:56:27 UTC 2019 - Luigi Baldoni <aloi...@gmx.com>
+
+- Update to version 0.4.1210 (no changelog supplied)
+
+-------------------------------------------------------------------
Old:
----
you-get-0.4.1205.tar.gz
New:
----
you-get-0.4.1210.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ you-get.spec ++++++
--- /var/tmp/diff_new_pack.6xYLeo/_old 2019-02-17 12:21:52.592191718 +0100
+++ /var/tmp/diff_new_pack.6xYLeo/_new 2019-02-17 12:21:52.592191718 +0100
@@ -17,7 +17,7 @@
Name: you-get
-Version: 0.4.1205
+Version: 0.4.1210
Release: 0
Summary: Dumb downloader that scrapes the web
License: MIT
++++++ you-get-0.4.1205.tar.gz -> you-get-0.4.1210.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/you-get-0.4.1205/src/you_get/extractors/bilibili.py
new/you-get-0.4.1210/src/you_get/extractors/bilibili.py
--- old/you-get-0.4.1205/src/you_get/extractors/bilibili.py 2019-01-18
12:26:57.000000000 +0100
+++ new/you-get-0.4.1210/src/you_get/extractors/bilibili.py 2019-02-16
06:17:11.000000000 +0100
@@ -224,7 +224,13 @@
p = int(page.group(1))
cid = re.search(r'"cid":(\d+),"page":%s' % p, self.page).group(1)
if cid is not None:
- self.download_by_vid(cid, re.search('bangumi', self.url) is not
None, **kwargs)
+ #self.download_by_vid(cid, re.search('bangumi', self.url) is not
None, **kwargs)
+ # FIXME: video qualities
+ playinfo_text = match1(self.page, r'__playinfo__=(.*?)<')
+ playinfo = json.loads(playinfo_text)
+ url0 = playinfo['data']['durl'][0]['url']
+ _, ext, size = url_info(url0, headers={'referer': self.url,
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6)
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36'})
+ self.streams['flv'] = {'url': url0, 'container': ext, 'size':
size, 'src': [url0]}
else:
# flashvars?
flashvars = re.search(r'flashvars="([^"]+)"', self.page).group(1)
@@ -492,7 +498,8 @@
page_list =
json.loads(get_content('http://www.bilibili.com/widget/getPageList?aid={}'.format(aid)))
page_cnt = len(page_list)
for no in range(1, page_cnt+1):
- page_url =
'http://www.bilibili.com/video/av{}/index_{}.html'.format(aid, no)
+ #page_url =
'http://www.bilibili.com/video/av{}/index_{}.html'.format(aid, no)
+ page_url = 'http://www.bilibili.com/video/av{}/?p={}'.format(aid,
no)
subtitle = '#%s. %s'% (page_list[no-1]['page'],
page_list[no-1]['pagename'])
Bilibili().download_by_url(page_url, subtitle=subtitle, **kwargs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/you-get-0.4.1205/src/you_get/extractors/miaopai.py
new/you-get-0.4.1210/src/you_get/extractors/miaopai.py
--- old/you-get-0.4.1205/src/you_get/extractors/miaopai.py 2019-01-18
12:26:57.000000000 +0100
+++ new/you-get-0.4.1210/src/you_get/extractors/miaopai.py 2019-02-16
06:17:11.000000000 +0100
@@ -84,14 +84,15 @@
if match1(url, r'weibo\.com/tv/v/(\w+)'):
return miaopai_download_direct(url, info_only=info_only,
output_dir=output_dir, merge=merge, **kwargs)
+ if re.match(r'^http[s]://.*\.weibo\.com/\d+/.+', url):
+ return miaopai_download_direct(url, info_only=info_only,
output_dir=output_dir, merge=merge, **kwargs)
+
fid = match1(url, r'\?fid=(\d{4}:\w+)')
if fid is not None:
miaopai_download_by_fid(fid, output_dir, merge, info_only)
elif '/p/230444' in url:
fid = match1(url, r'/p/230444(\w+)')
miaopai_download_by_fid('1034:'+fid, output_dir, merge, info_only)
- elif re.match(r'^http[s]://weibo\.com/\d+/.+', url):
- miaopai_download_direct(url, info_only=info_only,
output_dir=output_dir, merge=merge, **kwargs)
else:
mobile_page = get_content(url, headers = fake_headers_mobile)
hit = re.search(r'"page_url"\s*:\s*"([^"]+)"', mobile_page)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/you-get-0.4.1205/src/you_get/processor/ffmpeg.py
new/you-get-0.4.1210/src/you_get/processor/ffmpeg.py
--- old/you-get-0.4.1205/src/you_get/processor/ffmpeg.py 2019-01-18
12:26:57.000000000 +0100
+++ new/you-get-0.4.1210/src/you_get/processor/ffmpeg.py 2019-02-16
06:17:11.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import logging
-import os.path
+import os
import subprocess
import sys
from ..util.strings import parameterize
@@ -59,14 +59,25 @@
params = [FFMPEG] + LOGLEVEL
for file in files:
if os.path.isfile(file): params.extend(['-i', file])
- params.extend(['-c:v', 'copy'])
- if ext == 'mp4':
- params.extend(['-c:a', 'aac'])
- elif ext == 'webm':
- params.extend(['-c:a', 'vorbis'])
- params.extend(['-strict', 'experimental'])
+ params.extend(['-c', 'copy'])
params.append(output)
- return subprocess.call(params, stdin=STDIN)
+ if subprocess.call(params, stdin=STDIN):
+ print('Merging without re-encode failed.\nTry again re-encoding
audio... ', end="", flush=True)
+ try: os.remove(output)
+ except FileNotFoundError: pass
+ params = [FFMPEG] + LOGLEVEL
+ for file in files:
+ if os.path.isfile(file): params.extend(['-i', file])
+ params.extend(['-c:v', 'copy'])
+ if ext == 'mp4':
+ params.extend(['-c:a', 'aac'])
+ params.extend(['-strict', 'experimental'])
+ elif ext == 'webm':
+ params.extend(['-c:a', 'opus'])
+ params.append(output)
+ return subprocess.call(params, stdin=STDIN)
+ else:
+ return 0
def ffmpeg_convert_ts_to_mkv(files, output='output.mkv'):
for file in files:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/you-get-0.4.1205/src/you_get/version.py
new/you-get-0.4.1210/src/you_get/version.py
--- old/you-get-0.4.1205/src/you_get/version.py 2019-01-18 12:26:57.000000000
+0100
+++ new/you-get-0.4.1210/src/you_get/version.py 2019-02-16 06:17:11.000000000
+0100
@@ -1,4 +1,4 @@
#!/usr/bin/env python
script_name = 'you-get'
-__version__ = '0.4.1205'
+__version__ = '0.4.1210'
