Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backups
youtube-dl
Commits
b5869560
Unverified
Commit
b5869560
authored
Feb 23, 2017
by
Yen Chi Hsuan
Browse files
[crunchyroll] Fix descriptions with double quotes (closes #12124)
parent
527ef85f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
4 deletions
+25
-4
ChangeLog
ChangeLog
+6
-0
youtube_dl/extractor/crunchyroll.py
youtube_dl/extractor/crunchyroll.py
+19
-4
No files found.
ChangeLog
View file @
b5869560
version <unreleased>
Extractors
* [crunchyroll] Fix descriptions with double quotes (#12124)
version 2017.02.21
Core
...
...
youtube_dl/extractor/crunchyroll.py
View file @
b5869560
...
...
@@ -123,7 +123,7 @@ class CrunchyrollIE(CrunchyrollBaseIE):
'url'
:
'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513'
,
'info_dict'
:
{
'id'
:
'645513'
,
'ext'
:
'
flv
'
,
'ext'
:
'
mp4
'
,
'title'
:
'Wanna be the Strongest in the World Episode 1 – An Idol-Wrestler is Born!'
,
'description'
:
'md5:2d17137920c64f2f49981a7797d275ef'
,
'thumbnail'
:
'http://img1.ak.crunchyroll.com/i/spire1-tmb/20c6b5e10f1a47b10516877d3c039cae1380951166_full.jpg'
,
...
...
@@ -192,6 +192,21 @@ class CrunchyrollIE(CrunchyrollBaseIE):
# geo-restricted (US), 18+ maturity wall, non-premium available
'url'
:
'http://www.crunchyroll.com/cosplay-complex-ova/episode-1-the-birth-of-the-cosplay-club-565617'
,
'only_matching'
:
True
,
},
{
# A description with double quotes
'url'
:
'http://www.crunchyroll.com/11eyes/episode-1-piros-jszaka-red-night-535080'
,
'info_dict'
:
{
'id'
:
'535080'
,
'ext'
:
'mp4'
,
'title'
:
'11eyes Episode 1 – Piros éjszaka - Red Night'
,
'description'
:
'Kakeru and Yuka are thrown into an alternate nightmarish world they call "Red Night".'
,
'uploader'
:
'Marvelous AQL Inc.'
,
'upload_date'
:
'20091021'
,
},
'params'
:
{
# Just test metadata extraction
'skip_download'
:
True
,
},
}]
_FORMAT_IDS
=
{
...
...
@@ -362,9 +377,9 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
r
'(?s)<h1[^>]*>((?:(?!<h1).)*?<span[^>]+itemprop=["\']title["\'][^>]*>(?:(?!<h1).)+?)</h1>'
,
webpage
,
'video_title'
)
video_title
=
re
.
sub
(
r
' {2,}'
,
' '
,
video_title
)
video_description
=
self
.
_html_search_regex
(
r
'<script[^>]*>\s*.+?\[media_id=%s\].+?"description"\s*:
\s*"([^"]+)
'
%
video_id
,
webpage
,
'description'
,
default
=
None
)
video_description
=
self
.
_parse_json
(
self
.
_html_search_regex
(
r
'<script[^>]*>\s*.+?\[media_id=%s\].+?
({.+?
"description"\s*:
.+?})\);
'
%
video_id
,
webpage
,
'description'
,
default
=
'{}'
),
video_id
).
get
(
'description'
)
if
video_description
:
video_description
=
lowercase_escape
(
video_description
.
replace
(
r
'\r\n'
,
'
\n
'
))
video_upload_date
=
self
.
_html_search_regex
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment