Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[googledrive] raise ExtractorError instead of warning

pull/6061/head
remitamine 2015-07-18 23:31:14 +01:00
parent 36dbca8784
commit 8e92d21ebf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/googledrive.py
View File

@ -1,7 +1,10 @@
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import RegexNotFoundError from ..utils import (
RegexNotFoundError,
ExtractorError,
)
class GoogleDriveEmbedIE(InfoExtractor): class GoogleDriveEmbedIE(InfoExtractor):
_VALID_URL = r'https?://(?:video\.google\.com/get_player\?.*?docid=|(?:docs|drive)\.google\.com/file/d/)(?P<id>[a-zA-Z0-9_-]{28})' _VALID_URL = r'https?://(?:video\.google\.com/get_player\?.*?docid=|(?:docs|drive)\.google\.com/file/d/)(?P<id>[a-zA-Z0-9_-]{28})'
@ -97,10 +100,10 @@ class GoogleDriveIE(InfoExtractor):
webpage, webpage,
'reason' 'reason'
) )
self.report_warning(reason) raise ExtractorError(reason)
return return
except RegexNotFoundError: except RegexNotFoundError:
self.report_warning('not a video') raise ExtractorError('not a video')
return return
fmt_stream_map = fmt_stream_map.split(',') fmt_stream_map = fmt_stream_map.split(',')