aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsnipem <mail@matthias-kuech.de>2015-04-04 12:31:48 +0200
committersnipem <mail@matthias-kuech.de>2015-04-04 12:31:48 +0200
commit115c281672bd7479f87c48249f6a0186ac7d19cc (patch)
tree65d66619042150bcda97e2e5d96b7ab4a5e7aaf7
parente81a47460365738a0add4d4da52a712c0091704f (diff)
downloadyoutube-dl-115c281672bd7479f87c48249f6a0186ac7d19cc.tar.xz
[Gamersyde] Improved robustness, added duration and tests
Fix for Json syntax is now less error prone for Json syntax inside of values. Extractor is now also using native Json handling. Added tests for several videos that were producing errors in the first place.
-rw-r--r--youtube_dl/extractor/gamersyde.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/youtube_dl/extractor/gamersyde.py b/youtube_dl/extractor/gamersyde.py
index c40106216..5c68a6891 100644
--- a/youtube_dl/extractor/gamersyde.py
+++ b/youtube_dl/extractor/gamersyde.py
@@ -8,7 +8,6 @@ from .common import InfoExtractor
class GamersydeIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?gamersyde\.com/hqstream_'
- _TEST = {
'url': 'http://www.gamersyde.com/hqstream_bloodborne_birth_of_a_hero-34371_en.html',
'md5': 'f38d400d32f19724570040d5ce3a505f',
'info_dict': {
@@ -17,6 +16,11 @@ class GamersydeIE(InfoExtractor):
'title': 'Bloodborne - Birth of a hero',
'thumbnail': 're:^https?://.*\.jpg$',
}
+ },
+ {
+ 'url': 'http://www.gamersyde.com/hqstream_dark_souls_ii_scholar_of_the_first_sin_gameplay_part_1-34417_en.html',
+ 'info_dict': {
+ 'ext': 'mp4',
}
def _calculateDuration(self, durationString):
@@ -27,7 +31,6 @@ class GamersydeIE(InfoExtractor):
json = re.sub(r"{\s*(\w)", r'{"\1', json)
json = re.sub(r",\s*(\w)", r',"\1', json)
- json = re.sub(r"(\w): ", r'\1":', json)
json = re.sub(r",\s*}", "}", json, flags=re.DOTALL)
json = re.sub(r",\s*]", "]", json, flags=re.DOTALL)
@@ -40,7 +43,6 @@ class GamersydeIE(InfoExtractor):
filesJson = self._search_regex(r'playlist: (.*?)\}\);', webpage, 'files', flags=re.DOTALL)
filesJson = self._fixJsonSyntax(filesJson)
-
data = json.loads(filesJson)
playlist = data[0]