Merge pull request #3 from rg3/master

UPDATE
This commit is contained in:
AndroKev 2015-10-12 12:40:32 +02:00
commit aa5239328e
6 changed files with 6 additions and 5 deletions

View File

@ -81,6 +81,7 @@
- **CBSSports**
- **CeskaTelevize**
- **channel9**: Channel 9
- **Chaturbate**
- **Chilloutzone**
- **chirbit**
- **chirbit:profile**

View File

@ -325,7 +325,7 @@ class FileDownloader(object):
)
# Check file already present
if filename != '-' and nooverwrites_and_exists or continuedl_and_exists:
if filename != '-' and (nooverwrites_and_exists or continuedl_and_exists):
self.report_file_already_downloaded(filename)
self._hook_progress({
'filename': filename,

View File

@ -105,7 +105,7 @@ class RtmpFD(FileDownloader):
protocol = info_dict.get('rtmp_protocol', None)
real_time = info_dict.get('rtmp_real_time', False)
no_resume = info_dict.get('no_resume', False)
continue_dl = info_dict.get('continuedl', True)
continue_dl = self.params.get('continuedl', True)
self.report_destination(filename)
tmpfilename = self.temp_name(filename)

View File

@ -36,7 +36,7 @@ class RTBFIE(InfoExtractor):
data = self._parse_json(
unescapeHTML(self._search_regex(
r'data-video="([^"]+)"', webpage, 'data video')),
r'data-media="([^"]+)"', webpage, 'data video')),
video_id)
if data.get('provider').lower() == 'youtube':

View File

@ -406,7 +406,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
m3u8_formats = self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', 'm3u8_native', 0, 'hls', fatal=False)
if m3u8_formats:
formats.append(m3u8_formats)
formats.extend(m3u8_formats)
for key in ('other', 'sd', 'hd'):
formats += files[key]
self._sort_formats(formats)

View File

@ -1,3 +1,3 @@
from __future__ import unicode_literals
__version__ = '2015.10.09'
__version__ = '2015.10.12'