From 337a100b9371482871865f1e94377161ebd72fb6 Mon Sep 17 00:00:00 2001
From: Itay Perl <itay.perl@gmail.com>
Date: Sat, 30 Mar 2019 19:07:51 +0300
Subject: [PATCH 1/2] add extractor for 13tv.co.il

---
 docs/supportedsites.md             |  1 +
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/reshet.py     | 42 ++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 youtube_dl/extractor/reshet.py

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 02bc088ab..7e88b869f 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -1,4 +1,5 @@
 # Supported sites
+ - **13tv.co.il**
  - **1tv**: Первый канал
  - **1up.com**
  - **20min**
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 64d1fa251..bb924627a 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -916,6 +916,7 @@ from .rentv import (
     RENTVIE,
     RENTVArticleIE,
 )
+from .reshet import ReshetIE
 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE
diff --git a/youtube_dl/extractor/reshet.py b/youtube_dl/extractor/reshet.py
new file mode 100644
index 000000000..f5cd21183
--- /dev/null
+++ b/youtube_dl/extractor/reshet.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    urljoin,
+)
+
+
+class ReshetIE(InfoExtractor):
+    _VALID_URL = r'https?://13tv\.co\.il/item/(?P<category>[^/]+)/(?P<series>[^/]+)/(?P<season>[^/]+)/(?P<type>[^/]+)/(?P<id>[^/]+)/?'
+
+    _TEST = {
+        'url': 'https://13tv.co.il/item/entertainment/gav-hauma/season-10/episodes/jz1a1-1028855',
+        'note': 'Test brightcove URL extraction',
+        'info_dict': {
+            'id': '6015811232001',
+            'ext': 'mp4',
+            'timestamp': 1553031049,
+            'title': 'entertainment-gav-hauma-season-10-episodes-10-full_au8bmF8M',
+            'uploader_id': '1551111274001',
+            'upload_date': '20190319',
+        }
+    }
+
+    def _real_extract(self, url):
+        reshet_id = self._match_id(url)
+
+        page = self._download_webpage(url, reshet_id)
+        data = self._parse_json(re.search(r'var initial_data = (.*?);\n', page).group(1), reshet_id)
+        item = data['items'][str(data['curItem'])]
+        brightcove_id = item['video']['videoID']
+
+        main_js_url = urljoin(url, re.search(r'<script type="text/javascript" src="(/[^"]*/main.[a-f0-9]+\.js)">', page).group(1))
+        js = self._download_webpage(main_js_url, reshet_id)
+        acctId, playerId = re.search('accountID:[^,]*"([0-9]+)",playerID:[^,]*"([^"]+)",', js).groups()
+
+        brightcove_url = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s' % (acctId, playerId, brightcove_id)
+
+        return self.url_result(brightcove_url, 'BrightcoveNew')

From a7effddc0c741f6035d56b6b256ad1817ba36577 Mon Sep 17 00:00:00 2001
From: Itay Perl <itay.perl@gmail.com>
Date: Fri, 6 Mar 2020 13:30:30 +0200
Subject: [PATCH 2/2] reshet: new CDN

---
 youtube_dl/extractor/reshet.py | 63 +++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/youtube_dl/extractor/reshet.py b/youtube_dl/extractor/reshet.py
index f5cd21183..1d30048d9 100644
--- a/youtube_dl/extractor/reshet.py
+++ b/youtube_dl/extractor/reshet.py
@@ -4,17 +4,19 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
+import os
 from ..utils import (
+    js_to_json,
     urljoin,
 )
 
 
 class ReshetIE(InfoExtractor):
-    _VALID_URL = r'https?://13tv\.co\.il/item/(?P<category>[^/]+)/(?P<series>[^/]+)/(?P<season>[^/]+)/(?P<type>[^/]+)/(?P<id>[^/]+)/?'
+    _VALID_URL = r'https?://13tv\.co\.il/(?:(?:item/)?[^/]+/[^/]+/[^/]+/[^/]+(?:/(?P<id>[^/]+))?/?|live/?)'
 
     _TEST = {
         'url': 'https://13tv.co.il/item/entertainment/gav-hauma/season-10/episodes/jz1a1-1028855',
-        'note': 'Test brightcove URL extraction',
+        'note': 'Test URL extraction',
         'info_dict': {
             'id': '6015811232001',
             'ext': 'mp4',
@@ -26,17 +28,60 @@ class ReshetIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
-        reshet_id = self._match_id(url)
+        if re.search('live/?$', url):
+            reshet_id = 'live'
+        else:
+            reshet_id = self._match_id(url)
 
         page = self._download_webpage(url, reshet_id)
-        data = self._parse_json(re.search(r'var initial_data = (.*?);\n', page).group(1), reshet_id)
-        item = data['items'][str(data['curItem'])]
-        brightcove_id = item['video']['videoID']
+
+        data = self._parse_json(re.search(r'window.data_query = (.*?).data_query;\n', page).group(1), reshet_id)
+
+        liveId = data.get('header', {}).get('Live', {}).get('videoId')
+        curItem = data.get('curItem')
+
+        if liveId is None and curItem is None:
+            # create a playlist result
+            entries = []
+
+            for item in data['items'].values():
+                if item.get('video') is None:
+                    continue
+
+                entries.append(self.url_result(item['link'],
+                                               video_id=item['post_ID'],
+                                               video_title=item['title']))
+
+            return self.playlist_result(entries)
 
         main_js_url = urljoin(url, re.search(r'<script type="text/javascript" src="(/[^"]*/main.[a-f0-9]+\.js)">', page).group(1))
         js = self._download_webpage(main_js_url, reshet_id)
-        acctId, playerId = re.search('accountID:[^,]*"([0-9]+)",playerID:[^,]*"([^"]+)",', js).groups()
 
-        brightcove_url = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s' % (acctId, playerId, brightcove_id)
+        ccid = re.search('"data-ccid":"(.*?)"', js).group(1)
 
-        return self.url_result(brightcove_url, 'BrightcoveNew')
+        if curItem is not None:
+            item = data['items'][str(data['curItem'])]
+            ref = item['video']['videoRef']
+            video_info = self._download_json('https://13tv-api.oplayer.io/api/getlink/getVideoByFileName?userId=%s&videoName=%s&serverType=web' % (ccid, ref), ref)
+
+            v = video_info[0]
+            base_name, ext = os.path.splitext(v['MediaFile'])
+            cdn_url = ''.join((v['ProtocolType'], v['ServerAddress'], v['MediaRoot'], base_name, v['Bitrates'], ext, v['StreamingType'], v['Token']))
+
+            return {
+                'id': str(item['video']['videoID']),
+                'title': ref,
+                'formats': self._extract_m3u8_formats(cdn_url, ref, 'mp4')
+            }
+        elif liveId is not None:
+            liveName = liveId.split(':')[1]
+            config_js = self._download_webpage('https://13tv.co.il/wp-content/themes/reshet_tv/build/config.min.js', reshet_id)
+            config = self._parse_json(js_to_json(re.fullmatch('.*?=(.*);', config_js).group(1)), reshet_id)
+            channel = config['liveRefId'][liveName]['ch']
+            video_info = self._download_json('https://13tv-api.oplayer.io/api/getlink/?userId=%s&serverType=web&ch=%s&cdnName=casttime' % (ccid, channel), reshet_id)
+            video_url = video_info[0]['Link']
+            return {
+                'id': str(channel),
+                'title': liveName,
+                'formats': self._extract_m3u8_formats(video_url, liveName, 'mp4')
+            }