projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Fix 2.0 manifest extraction (Closes #4830)
[youtube-dl]
/
youtube_dl
/
extractor
/
playfm.py
diff --git
a/youtube_dl/extractor/playfm.py
b/youtube_dl/extractor/playfm.py
index 72df4d842b0d0f2a41a1ae60a8258815709cc805..9576aed0e6668189c1959df3166b1e550facc7b0 100644
(file)
--- a/
youtube_dl/extractor/playfm.py
+++ b/
youtube_dl/extractor/playfm.py
@@
-4,12
+4,15
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_request,
+)
+from ..utils import (
ExtractorError,
float_or_none,
int_or_none,
ExtractorError,
float_or_none,
int_or_none,
+ str_to_int,
)
)
@@
-29,6
+32,7
@@
class PlayFMIE(InfoExtractor):
'duration': 5627.428,
'upload_date': '20140712',
'view_count': int,
'duration': 5627.428,
'upload_date': '20140712',
'view_count': int,
+ 'comment_count': int,
'thumbnail': 're:^https?://.*\.jpg$',
},
}
'thumbnail': 're:^https?://.*\.jpg$',
},
}
@@
-51,7
+55,8
@@
class PlayFMIE(InfoExtractor):
recording = rec_doc.find('./recording')
title = recording.find('./title').text
recording = rec_doc.find('./recording')
title = recording.find('./title').text
- view_count = int_or_none(recording.find('./stats/playcount').text)
+ view_count = str_to_int(recording.find('./stats/playcount').text)
+ comment_count = str_to_int(recording.find('./stats/comments').text)
duration = float_or_none(recording.find('./duration').text, scale=1000)
thumbnail = recording.find('./image').text
duration = float_or_none(recording.find('./duration').text, scale=1000)
thumbnail = recording.find('./image').text
@@
-75,6
+80,7
@@
class PlayFMIE(InfoExtractor):
'title': title,
'upload_date': upload_date,
'view_count': view_count,
'title': title,
'upload_date': upload_date,
'view_count': view_count,
+ 'comment_count': comment_count,
'duration': duration,
'thumbnail': thumbnail,
'uploader': uploader,
'duration': duration,
'thumbnail': thumbnail,
'uploader': uploader,