summary refs log tree commit diff
diff options
context:
space:
mode:
authorJChris246 <43832407+JChris246@users.noreply.github.com>2019-01-28 19:42:49 -0400
committerSergey M․ <dstftw@gmail.com>2019-01-29 23:58:44 +0700
commit41cff90c41006b30213c7f676bd3920a1612b717 (patch)
tree73744f9bfa8df7844403a95b7659227a0b3add40
parenta2d821d7112fb1423f99ddf309a843c80cc3be2d (diff)
downloadyoutube-dl-41cff90c41006b30213c7f676bd3920a1612b717.tar.gz
youtube-dl-41cff90c41006b30213c7f676bd3920a1612b717.tar.xz
youtube-dl-41cff90c41006b30213c7f676bd3920a1612b717.zip
[yourporn] Fix extraction and extract duration (closes #18815, closes #18852)
change cdn to cdn4 for the video_url
-rw-r--r--youtube_dl/extractor/yourporn.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dl/extractor/yourporn.py
index c8dc29bd8..01e5f0c0e 100644
--- a/youtube_dl/extractor/yourporn.py
+++ b/youtube_dl/extractor/yourporn.py
@@ -1,7 +1,10 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..utils import urljoin
+from ..utils import (
+    parse_duration,
+    urljoin
+)
 
 
 class YourPornIE(InfoExtractor):
@@ -27,17 +30,21 @@ class YourPornIE(InfoExtractor):
             self._search_regex(
                 r'data-vnfo=(["\'])(?P<data>{.+?})\1', webpage, 'data info',
                 group='data'),
-            video_id)[video_id]).replace('/cdn/', '/cdn3/')
+            video_id)[video_id]).replace('/cdn/', '/cdn4/')
 
         title = (self._search_regex(
             r'<[^>]+\bclass=["\']PostEditTA[^>]+>([^<]+)', webpage, 'title',
             default=None) or self._og_search_description(webpage)).strip()
+
         thumbnail = self._og_search_thumbnail(webpage)
 
+        duration = parse_duration(self._search_regex(r'duration:[^0-9]*([0-9:]+)',
+                                                     webpage, 'duration', default=None))
         return {
             'id': video_id,
             'url': video_url,
             'title': title,
+            'duration': duration,
             'thumbnail': thumbnail,
             'age_limit': 18
         }