aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-07-09 17:05:11 +0700
committerSergey M․ <dstftw@gmail.com>2017-07-09 17:05:11 +0700
commit0d2f0b0357325823782884327a158aeccf4f9b49 (patch)
treeb72ea5931aa0fdabdf64a82e6a499999defb73b7
parentc319d1c4833f89df818fe39f4c99cdc5c9a8bf01 (diff)
downloadyoutube-dl-0d2f0b0357325823782884327a158aeccf4f9b49.tar.xz
[csjw] Make description optional
-rw-r--r--youtube_dl/extractor/cjsw.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/youtube_dl/extractor/cjsw.py b/youtube_dl/extractor/cjsw.py
index aab6ea535..dd271586f 100644
--- a/youtube_dl/extractor/cjsw.py
+++ b/youtube_dl/extractor/cjsw.py
@@ -11,7 +11,7 @@ from ..utils import (
class CJSWIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?cjsw\.com/program/(?P<program>[^/]+)/episode/(?P<id>\d+)'
- _TEST = {
+ _TESTS = [{
'url': 'http://cjsw.com/program/freshly-squeezed/episode/20170620',
'md5': 'cee14d40f1e9433632c56e3d14977120',
'info_dict': {
@@ -22,7 +22,11 @@ class CJSWIE(InfoExtractor):
'series': 'Freshly Squeezed',
'episode_id': '20170620',
},
- }
+ }, {
+ # no description
+ 'url': 'http://cjsw.com/program/road-pops/episode/20170707/',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@ -51,7 +55,8 @@ class CJSWIE(InfoExtractor):
}]
description = self._html_search_regex(
- r'<p>(?P<description>.+?)</p>', webpage, 'description', fatal=False)
+ r'<p>(?P<description>.+?)</p>', webpage, 'description',
+ default=None)
series = self._search_regex(
r'data-showname=(["\'])(?P<name>(?:(?!\1).)+)\1', webpage,
'series', default=program, group='name')