aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Christopher Rosell <chrippa@tanuki.se>2012-09-22 13:34:07 +0200
committerGravatar Christopher Rosell <chrippa@tanuki.se>2012-09-22 13:34:07 +0200
commit27677065ae56a595727648631139bba77f3b0296 (patch)
treec384366877fa4d9eebdea3c5cbd08afba63a389a
parent7909377651f8d85c76d9016b4c7e61d17a7a6d75 (diff)
Fix broken plugins.onegamenet.
-rw-r--r--src/livestreamer/plugins/ongamenet.py39
1 files changed, 10 insertions, 29 deletions
diff --git a/src/livestreamer/plugins/ongamenet.py b/src/livestreamer/plugins/ongamenet.py
index 0267c84..1cce14b 100644
--- a/src/livestreamer/plugins/ongamenet.py
+++ b/src/livestreamer/plugins/ongamenet.py
@@ -6,47 +6,28 @@ from livestreamer.utils import urlget
import re
class Ongamenet(Plugin):
- PlayerURL = "http://www.ongamenet.com/front/ongame/live/vodPlayerHD.jsp"
+ PlayerURL = "http://www.tooniland.com/ongame/ognLive.tl"
SWFURL = "http://www.ongamenet.com/front/ongame/live/CJPlayer.swf"
PageURL = "http://www.ongamenet.com"
- Streams = {
- "high": "hd",
- "low": "sd"
- }
+ Streams = ["sd", "hd"]
@classmethod
def can_handle_url(self, url):
return "ongamenet.com" in url
- def _get_play_url(self, var):
- res = urlget(self.PlayerURL)
-
- stream = None
- server = None
-
- streams = re.findall(('var {0}Stream = "(.+)"\;\r\n').format(var), res.text)
- servers = re.findall(('var {0}Server = "(.+)"\;\r\n').format(var), res.text)
-
- if streams and len(streams) >= 2:
- stream = streams[1]
-
- if servers and len(servers) >= 1:
- server = servers[0]
-
- return (server, stream)
-
def _get_streams(self):
+ res = urlget(self.PlayerURL)
+ urls = re.findall("return \"(rtmp://.+)\"", res.text)
streams = {}
- for var, name in self.Streams.items():
- server, stream = self._get_play_url(var)
-
- if not (stream and server):
- continue
+ for i, url in enumerate(urls):
+ if i >= len(self.Streams):
+ name = "stream_" + str(i)
+ else:
+ name = self.Streams[i]
streams[name] = RTMPStream(self.session, {
- "rtmp": server,
- "playpath": stream,
+ "rtmp": url,
"swfUrl": self.SWFURL,
"pageUrl": self.PageURL,
"live": True,