From 49e0682d1b17a59e01f261f18f8da128e345de7a Mon Sep 17 00:00:00 2001
From: Iaiao <err266228@gmail.com>
Date: Sat, 16 Jan 2021 21:04:31 +0200
Subject: [PATCH 1/4] [goodgame] Add new extractor
---
youtube_dl/extractor/extractors.py | 5 +
youtube_dl/extractor/goodgame.py | 243 +++++++++++++++++++++++++++++
2 files changed, 248 insertions(+)
create mode 100644 youtube_dl/extractor/goodgame.py
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 57d4d319c..f70daaf0b 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -428,6 +428,11 @@ from .globo import (
from .go import GoIE
from .godtube import GodTubeIE
from .golem import GolemIE
+from .goodgame import (
+ GoodgameStreamIE,
+ GoodgameVideoIE,
+ GoodgameClipIE,
+)
from .googledrive import GoogleDriveIE
from .googlepodcasts import (
GooglePodcastsIE,
diff --git a/youtube_dl/extractor/goodgame.py b/youtube_dl/extractor/goodgame.py
new file mode 100644
index 000000000..e6951eeb8
--- /dev/null
+++ b/youtube_dl/extractor/goodgame.py
@@ -0,0 +1,243 @@
+# coding=utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from .youtube import YoutubeIE
+from ..utils import (
+ ExtractorError,
+ int_or_none
+)
+
+
+class GoodgameBaseIE(InfoExtractor):
+ _RTMP_SERVER = 'rtmp://46.61.227.158:1940/vod//'
+ _API_BASE = 'https://goodgame.ru/api'
+ _HLS_BASE = 'https://hls.goodgame.ru/hls'
+ _QUALITIES = {
+ 'Source': '',
+ '240p': '_240',
+ '480p': '_480',
+ '720p': '_720',
+ }
+ _RE_UPLOADER = r'''(?x)
+ <a[^>]+
+ href=\"https?://(?:www\.)?goodgame\.ru/user/(?P<uploader_id>\d+)/\"
+ [^>]*>
+ (?P<uploader>[^<]+)
+ '''
+ _RE_TIMESTAMP = r'utc-timestamp=\"(?P<timestamp>\d+)\"'
+
+ def _extract_uploader(self, webpage):
+ uploader_match = re.search(self._RE_UPLOADER, webpage)
+ if uploader_match:
+ uploader = uploader_match.group('uploader')
+ uploader_id = uploader_match.group('uploader_id')
+ else:
+ uploader, uploader_id = None, None
+
+ return uploader, uploader_id
+
+
+class GoodgameStreamIE(GoodgameBaseIE):
+ IE_NAME = 'goodgame:stream'
+ _VALID_URL = r'https?://(?:www\.)?goodgame\.ru/(channel/|player\?)(?P<id>[^/#?]+)'
+ _TESTS = [{
+ 'url': 'https://goodgame.ru/channel/rutony',
+ 'info_dict': {
+ 'id': 'rutony',
+ 'title': r're:^.*',
+ 'thumbnail': r're:^https?://.*\.jpg$',
+ 'ext': 'mp4',
+ 'is_live': True,
+ },
+ 'params': {
+ 'skip_download': True,
+ }
+ }, {
+ 'url': 'https://goodgame.ru/player?9418',
+ 'info_dict': {
+ 'id': 'Artist.the',
+ 'title': r're:^.*',
+ 'thumbnail': r're:^https?://.*\.jpg$',
+ 'ext': 'mp4',
+ 'is_live': True,
+ },
+ 'params': {
+ 'skip_download': True,
+ }
+ }, {
+ 'url': 'https://goodgame.ru/channel/BRAT_OK/#autoplay',
+ 'only_matching': True,
+ }]
+
+ def _real_extract(self, url):
+ channel_id = self._match_id(url)
+ stream_info = next(
+ _ for _ in self._download_json('%s/getchannelstatus?id=%s&fmt=json' % (self._API_BASE, channel_id),
+ channel_id,
+ note='Downloading stream JSON').values())
+
+ if stream_info.get('status') == 'Dead':
+ raise ExtractorError('%s is offline' % channel_id, expected=True)
+
+ # url with player and stream_id
+ if stream_info.get('key') == stream_info.get('stream_id'):
+ channel_id = self._download_json('%s/player?src=%s' % (self._API_BASE, channel_id),
+ channel_id,
+ note='Downloading streamer info JSON').get('streamer_name')
+
+ _id = self._search_regex(r'src=\"https://goodgame.ru/player\?(?P<id>.+)\"', stream_info.get('embed'), 'id')
+ thumbnail = stream_info.get('thumb')
+ # goodgame.ru host thumbnail image
+ if thumbnail.startswith('//'):
+ thumbnail = 'https:%s' % thumbnail
+ else:
+ thumbnail = None
+
+ title = stream_info.get('title')
+ if title is None:
+ raise ExtractorError('Unable to extract title', video_id=channel_id)
+
+ formats = []
+ for quality, suffix in self._QUALITIES.items():
+ formats.append({
+ 'format_id': quality,
+ 'url': '%s/%s%s.m3u8' % (self._HLS_BASE, _id, suffix),
+ 'ext': 'mp4',
+ 'protocol': 'm3u8'
+ })
+ self._prefer_source(formats)
+ return {
+ 'id': channel_id,
+ 'title': title,
+ 'view_count': int_or_none(stream_info.get('viewers')),
+ 'thumbnail': thumbnail,
+ 'is_live': True,
+ 'formats': formats,
+ }
+
+ def _prefer_source(self, formats):
+ try:
+ source = next(f for f in formats if f['format_id'] == 'Source')
+ source['preference'] = 10
+ except StopIteration:
+ pass
+ self._sort_formats(formats)
+
+
+class GoodgameVideoIE(GoodgameBaseIE):
+ IE_NAME = 'goodgame:video'
+ _VALID_URL = r'https?://(?:www\.)?goodgame\.ru/video/(?P<id>\d+)'
+ _TEST = {
+ # Embedded youtube video
+ 'url': 'https://goodgame.ru/video/49294/',
+ 'add_ie': ['Youtube'],
+ 'info_dict': {
+ 'id': 'EihUN4ylsn4',
+ 'title': 'Шахматы с Бонивуром | Осторожно, мат на стриме! [запись 25.09.17]',
+ 'description': r're:^Большое спасибо за поддержку трансляций интеллектуального формата\..*',
+ 'uploader': 'bonivur',
+ 'uploader_id': '30',
+ 'timestamp': 1506416377,
+ 'upload_date': '20170925',
+ 'ext': 'mp4',
+ },
+ 'params': {
+ 'skip_download': True,
+ }
+ }
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(url, video_id)
+
+ title = self._html_search_regex(
+ r'<div[^>]+class=([\"\'])[^\"\']*video-description[^\"\']*\1[^>]*>.*'
+ r'<div[^>]+class=\"title\"[^>]*>(?P<title>[^<]+)',
+ webpage, 'title', group='title', flags=re.DOTALL)
+ description = self._html_search_regex(r'<div[^>]+class=\"description\"[^>]*>(?P<info>[^\0]*?)</div>',
+ webpage, 'info', fatal=False, default=None)
+ timestamp = self._html_search_regex(self._RE_TIMESTAMP, webpage, 'timestamp', fatal=False, default=None)
+ uploader, uploader_id = self._extract_uploader(webpage)
+
+ embed_url = YoutubeIE._extract_url(webpage)
+ if embed_url:
+ return {
+ '_type': 'url_transparent',
+ 'url': embed_url,
+ 'title': title,
+ 'description': description,
+ 'timestamp': int_or_none(timestamp),
+ 'uploader': uploader,
+ 'uploader_id': uploader_id
+ }
+
+ file = self._html_search_regex(r'<param[^>]+name=\"flashvars\"[^>]+value=\"src=(?P<path>[^=\"]+)\"[^>]*>',
+ webpage, 'path', default=None)
+ if file:
+ rtmp_url = '%s%s' % (self._RTMP_SERVER, file)
+ formats = [{
+ 'format_id': 'rtmp',
+ 'url': rtmp_url,
+ 'ext': 'flv',
+ }]
+
+ return {
+ 'id': video_id,
+ 'title': title,
+ 'description': description,
+ 'timestamp': int_or_none(timestamp),
+ 'uploader': uploader,
+ 'uploader_id': uploader_id,
+ 'formats': formats,
+ }
+
+ raise ExtractorError('Video %s was deleted' % video_id, expected=True)
+
+
+class GoodgameClipIE(GoodgameBaseIE):
+ IE_NAME = 'goodgame:clip'
+ _VALID_URL = r'https?://(?:www\.)?goodgame\.ru/clip/(?P<id>\d+)'
+ _TESTS = [{
+ 'url': 'https://goodgame.ru/clip/397722/',
+ 'info_dict': {
+ 'id': '397722',
+ 'title': 'ЭТО ФИАСКО',
+ 'uploader': '0x111BA6FA',
+ 'uploader_id': '1035569',
+ 'timestamp': 1506975639,
+ 'upload_date': '20171002',
+ 'ext': 'mp4',
+ },
+ 'params': {
+ 'skip_download': True,
+ }
+ }, {
+ 'url': 'https://goodgame.ru/clip/397155/?from=rec',
+ 'only_matching': True,
+ }]
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(url, video_id)
+
+ timestamp = self._html_search_regex(self._RE_TIMESTAMP, webpage, 'timestamp')
+ uploader, uploader_id = self._extract_uploader(webpage)
+
+ formats = [{
+ 'format_id': 'clip',
+ 'url': self._og_search_video_url(webpage),
+ 'ext': 'mp4',
+ }]
+
+ return {
+ 'id': video_id,
+ 'title': self._og_search_title(webpage),
+ 'thumbnail': self._og_search_thumbnail(webpage),
+ 'timestamp': int_or_none(timestamp),
+ 'uploader': uploader,
+ 'uploader_id': uploader_id,
+ 'formats': formats,
+ }
From 1b733c1e2c89d2c137353979744a31dccb4e4f3d Mon Sep 17 00:00:00 2001
From: Iaiao <err266228@gmail.com>
Date: Sat, 16 Jan 2021 22:23:05 +0200
Subject: [PATCH 2/4] [goodgame] Get title like dict[key]
---
youtube_dl/extractor/goodgame.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/youtube_dl/extractor/goodgame.py b/youtube_dl/extractor/goodgame.py
index e6951eeb8..9eba9fe4c 100644
--- a/youtube_dl/extractor/goodgame.py
+++ b/youtube_dl/extractor/goodgame.py
@@ -96,10 +96,6 @@ class GoodgameStreamIE(GoodgameBaseIE):
else:
thumbnail = None
- title = stream_info.get('title')
- if title is None:
- raise ExtractorError('Unable to extract title', video_id=channel_id)
-
formats = []
for quality, suffix in self._QUALITIES.items():
formats.append({
@@ -111,7 +107,7 @@ class GoodgameStreamIE(GoodgameBaseIE):
self._prefer_source(formats)
return {
'id': channel_id,
- 'title': title,
+ 'title': stream_info['title'],
'view_count': int_or_none(stream_info.get('viewers')),
'thumbnail': thumbnail,
'is_live': True,
From 556d03d45019d056024965a261304b90537f29ba Mon Sep 17 00:00:00 2001
From: Iaiao <err266228@gmail.com>
Date: Sat, 16 Jan 2021 22:31:30 +0200
Subject: [PATCH 3/4] [goodgame] Don't capture unused group
---
youtube_dl/extractor/goodgame.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/goodgame.py b/youtube_dl/extractor/goodgame.py
index 9eba9fe4c..cfa3a5fa8 100644
--- a/youtube_dl/extractor/goodgame.py
+++ b/youtube_dl/extractor/goodgame.py
@@ -42,7 +42,7 @@ class GoodgameBaseIE(InfoExtractor):
class GoodgameStreamIE(GoodgameBaseIE):
IE_NAME = 'goodgame:stream'
- _VALID_URL = r'https?://(?:www\.)?goodgame\.ru/(channel/|player\?)(?P<id>[^/#?]+)'
+ _VALID_URL = r'https?://(?:www\.)?goodgame\.ru/(?:channel/|player\?)(?P<id>[^/#?]+)'
_TESTS = [{
'url': 'https://goodgame.ru/channel/rutony',
'info_dict': {
From 19ac5b7656f04e8ba8d1ec136d1791236aa2f052 Mon Sep 17 00:00:00 2001
From: Iaiao <err266228@gmail.com>
Date: Sat, 16 Jan 2021 22:36:05 +0200
Subject: [PATCH 4/4] [goodgame] test view_count with int keyword
---
youtube_dl/extractor/goodgame.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/goodgame.py b/youtube_dl/extractor/goodgame.py
index cfa3a5fa8..41a7d4bd2 100644
--- a/youtube_dl/extractor/goodgame.py
+++ b/youtube_dl/extractor/goodgame.py
@@ -108,7 +108,7 @@ class GoodgameStreamIE(GoodgameBaseIE):
return {
'id': channel_id,
'title': stream_info['title'],
- 'view_count': int_or_none(stream_info.get('viewers')),
+ 'view_count': int(stream_info.get('viewers')),
'thumbnail': thumbnail,
'is_live': True,
'formats': formats,