|
@@ -99,7 +99,7 @@ Accept-Language: en-US,en;q=0.5
|
99
|
99
|
t2 = event["begin_timestamp"] + event["duration_sec"]
|
100
|
100
|
t1 = datetime.datetime.fromtimestamp(t1).strftime("%H:%M")
|
101
|
101
|
t2 = datetime.datetime.fromtimestamp(t2).strftime("%H:%M")
|
102
|
|
- title = "%s - %s []%s-%s]" % (event["sname"], event["title"], t1, t2)
|
|
102
|
+ title = "%s - %s [%s-%s]" % (event["sname"], event["title"], t1, t2)
|
103
|
103
|
desc = event["shortdesc"]
|
104
|
104
|
if event["longdesc"]:
|
105
|
105
|
desc += "\n" + event["longdesc"]
|
|
@@ -138,12 +138,12 @@ Accept-Language: en-US,en;q=0.5
|
138
|
138
|
event = r2["now"]
|
139
|
139
|
title, img, desc = self.get_title_desc(event)
|
140
|
140
|
|
141
|
|
- #r = self.call(data)
|
142
|
|
- #m = re.search("(http(s)*:.+)", r)
|
143
|
|
- #if not m:
|
144
|
|
- # raise Exception("No streams found!")
|
145
|
|
- #data2 = m.group(1)
|
146
|
|
- data2 = "http://videolink"
|
|
141
|
+ r = self.call(data)
|
|
142
|
+ m = re.search("(http(s)*:.+)", r)
|
|
143
|
+ if not m:
|
|
144
|
+ raise Exception("No streams found!")
|
|
145
|
+ data2 = m.group(1)
|
|
146
|
+ #data2 = "http://videolink"
|
147
|
147
|
stream = util.item()
|
148
|
148
|
stream["name"] = title
|
149
|
149
|
stream["url"] = data2
|