X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fhuajiao.py;h=4ca275dda18e45e18fd628a0c8a5104fd6cfb560;hb=HEAD;hp=005b8068f1ffbab1a7c1f533e815a5808669ccb9;hpb=a347a0d08875c27287f876c2016b8c45dac051ac;p=youtube-dl diff --git a/youtube_dl/extractor/huajiao.py b/youtube_dl/extractor/huajiao.py index 005b8068f..4ca275dda 100644 --- a/youtube_dl/extractor/huajiao.py +++ b/youtube_dl/extractor/huajiao.py @@ -1,8 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -from ..utils import parse_duration, parse_iso8601 from .common import InfoExtractor +from ..utils import ( + parse_duration, + parse_iso8601, +) class HuajiaoIE(InfoExtractor): @@ -17,7 +20,7 @@ class HuajiaoIE(InfoExtractor): 'title': '#新人求关注#', 'description': 're:.*', 'duration': 2424.0, - 'thumbnail': 're:^https?://.*\.jpg$', + 'thumbnail': r're:^https?://.*\.jpg$', 'timestamp': 1475866459, 'upload_date': '20161007', 'uploader': 'Penny_余姿昀', @@ -30,7 +33,7 @@ class HuajiaoIE(InfoExtractor): webpage = self._download_webpage(url, video_id) feed_json = self._search_regex( - r'var\s*feed\s*=\s*({.*})', webpage, 'feed json str') + r'var\s+feed\s*=\s*({.+})', webpage, 'feed json') feed = self._parse_json(feed_json, video_id) description = self._html_search_meta(