Merge branch 'vgtv' of https://github.com/mrkolby/youtube-dl into mrkolby-vgtv

[youtube-dl] / youtube_dl / extractor / gameone.py

diff --git a/youtube_dl/extractor/gameone.py b/youtube_dl/extractor/gameone.py
index 0a0fb19e63a3e9e86afca03715ac5506c5cc3c27..3022f539d2571f34ae87bc91dc4cf1f1e25ccdc0 100644 (file)
--- a/youtube_dl/extractor/gameone.py
+++ b/youtube_dl/extractor/gameone.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import datetime
 import re
 
 from .common import InfoExtractor
@@ -90,14 +89,24 @@ class GameOneIE(InfoExtractor):
             'timestamp': timestamp,
         }
 
+
 class GameOnePlaylistIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?gameone\.de(?:/tv)?/?$'
+    IE_NAME = 'gameone:playlist'
+    _TEST = {
+        'url': 'http://www.gameone.de/tv',
+        'info_dict': {
+            'title': 'GameOne',
+        },
+        'playlist_mincount': 294,
+    }
 
     def _real_extract(self, url):
-        this_year = datetime.date.today().year
-        webpage = self._download_webpage('http://www.gameone.de/tv/year/%d' % this_year, this_year)
+        webpage = self._download_webpage('http://www.gameone.de/tv', 'TV')
         max_id = max(map(int, re.findall(r'<a href="/tv/(\d+)"', webpage)))
-        entries = [self.url_result('http://www.gameone.de/tv/%d' % video_id, 'GameOne') for video_id in range(max_id, 0, -1)]
+        entries = [
+            self.url_result('http://www.gameone.de/tv/%d' % video_id, 'GameOne')
+            for video_id in range(max_id, 0, -1)]
 
         return {
             '_type': 'playlist',