Merge remote-tracking branch 'refs/remotes/soimort/develop' into develop

This commit is contained in:
QShen3 2017-03-26 18:13:08 +08:00
commit 50e81b6b3e

View File

@ -27,7 +27,10 @@ class MGTV(VideoExtractor):
def get_vid_from_url(url): def get_vid_from_url(url):
"""Extracts video ID from URL. """Extracts video ID from URL.
""" """
return match1(url, 'http://www.mgtv.com/b/\d+/(\d+).html') vid = match1(url, 'http://www.mgtv.com/b/\d+/(\d+).html')
if not vid:
vid = match1(url, 'http://www.mgtv.com/hz/bdpz/\d+/(\d+).html')
return vid
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@staticmethod @staticmethod
@ -150,4 +153,4 @@ class MGTV(VideoExtractor):
site = MGTV() site = MGTV()
download = site.download_by_url download = site.download_by_url
download_playlist = site.download_playlist_by_url download_playlist = site.download_playlist_by_url