From 10cab648ca999b8a82b5f95579d90131a823dbe5 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 01:15:29 -0300
Subject: [PATCH 01/10] [hanime] Add new extractor

---
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/hanime.py     | 71 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 youtube_dl/extractor/hanime.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 64d1fa251..3fd5ae986 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -420,6 +420,7 @@ from .goshgay import GoshgayIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hbo import HBOIE
+from .hanime import HanimeIE
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
new file mode 100644
index 000000000..f06066e21
--- /dev/null
+++ b/youtube_dl/extractor/hanime.py
@@ -0,0 +1,71 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+from ..utils import clean_html
+
+
+class HanimeIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?hanime\.tv/videos/hentai/(?P<id>.+)(?:\?playlist_id=\w+)?'
+    _TEST = {
+        'url': 'https://hanime.tv/videos/hentai/kuroinu-1',
+        'info_dict': {
+            'id': '33964',
+            'display_id': 'kuroinu-1',
+            'title': 'Kuroinu 1',
+            'description': 'md5:37d5bb20d4a0834bd147bc1bac588a0b',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'release_date': '20120127',
+            'upload_date': '20140509',
+            'creator': 'Magin Label',
+            'view_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'tags': list,
+            'censored': True,
+            'ext': 'mp4',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }
+
+    def _real_extract(self, url):
+        video_slug = self._match_id(url)
+
+        webpage = self._download_webpage(url, video_slug)
+        page_json = self._html_search_regex(r'window.__NUXT__=(.+?);<\/script>', webpage, 'Inline JSON')
+        page_json = self._parse_json(page_json, video_slug).get('state').get('data').get('video').get('hentai_video')
+        api_json = self._download_json(
+            'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
+            video_slug,
+            'API Call', headers={'X-Directive': 'api'}
+        )
+        api_json = api_json.get('videos_manifest').get('servers')[0].get('streams')
+
+        title = page_json.get('name') or api_json.get[0].get('video_stream_group_id')
+        tags = [t.get('text') for t in page_json.get('hentai_tags')]
+
+        video_id = str(api_json[0].get('id'))
+        playlist_url = api_json[0].get('url') or api_json[1].get('url')
+        formats = self._extract_m3u8_formats(playlist_url, video_slug, 'mp4')
+        return {
+            'id': video_id,
+            'display_id': video_slug,
+            'title': title,
+            'description': clean_html(page_json.get('description')).strip(),
+            'thumbnails': [
+                {'id': 'Cover', 'url': page_json.get('cover_url')},
+                {'id': 'Poster', 'url': page_json.get('poster_url')}
+            ],
+            'release_date': page_json.get('released_at').replace('-', '')[:8],
+            'upload_date': page_json.get('created_at').replace('-', '')[:8],
+            'creator': page_json.get('brand'),
+            'view_count': page_json.get('views'),
+            'like_count': page_json.get('likes'),
+            'dislike_count': page_json.get('dislikes'),
+            'tags': tags,
+            'censored': page_json.get('is_censored'),
+            'formats': formats,
+        }

From 99821416d491b8707bb993755f1f2472055be0b7 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 02:51:37 -0300
Subject: [PATCH 02/10] Parse all resolutions

---
 youtube_dl/extractor/hanime.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index f06066e21..eea6a5511 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -41,15 +41,24 @@ class HanimeIE(InfoExtractor):
             'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
             video_slug,
             'API Call', headers={'X-Directive': 'api'}
-        )
-        api_json = api_json.get('videos_manifest').get('servers')[0].get('streams')
+        ).get('videos_manifest').get('servers')[0].get('streams')
 
         title = page_json.get('name') or api_json.get[0].get('video_stream_group_id')
         tags = [t.get('text') for t in page_json.get('hentai_tags')]
 
         video_id = str(api_json[0].get('id'))
-        playlist_url = api_json[0].get('url') or api_json[1].get('url')
-        formats = self._extract_m3u8_formats(playlist_url, video_slug, 'mp4')
+        formats = []
+        for f in api_json:
+            format = {
+                'width': int(f.get('width')),
+                'height': int(f.get('height')),
+                'filesize_approx': f.get('filesize_mbs') * 1000000,
+                'ext': 'mp4',
+                'url': f.get('url') or 'https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'),
+            }
+            formats.append(format)
+        formats.reverse()
+
         return {
             'id': video_id,
             'display_id': video_slug,

From 91a186a870394b781036cb6869d4367a358154cf Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 15:23:38 -0300
Subject: [PATCH 03/10] Added m3u8 to format list with https protocol Calculate
 TBR from Filesize and Duration, if provided Use parsing and conversion
 functions

---
 youtube_dl/extractor/hanime.py | 67 ++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index eea6a5511..05c23f225 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -2,11 +2,20 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..utils import clean_html
+from ..utils import (
+    clean_html,
+    parse_filesize,
+    float_or_none,
+    int_or_none,
+    unified_strdate,
+    str_or_none,
+    url_or_none,
+    parse_duration,
+)
 
 
 class HanimeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?hanime\.tv/videos/hentai/(?P<id>.+)(?:\?playlist_id=\w+)?'
+    _VALID_URL = r'https?://(?:www\.)?hanime\.tv/videos/hentai/(?P<id>.+)(?:\?playlist_id=.+)?'
     _TEST = {
         'url': 'https://hanime.tv/videos/hentai/kuroinu-1',
         'info_dict': {
@@ -22,7 +31,7 @@ class HanimeIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'tags': list,
-            'censored': True,
+            'censored': 'True',
             'ext': 'mp4',
         },
         'params': {
@@ -40,41 +49,53 @@ class HanimeIE(InfoExtractor):
         api_json = self._download_json(
             'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
             video_slug,
-            'API Call', headers={'X-Directive': 'api'}
-        ).get('videos_manifest').get('servers')[0].get('streams')
+            'API Call', headers={'X-Directive': 'api'}).get('videos_manifest').get('servers')[0].get('streams')
 
         title = page_json.get('name') or api_json.get[0].get('video_stream_group_id')
         tags = [t.get('text') for t in page_json.get('hentai_tags')]
 
-        video_id = str(api_json[0].get('id'))
         formats = []
         for f in api_json:
-            format = {
-                'width': int(f.get('width')),
-                'height': int(f.get('height')),
-                'filesize_approx': f.get('filesize_mbs') * 1000000,
+            item_url = url_or_none(f.get('url')) or url_or_none('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'))
+            format = [{
+                'width': int_or_none(f.get('width')),
+                'height': int_or_none(f.get('height')),
+                'filesize_approx': parse_filesize('%sMb' % f.get('filesize_mbs')),
+                'protocol': 'm3u8',
+                'format_id': 'mp4-%sp' % f.get('height'),
+                'tbr': float_or_none(float_or_none(f.get('filesize_mbs'), invscale=8388), int_or_none(f.get('duration_in_ms'), 1000)),
                 'ext': 'mp4',
-                'url': f.get('url') or 'https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'),
-            }
-            formats.append(format)
+                'url': item_url,
+            }, {
+                'width': int_or_none(f.get('width')),
+                'height': int_or_none(f.get('height')),
+                'protocol': 'https',
+                'format_id': 'm3u8-%sp' % f.get('height'),
+                'format_note': '~8-50.00Kib',
+                'ext': 'm3u8',
+                'url': item_url,
+            }]
+            for i in format:
+                formats.append(i)
         formats.reverse()
 
         return {
-            'id': video_id,
+            'id': str_or_none(api_json[0].get('id')),
             'display_id': video_slug,
             'title': title,
             'description': clean_html(page_json.get('description')).strip(),
             'thumbnails': [
-                {'id': 'Cover', 'url': page_json.get('cover_url')},
-                {'id': 'Poster', 'url': page_json.get('poster_url')}
+                {'preference': 0, 'id': 'Poster', 'url': url_or_none(page_json.get('poster_url'))},
+                {'preference': 1, 'id': 'Cover', 'url': url_or_none(page_json.get('cover_url'))},
             ],
-            'release_date': page_json.get('released_at').replace('-', '')[:8],
-            'upload_date': page_json.get('created_at').replace('-', '')[:8],
-            'creator': page_json.get('brand'),
-            'view_count': page_json.get('views'),
-            'like_count': page_json.get('likes'),
-            'dislike_count': page_json.get('dislikes'),
+            'release_date': unified_strdate(page_json.get('released_at')),
+            'upload_date': unified_strdate(page_json.get('created_at')),
+            'creator': str_or_none(page_json.get('brand')),
+            'view_count': int_or_none(page_json.get('views')),
+            'like_count': int_or_none(page_json.get('likes')),
+            'dislike_count': int_or_none(page_json.get('dislikes')),
+            'duration': parse_duration('%sms' % f.get('duration_in_ms')),
             'tags': tags,
-            'censored': page_json.get('is_censored'),
+            'censored': str_or_none(page_json.get('is_censored')),
             'formats': formats,
         }

From 80dc340b82281e5b1745e143c660d9d211b5ea07 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 15:24:33 -0300
Subject: [PATCH 04/10] Add ZeroDivisionError to exception list on int_or_none
 and float_or_none

---
 youtube_dl/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 38262bee4..80d824f81 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -3524,7 +3524,7 @@ def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
         return default
     try:
         return int(v) * invscale // scale
-    except (ValueError, TypeError):
+    except (ValueError, TypeError, ZeroDivisionError):
         return default
 
 
@@ -3546,7 +3546,7 @@ def float_or_none(v, scale=1, invscale=1, default=None):
         return default
     try:
         return float(v) * invscale / scale
-    except (ValueError, TypeError):
+    except (ValueError, TypeError, ZeroDivisionError):
         return default
 
 

From ef753bc223ee1b4490ba14c9839b77a16b050ede Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 20:44:45 -0300
Subject: [PATCH 05/10] Revert ZeroDivisionError exception

---
 youtube_dl/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 80d824f81..38262bee4 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -3524,7 +3524,7 @@ def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
         return default
     try:
         return int(v) * invscale // scale
-    except (ValueError, TypeError, ZeroDivisionError):
+    except (ValueError, TypeError):
         return default
 
 
@@ -3546,7 +3546,7 @@ def float_or_none(v, scale=1, invscale=1, default=None):
         return default
     try:
         return float(v) * invscale / scale
-    except (ValueError, TypeError, ZeroDivisionError):
+    except (ValueError, TypeError):
         return default
 
 

From 9aaf20b0ed975f44aae283b887ce0041d11be970 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 21:24:00 -0300
Subject: [PATCH 06/10] Requested changes

---
 youtube_dl/extractor/hanime.py | 58 +++++++++++++++-------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index 05c23f225..8f1c81e9c 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -7,10 +7,13 @@ from ..utils import (
     parse_filesize,
     float_or_none,
     int_or_none,
+    parse_iso8601,
     unified_strdate,
     str_or_none,
-    url_or_none,
     parse_duration,
+    sanitize_url,
+    compat_str,
+    try_get,
 )
 
 
@@ -26,12 +29,12 @@ class HanimeIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'release_date': '20120127',
             'upload_date': '20140509',
+            'timestamp': 1399624976,
             'creator': 'Magin Label',
             'view_count': int,
             'like_count': int,
             'dislike_count': int,
             'tags': list,
-            'censored': 'True',
             'ext': 'mp4',
         },
         'params': {
@@ -42,60 +45,51 @@ class HanimeIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_slug = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_slug)
-        page_json = self._html_search_regex(r'window.__NUXT__=(.+?);<\/script>', webpage, 'Inline JSON')
-        page_json = self._parse_json(page_json, video_slug).get('state').get('data').get('video').get('hentai_video')
+        page_json = self._html_search_regex(r'<script>.+__NUXT__=(.+?);<\/script>', self._download_webpage(url, video_slug), 'Inline JSON')
+        page_json = try_get(self._parse_json(page_json, video_slug), lambda x: x['state']['data']['video']['hentai_video'], dict) or {}
         api_json = self._download_json(
             'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
             video_slug,
             'API Call', headers={'X-Directive': 'api'}).get('videos_manifest').get('servers')[0].get('streams')
-
         title = page_json.get('name') or api_json.get[0].get('video_stream_group_id')
-        tags = [t.get('text') for t in page_json.get('hentai_tags')]
-
+        tags = []
+        for t in page_json.get('hentai_tags'):
+            if t.get('text'):
+                tags.append('text')
         formats = []
         for f in api_json:
-            item_url = url_or_none(f.get('url')) or url_or_none('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'))
-            format = [{
-                'width': int_or_none(f.get('width')),
-                'height': int_or_none(f.get('height')),
-                'filesize_approx': parse_filesize('%sMb' % f.get('filesize_mbs')),
+            item_url = sanitize_url(f.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'))
+            width = float_or_none(f.get('width'))
+            height = float_or_none(f.get('height'))
+            format = {
+                'width': width,
+                'height': height,
+                'filesize_approx': float_or_none(parse_filesize('%sMb' % f.get('filesize_mbs'))),
                 'protocol': 'm3u8',
                 'format_id': 'mp4-%sp' % f.get('height'),
-                'tbr': float_or_none(float_or_none(f.get('filesize_mbs'), invscale=8388), int_or_none(f.get('duration_in_ms'), 1000)),
                 'ext': 'mp4',
                 'url': item_url,
-            }, {
-                'width': int_or_none(f.get('width')),
-                'height': int_or_none(f.get('height')),
-                'protocol': 'https',
-                'format_id': 'm3u8-%sp' % f.get('height'),
-                'format_note': '~8-50.00Kib',
-                'ext': 'm3u8',
-                'url': item_url,
-            }]
-            for i in format:
-                formats.append(i)
+            }
+            formats.append(format)
         formats.reverse()
 
         return {
-            'id': str_or_none(api_json[0].get('id')),
+            'id': compat_str(api_json[0].get('id')),
             'display_id': video_slug,
             'title': title,
-            'description': clean_html(page_json.get('description')).strip(),
+            'description': clean_html(page_json.get('description')),
             'thumbnails': [
-                {'preference': 0, 'id': 'Poster', 'url': url_or_none(page_json.get('poster_url'))},
-                {'preference': 1, 'id': 'Cover', 'url': url_or_none(page_json.get('cover_url'))},
+                {'preference': 0, 'id': 'Poster', 'url': page_json.get('poster_url')},
+                {'preference': 1, 'id': 'Cover', 'url': page_json.get('cover_url')},
             ],
             'release_date': unified_strdate(page_json.get('released_at')),
             'upload_date': unified_strdate(page_json.get('created_at')),
+            'timestamp': parse_iso8601(page_json.get('created_at')),
             'creator': str_or_none(page_json.get('brand')),
             'view_count': int_or_none(page_json.get('views')),
             'like_count': int_or_none(page_json.get('likes')),
             'dislike_count': int_or_none(page_json.get('dislikes')),
-            'duration': parse_duration('%sms' % f.get('duration_in_ms')),
+            'duration': float_or_none(parse_duration('%sms' % f.get('duration_in_ms'))),
             'tags': tags,
-            'censored': str_or_none(page_json.get('is_censored')),
             'formats': formats,
         }

From 0f7e8dcfa24620c3055ac2b88615187a71e344e7 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Thu, 12 Mar 2020 21:42:35 -0300
Subject: [PATCH 07/10] int_or_none

---
 youtube_dl/extractor/hanime.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index 8f1c81e9c..5a2d2ed87 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -59,8 +59,8 @@ class HanimeIE(InfoExtractor):
         formats = []
         for f in api_json:
             item_url = sanitize_url(f.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'))
-            width = float_or_none(f.get('width'))
-            height = float_or_none(f.get('height'))
+            width = int_or_none(f.get('width'))
+            height = int_or_none(f.get('height'))
             format = {
                 'width': width,
                 'height': height,

From 79b0d33f634cd1eef713577424cabaafbd82b645 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Fri, 13 Mar 2020 21:53:42 -0300
Subject: [PATCH 08/10] Fix tags list

---
 youtube_dl/extractor/hanime.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index 5a2d2ed87..21fcf11a1 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -55,7 +55,7 @@ class HanimeIE(InfoExtractor):
         tags = []
         for t in page_json.get('hentai_tags'):
             if t.get('text'):
-                tags.append('text')
+                tags.append(t.get('text'))
         formats = []
         for f in api_json:
             item_url = sanitize_url(f.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'))

From 3202fbcb8afbeca58e26a3bc99e312fbac37554c Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Sat, 14 Mar 2020 02:02:10 -0300
Subject: [PATCH 09/10] Ignore potential premium DDL links Iterate over server
 list instead of always using first index Add a couple fallbacks

---
 youtube_dl/extractor/hanime.py | 61 ++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index 21fcf11a1..1da197003 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -47,34 +47,45 @@ class HanimeIE(InfoExtractor):
         video_slug = self._match_id(url)
         page_json = self._html_search_regex(r'<script>.+__NUXT__=(.+?);<\/script>', self._download_webpage(url, video_slug), 'Inline JSON')
         page_json = try_get(self._parse_json(page_json, video_slug), lambda x: x['state']['data']['video']['hentai_video'], dict) or {}
-        api_json = self._download_json(
+        api_json = try_get(self._download_json(
             'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
             video_slug,
-            'API Call', headers={'X-Directive': 'api'}).get('videos_manifest').get('servers')[0].get('streams')
-        title = page_json.get('name') or api_json.get[0].get('video_stream_group_id')
+            'API Call', headers={'X-Directive': 'api'}), lambda x: x['videos_manifest']['servers'], list) or []
+        title = page_json.get('name')
+        duration = parse_duration('%sms' % page_json.get('duration_in_ms'))
         tags = []
-        for t in page_json.get('hentai_tags'):
-            if t.get('text'):
-                tags.append(t.get('text'))
+        for tag in page_json.get('hentai_tags'):
+            if tag.get('text'):
+                tags.append(tag.get('text'))
         formats = []
-        for f in api_json:
-            item_url = sanitize_url(f.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id'))
-            width = int_or_none(f.get('width'))
-            height = int_or_none(f.get('height'))
-            format = {
-                'width': width,
-                'height': height,
-                'filesize_approx': float_or_none(parse_filesize('%sMb' % f.get('filesize_mbs'))),
-                'protocol': 'm3u8',
-                'format_id': 'mp4-%sp' % f.get('height'),
-                'ext': 'mp4',
-                'url': item_url,
-            }
-            formats.append(format)
+        video_id = None
+        for server in api_json:
+            for stream in server['streams']:
+                if stream.get('compatibility') != 'all':
+                    continue
+                item_url = sanitize_url(stream.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % stream.get('id'))
+                width = int_or_none(stream.get('width'))
+                height = int_or_none(stream.get('height'))
+                format = {
+                    'width': width,
+                    'height': height,
+                    'filesize_approx': float_or_none(parse_filesize('%sMb' % stream.get('filesize_mbs'))),
+                    'protocol': 'm3u8',
+                    'format_id': 'mp4-%sp' % stream.get('height'),
+                    'ext': 'mp4',
+                    'url': item_url,
+                }
+                formats.append(format)
+                if not title:
+                    title = stream.get('video_stream_group_id')
+                if not duration:
+                    duration = parse_duration(compat_str(stream.get('duration_in_ms')))
+                if not video_id:
+                    video_id = compat_str(stream.get('id'))
         formats.reverse()
 
         return {
-            'id': compat_str(api_json[0].get('id')),
+            'id': video_id,
             'display_id': video_slug,
             'title': title,
             'description': clean_html(page_json.get('description')),
@@ -82,14 +93,14 @@ class HanimeIE(InfoExtractor):
                 {'preference': 0, 'id': 'Poster', 'url': page_json.get('poster_url')},
                 {'preference': 1, 'id': 'Cover', 'url': page_json.get('cover_url')},
             ],
-            'release_date': unified_strdate(page_json.get('released_at')),
-            'upload_date': unified_strdate(page_json.get('created_at')),
-            'timestamp': parse_iso8601(page_json.get('created_at')),
+            'release_date': unified_strdate(page_json.get('released_at') or compat_str(page_json.get('released_at_unix'))),
+            'upload_date': unified_strdate(page_json.get('created_at') or compat_str(page_json.get('created_at_unix'))),
+            'timestamp': int_or_none(page_json.get('created_at_unix') or parse_iso8601(page_json.get('created_at'))),
             'creator': str_or_none(page_json.get('brand')),
             'view_count': int_or_none(page_json.get('views')),
             'like_count': int_or_none(page_json.get('likes')),
             'dislike_count': int_or_none(page_json.get('dislikes')),
-            'duration': float_or_none(parse_duration('%sms' % f.get('duration_in_ms'))),
+            'duration': float_or_none(duration),
             'tags': tags,
             'formats': formats,
         }

From 81e1ddaf7857731647edda8eda515ecf48d25657 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Sat, 14 Mar 2020 16:20:07 -0300
Subject: [PATCH 10/10] Changed more parsing logic

---
 youtube_dl/extractor/hanime.py | 35 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/youtube_dl/extractor/hanime.py b/youtube_dl/extractor/hanime.py
index 1da197003..242262d01 100644
--- a/youtube_dl/extractor/hanime.py
+++ b/youtube_dl/extractor/hanime.py
@@ -10,7 +10,6 @@ from ..utils import (
     parse_iso8601,
     unified_strdate,
     str_or_none,
-    parse_duration,
     sanitize_url,
     compat_str,
     try_get,
@@ -45,25 +44,32 @@ class HanimeIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_slug = self._match_id(url)
-        page_json = self._html_search_regex(r'<script>.+__NUXT__=(.+?);<\/script>', self._download_webpage(url, video_slug), 'Inline JSON')
+        page_json = self._html_search_regex(r'__NUXT__=({.+?});<\/script>', self._download_webpage(url, video_slug), 'Inline JSON')
         page_json = try_get(self._parse_json(page_json, video_slug), lambda x: x['state']['data']['video']['hentai_video'], dict) or {}
         api_json = try_get(self._download_json(
             'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
             video_slug,
             'API Call', headers={'X-Directive': 'api'}), lambda x: x['videos_manifest']['servers'], list) or []
-        title = page_json.get('name')
-        duration = parse_duration('%sms' % page_json.get('duration_in_ms'))
         tags = []
-        for tag in page_json.get('hentai_tags'):
+        for tag in page_json.get('hentai_tags', []):
             if tag.get('text'):
                 tags.append(tag.get('text'))
+        thumbnails = []
+        if '/covers/' in page_json.get('poster_url'):
+            thumbnails.append({'preference': 0, 'id': 'Poster', 'url': page_json['poster_url']})
+        elif '/posters/' in page_json.get('poster_url'):
+            thumbnails.append({'preference': 1, 'id': 'Cover', 'url': page_json['cover_url']})
+        else:
+            thumbnails = None
         formats = []
         video_id = None
         for server in api_json:
             for stream in server['streams']:
                 if stream.get('compatibility') != 'all':
                     continue
-                item_url = sanitize_url(stream.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % stream.get('id'))
+                if not video_id:
+                    video_id = compat_str(stream['id'])
+                item_url = sanitize_url(stream.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % stream['id'])
                 width = int_or_none(stream.get('width'))
                 height = int_or_none(stream.get('height'))
                 format = {
@@ -76,23 +82,14 @@ class HanimeIE(InfoExtractor):
                     'url': item_url,
                 }
                 formats.append(format)
-                if not title:
-                    title = stream.get('video_stream_group_id')
-                if not duration:
-                    duration = parse_duration(compat_str(stream.get('duration_in_ms')))
-                if not video_id:
-                    video_id = compat_str(stream.get('id'))
         formats.reverse()
 
         return {
-            'id': video_id,
+            'id': video_id or page_json.get('id') or video_slug,
             'display_id': video_slug,
-            'title': title,
+            'title': page_json.get('name') or video_slug.replace('-', ' '),
             'description': clean_html(page_json.get('description')),
-            'thumbnails': [
-                {'preference': 0, 'id': 'Poster', 'url': page_json.get('poster_url')},
-                {'preference': 1, 'id': 'Cover', 'url': page_json.get('cover_url')},
-            ],
+            'thumbnails': thumbnails,
             'release_date': unified_strdate(page_json.get('released_at') or compat_str(page_json.get('released_at_unix'))),
             'upload_date': unified_strdate(page_json.get('created_at') or compat_str(page_json.get('created_at_unix'))),
             'timestamp': int_or_none(page_json.get('created_at_unix') or parse_iso8601(page_json.get('created_at'))),
@@ -100,7 +97,7 @@ class HanimeIE(InfoExtractor):
             'view_count': int_or_none(page_json.get('views')),
             'like_count': int_or_none(page_json.get('likes')),
             'dislike_count': int_or_none(page_json.get('dislikes')),
-            'duration': float_or_none(duration),
+            'duration': float_or_none(page_json.get('duration_in_ms') / 1000),
             'tags': tags,
             'formats': formats,
         }