update from upstream

1 files changed, 24 insertions, 0 deletions

diff --git a/hypervideo_dl/extractor/iwara.py b/hypervideo_dl/extractor/iwara.py
index 907d5fc..254d986 100644
--- a/hypervideo_dl/extractor/iwara.py
+++ b/hypervideo_dl/extractor/iwara.py
@@ -1,5 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
+import re
 
 from .common import InfoExtractor
 from ..compat import compat_urllib_parse_urlparse
@@ -8,6 +9,8 @@ from ..utils import (
     mimetype2ext,
     remove_end,
     url_or_none,
+    unified_strdate,
+    strip_or_none,
 )
 
 
@@ -21,6 +24,10 @@ class IwaraIE(InfoExtractor):
             'ext': 'mp4',
             'title': '【MMD R-18】ガールフレンド carry_me_off',
             'age_limit': 18,
+            'thumbnail': 'https://i.iwara.tv/sites/default/files/videos/thumbnails/7951/thumbnail-7951_0001.png',
+            'uploader': 'Reimu丨Action',
+            'upload_date': '20150828',
+            'description': 'md5:1d4905ce48c66c9299c617f08e106e0f',
         },
     }, {
         'url': 'http://ecchi.iwara.tv/videos/Vb4yf2yZspkzkBO',
@@ -72,6 +79,19 @@ class IwaraIE(InfoExtractor):
         title = remove_end(self._html_search_regex(
             r'<title>([^<]+)</title>', webpage, 'title'), ' | Iwara')
 
+        thumbnail = self._html_search_regex(
+            r'poster=[\'"]([^\'"]+)', webpage, 'thumbnail', default=None)
+
+        uploader = self._html_search_regex(
+            r'class="username">([^<]+)', webpage, 'uploader', fatal=False)
+
+        upload_date = unified_strdate(self._html_search_regex(
+            r'作成日:([^\s]+)', webpage, 'upload_date', fatal=False))
+
+        description = strip_or_none(self._search_regex(
+            r'<p>(.+?(?=</div))', webpage, 'description', fatal=False,
+            flags=re.DOTALL))
+
         formats = []
         for a_format in video_data:
             format_uri = url_or_none(a_format.get('uri'))
@@ -96,4 +116,8 @@ class IwaraIE(InfoExtractor):
             'title': title,
             'age_limit': age_limit,
             'formats': formats,
+            'thumbnail': self._proto_relative_url(thumbnail, 'https:'),
+            'uploader': uploader,
+            'upload_date': upload_date,
+            'description': description,
         }