projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a42dfa6
)
[bbc] Fix BBC Extractor to work with 'School Report'
author
Benjamin Congdon
<bencongdon96@gmail.com>
Fri, 11 Mar 2016 15:31:35 +0000
(09:31 -0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 13 Mar 2016 09:54:34 +0000
(15:54 +0600)
youtube_dl/extractor/bbc.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/bbc.py
b/youtube_dl/extractor/bbc.py
index 9d0dfb9611687b15075d0e6fc7d57dfa0244c60a..f4d8b4a2f2c1b12bb5ed2481d24839e76b7841cb 100644
(file)
--- a/
youtube_dl/extractor/bbc.py
+++ b/
youtube_dl/extractor/bbc.py
@@
-10,7
+10,6
@@
from ..utils import (
int_or_none,
parse_duration,
parse_iso8601,
int_or_none,
parse_duration,
parse_iso8601,
- remove_end,
unescapeHTML,
)
from ..compat import (
unescapeHTML,
)
from ..compat import (
@@
-796,9
+795,15
@@
class BBCIE(BBCCoUkIE):
entries.append(self._extract_from_playlist_sxml(
playlist.get('progressiveDownloadUrl'), playlist_id, timestamp))
entries.append(self._extract_from_playlist_sxml(
playlist.get('progressiveDownloadUrl'), playlist_id, timestamp))
+ playlist_title = self._og_search_title(webpage, default=None)
+ playlist_title = playlist_title or self._html_search_regex(
+ r'<title>(.*?)</title>', webpage, 'playlist title')
+
+ playlist_title = self._search_regex(r'(.+)\s*-\s*BBC', playlist_title, 'title', default=playlist_title)
+
+ playlist_description = self._og_search_description(webpage, default=None)
+
if entries:
if entries:
- playlist_title = playlist_title or remove_end(self._og_search_title(webpage), ' - BBC News')
- playlist_description = playlist_description or self._og_search_description(webpage, default=None)
return self.playlist_result(entries, playlist_id, playlist_title, playlist_description)
# single video story (e.g. http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret)
return self.playlist_result(entries, playlist_id, playlist_title, playlist_description)
# single video story (e.g. http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret)
@@
-829,10
+834,6
@@
class BBCIE(BBCCoUkIE):
'subtitles': subtitles,
}
'subtitles': subtitles,
}
- playlist_title = self._html_search_regex(
- r'<title>(.*?)(?:\s*-\s*BBC [^ ]+)?</title>', webpage, 'playlist title')
- playlist_description = self._og_search_description(webpage, default=None)
-
def extract_all(pattern):
return list(filter(None, map(
lambda s: self._parse_json(s, playlist_id, fatal=False),
def extract_all(pattern):
return list(filter(None, map(
lambda s: self._parse_json(s, playlist_id, fatal=False),