From b8dc37243a58cb781721f59505e8ae27c12f982a Mon Sep 17 00:00:00 2001
From: TheRealDude2 <the.real.dude@gmx.de>
Date: Thu, 6 Aug 2020 10:11:42 +0200
Subject: [PATCH 1/5] [xhamster] - New videi id with letters

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

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index 0f7be6a7d..d83c7991c 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -26,7 +26,7 @@ class XHamsterIE(InfoExtractor):
                         (?:.+?\.)?%s/
                         (?:
                             movies/(?P<id>\d+)/(?P<display_id>[^/]*)\.html|
-                            videos/(?P<display_id_2>[^/]*)-(?P<id_2>\d+)
+                            videos/(?P<display_id_2>[^/]*)-(?P<id_2>\w+)
                         )
                     ''' % _DOMAINS
     _TESTS = [{

From 245e242a4f755ab467739293191501108ec99406 Mon Sep 17 00:00:00 2001
From: TheRealDude2 <the.real.dude@gmx.de>
Date: Thu, 27 Aug 2020 11:09:30 +0200
Subject: [PATCH 2/5] [xhamster] - testing initials error

---
 youtube_dl/extractor/xhamster.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index 76cac1d75..30f1fdad9 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -127,9 +127,12 @@ class XHamsterIE(InfoExtractor):
             return int_or_none(self._search_regex(
                 r'^(\d+)[pP]', s, 'height', default=None))
 
+
         initials = self._parse_json(
             self._search_regex(
-                r'window\.initials\s*=\s*({.+?})\s*;\s*', webpage, 'initials',
+                r'window\.initials\s*=\s*({.+?})\s*;<', webpage, 'initials',
+                #r'window\.initials\s*=\s*({.+?})\s*;', webpage, 'initials',
+                #r'\<script\sid\=\'initials\-script\'\>\s*=\s*({.+?})\s*;\<\/sript\>', webpage, 'initials',
                 default='{}'),
             video_id, fatal=False)
         if initials:

From a3dbd7924e3d35e12aeccb17aa7f745d1d8f3fc7 Mon Sep 17 00:00:00 2001
From: TheRealDude2 <the.real.dude@gmx.de>
Date: Thu, 27 Aug 2020 11:33:36 +0200
Subject: [PATCH 3/5] [xhamster] - RegEx change to full initials <script> Tag

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

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index 30f1fdad9..145ef03d0 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -130,9 +130,9 @@ class XHamsterIE(InfoExtractor):
 
         initials = self._parse_json(
             self._search_regex(
-                r'window\.initials\s*=\s*({.+?})\s*;<', webpage, 'initials',
+                #r'window\.initials\s*=\s*({.+?})\s*;<', webpage, 'initials',
                 #r'window\.initials\s*=\s*({.+?})\s*;', webpage, 'initials',
-                #r'\<script\sid\=\'initials\-script\'\>\s*=\s*({.+?})\s*;\<\/sript\>', webpage, 'initials',
+                r'<script\s*id=\'initials-script\'>window\.initials\s*=\s*({.+?})\s*;</script>', webpage, 'initials',
                 default='{}'),
             video_id, fatal=False)
         if initials:

From 01a17a562cdeddae35bfde71a8520c893acdf0bd Mon Sep 17 00:00:00 2001
From: TheRealDude2 <the.real.dude@gmx.de>
Date: Fri, 4 Sep 2020 18:11:54 +0200
Subject: [PATCH 4/5] [xhamster] - Initials parsing till ;<\script>

---
 youtube_dl/extractor/xhamster.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index 145ef03d0..2e3a228a3 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -127,12 +127,9 @@ class XHamsterIE(InfoExtractor):
             return int_or_none(self._search_regex(
                 r'^(\d+)[pP]', s, 'height', default=None))
 
-
         initials = self._parse_json(
             self._search_regex(
-                #r'window\.initials\s*=\s*({.+?})\s*;<', webpage, 'initials',
-                #r'window\.initials\s*=\s*({.+?})\s*;', webpage, 'initials',
-                r'<script\s*id=\'initials-script\'>window\.initials\s*=\s*({.+?})\s*;</script>', webpage, 'initials',
+                r'window\.initials\s*=\s*({.+?})\s*;\s*</script>', webpage, 'initials',
                 default='{}'),
             video_id, fatal=False)
         if initials:

From f7b4bbd403b79e9ccc8a68df83408d1c9f657e99 Mon Sep 17 00:00:00 2001
From: Sergey M <dstftw@gmail.com>
Date: Sun, 6 Sep 2020 11:09:15 +0700
Subject: [PATCH 5/5] Update xhamster.py

---
 youtube_dl/extractor/xhamster.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index bb3a203fb..76aeaf9a4 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -138,7 +138,8 @@ class XHamsterIE(InfoExtractor):
 
         initials = self._parse_json(
             self._search_regex(
-                r'window\.initials\s*=\s*({.+?})\s*;\s*</script>', webpage, 'initials',
+                (r'window\.initials\s*=\s*({.+?})\s*;\s*</script>',
+                 r'window\.initials\s*=\s*({.+?})\s*;'), webpage, 'initials',
                 default='{}'),
             video_id, fatal=False)
         if initials: