The branch, eden has been updated
via 1d1d874da304bd5ff050f03bf3e3ad5db0467188 (commit)
via 442a1cce264353922baf6aa9d051dde69ce4fb8e (commit)
via 9e9528050808f08cdaf7deac530be1a8d3034273 (commit)
via 8089b6646f49994bfa378c3c6c792a43915aaefc (commit)
from 3313140686c3727e4b494db23686bda7f883d6de (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1d1d874da304bd5ff050f03bf3e3ad5db0467188
commit 1d1d874da304bd5ff050f03bf3e3ad5db0467188
Author: spiff <[email protected]>
Date: Tue Nov 13 09:49:42 2012 +0100
[plugin.video.mediathek] updated to version 0.4.6
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index 40fefaf..e3de52b 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.mediathek"
- version="0.4.5"
+ version="0.4.6"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 02335f5..39e92c9 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,5 @@
+0.4.6 - Minor fix for rasp-xbmc
+ added new channels for kika
0.4.5 - FIX: ARTE and KIKA - adopt format changes
0.4.4 - FIX: Get ARD working again (base code from soern)
0.4.3 - FIX: NDR streams / NDR changed their streaming adresses by soern
diff --git a/plugin.video.mediathek/mediathek/__init__.py
b/plugin.video.mediathek/mediathek/__init__.py
index 8a9af1d..b24eae0 100644
--- a/plugin.video.mediathek/mediathek/__init__.py
+++ b/plugin.video.mediathek/mediathek/__init__.py
@@ -93,8 +93,6 @@ class Mediathek(object):
return ''
except:
return ''
-
-
def buildMenu(self, path, treeNode = None):
if(type(path) in (str,unicode)):
diff --git a/plugin.video.mediathek/mediathek/kika.py
b/plugin.video.mediathek/mediathek/kika.py
index 90ca564..1b6a507 100644
--- a/plugin.video.mediathek/mediathek/kika.py
+++ b/plugin.video.mediathek/mediathek/kika.py
@@ -72,9 +72,11 @@ class KIKAPlus(Mediathek):
(
TreeNode("1.4.0","Schloss Einstein - Erfurt",
"http://kikaplus.net/clients/kika/kikaplus/?programm=90&ag=4",True),
TreeNode("1.4.1","Schnitzeljagd im Heiligen Land",
"http://kikaplus.net/clients/kika/kikaplus/?programm=122&ag=3",True),
- TreeNode("1.4.2","STURMFREI",
"http://kikaplus.net/clients/kika/kikaplus/?programm=165&ag=4",True),
- TreeNode("1.4.3","TANZALARM!",
"http://kikaplus.net/clients/kika/kikaplus/?programm=92&ag=3",True),
- TreeNode("1.4.4","Wissen macht Ah!",
"http://kikaplus.net/clients/kika/kikaplus/?programm=86&ag=4",True),
+ TreeNode("1.4.2",u"Eine Möhre für Zwei",
"http://kikaplus.net/clients/kika/kikaplus/?programm=168&ag=4",True),
+ TreeNode("1.4.3","SHERLOCK YACK - Der Zoodetektiv",
"http://kikaplus.net/clients/kika/kikaplus/?programm=184&ag=3",True),
+ TreeNode("1.4.4","STURMFREI",
"http://kikaplus.net/clients/kika/kikaplus/?programm=165&ag=4",True),
+ TreeNode("1.4.5","TANZALARM!",
"http://kikaplus.net/clients/kika/kikaplus/?programm=92&ag=3",True),
+ TreeNode("1.4.6","Wissen macht Ah!",
"http://kikaplus.net/clients/kika/kikaplus/?programm=86&ag=4",True),
)
),
diff --git a/plugin.video.mediathek/mediathek/ndr.py
b/plugin.video.mediathek/mediathek/ndr.py
index d02fcce..07eb09f 100644
--- a/plugin.video.mediathek/mediathek/ndr.py
+++ b/plugin.video.mediathek/mediathek/ndr.py
@@ -102,7 +102,7 @@ class NDRMediathek(Mediathek):
xmlDom = minidom.parseString(xmlPage);
except:
xmlDom = False
- return xmlDom;
+ return xmlDom;
def extractVideoObjects(self, rssFeed, initCount):
nodes = rssFeed.getElementsByTagName("mediaItem");
@@ -159,7 +159,7 @@ class NDRMediathek(Mediathek):
imageNode =
videoNode.getElementsByTagName("images")[0].getElementsByTagName("image")
if len(imageNode):
- imageNode =imageNode[0]
+ imageNode = imageNode[0]
imageNode = imageNode.getElementsByTagName("urls")[0]
picture = self.readText(imageNode, "url")
else:
diff --git a/plugin.video.mediathek/simplexbmc.py
b/plugin.video.mediathek/simplexbmc.py
index 2b53b15..05c4ede 100644
--- a/plugin.video.mediathek/simplexbmc.py
+++ b/plugin.video.mediathek/simplexbmc.py
@@ -46,10 +46,13 @@ class SimpleXbmcGui(object):
else:
title = transformHtmlCodes(displayObject.title +" - "+
displayObject.subTitle);
- if displayObject.date is not None:
+ if displayObject.date is not None:
title = "(%s) %s"%(time.strftime("%d.%m",displayObject.date),title);
- listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png",
thumbnailImage=displayObject.picture)
+ if displayObject.picture is not None:
+ listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png",
thumbnailImage=displayObject.picture)
+ else
+ else listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png")
if(displayObject.isPlayable):
if(displayObject.isPlayable == "PlayList"):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=442a1cce264353922baf6aa9d051dde69ce4fb8e
commit 442a1cce264353922baf6aa9d051dde69ce4fb8e
Author: spiff <[email protected]>
Date: Tue Nov 13 09:48:33 2012 +0100
[plugin.video.tvvn] updated to version 0.8.2
diff --git a/plugin.video.tvvn/addon.xml b/plugin.video.tvvn/addon.xml
index c91e9af..ef53d42 100644
--- a/plugin.video.tvvn/addon.xml
+++ b/plugin.video.tvvn/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.tvvn"
- version="0.8.1"
+ version="0.8.2"
name="TV Viet Nam"
provider-name="Binh Nguyen">
<requires>
diff --git a/plugin.video.tvvn/changelog.txt b/plugin.video.tvvn/changelog.txt
index a09b949..ac0542f 100644
--- a/plugin.video.tvvn/changelog.txt
+++ b/plugin.video.tvvn/changelog.txt
@@ -1,3 +1,8 @@
+version 0.8.2 (10/11/2012):
+ * reverted VTV1-4, HTV7,9 & HN1 to vtc.com.vn's source
+ * fixed VpopTV
+ * temporarily removed dead tv24.vn channels (very flaky source lately)
+
version 0.8.1 (27/07/2012):
* adds LifeTV and VpopTV (thanks to bolex17)
diff --git a/plugin.video.tvvn/resources/settings.xml
b/plugin.video.tvvn/resources/settings.xml
index dc9e320..a195d95 100644
--- a/plugin.video.tvvn/resources/settings.xml
+++ b/plugin.video.tvvn/resources/settings.xml
@@ -5,6 +5,6 @@
<setting id="descriptions_on_right" type="bool" label="30002"
default="true"/>
</category>
<category label="30100">
- <setting id="tv24_http" type="bool" label="30101"
default="true"/>
+ <setting id="tv24_http" type="bool" label="30101"
default="false"/>
</category>
</settings>
diff --git a/plugin.video.tvvn/tvvn.py b/plugin.video.tvvn/tvvn.py
index acf55c5..cc24ee0 100644
--- a/plugin.video.tvvn/tvvn.py
+++ b/plugin.video.tvvn/tvvn.py
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
# File: tvvn.py
# By: Binh Nguyen <[email protected]>
-# Date: 26-07-2012
+# Date: 10-11-2012
#---------------------------------------------------------------------
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -44,13 +44,14 @@ src_vtc = [VTCURL,
'']
# tv24.vn
-TV24URLList = ['rtmp://112.197.2.16:1935/live',
- 'rtmp://112.197.2.11:1935/live']
+TV24URLList = [#'rtmpe://112.197.2.16:1935/live',
+ 'rtmpe://112.197.2.11:1935/live']
TV24URL = choice(TV24URLList)
src_tv24 = [TV24URL,
- 'http://tv24.vn/jwplayer/player.swf',
- 'http://www.tv24.vn',
+ 'http://tv24.vn/getflash.ashx',
+ 'http://tv24.vn',
'']
+ #'http://tv24.vn/jwplayer/player.swf',
# xunghe.vn
src_trt = ['rtmp://118.69.176.149/live',
@@ -68,9 +69,9 @@ src_vietface = [VFTVURL,
'']
# van tv
-src_vantv = ['rtmp://flash67.ustream.tv:1935/ustreamVideo/3097098',
-
'http://static-cdn1.ustream.tv/swf/live/viewer.rsl:194.swf',
- 'http://www.552vantv.com',
+src_vantv = ['rtmp://199.66.239.55:1935',
+
'http://static-cdn1.ustream.tv/swf/live/viewer.rsl:255.swf',
+
'http://vietpho.com/online-channels.php?id=72&gID=0&page=1',
'']
# little saigon tv
@@ -98,10 +99,10 @@ src_vbstv = ['rtmp://74.63.219.101:1935/vbstele',
'vbstele']
# vpoptv
-src_vpoptv = ['rtmp://64.62.143.5/live',
-
'http://www.lihattv.com/scripts/videogallery.swf',
- 'http://livetvstreaming.ucoz.com',
- '']
+src_vpoptv = ['rtmp://www.evietmusic.com',
+ 'http://www.vpoptv.com/player.swf',
+
'http://www.vpoptv.com/main/default.php?language=en',
+ 'liveStream']
# lifetv
src_lifetv = ['rtmp://video.lifetv.vn/live',
@@ -209,26 +210,28 @@ def show_menu_sctv():
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def show_menu_local():
- add_link('HTV7', 'src_tv24', 'htv7.stream', '', 'htv7.png', 'Thông
tin, Giải trÃ, Thá» thao')
- add_link('HTV9', 'src_tv24', 'htv9.stream', '', 'htv9.png', 'ChÃnh
trá», Xã há»i, VÄn hóa')
- add_link('HN1', 'src_tv24', 'hn1.stream', '', '', 'Hà Ná»i 1')
+ #add_link('HTV7', 'src_tv24', 'htv7.stream', '', 'htv7.png', 'Thông
tin, Giải trÃ, Thá» thao')
+ #add_link('HTV9', 'src_tv24', 'htv9.stream', '', 'htv9.png', 'ChÃnh
trá», Xã há»i, VÄn hóa')
+ add_link('HTV7', 'src_vtc', 'htv7', '', 'htv7.png', 'Thông tin,
Giải trÃ, Thá» thao')
+ add_link('HTV9', 'src_vtc', 'htv91', '', 'htv9.png', 'ChÃnh trá»,
Xã há»i, VÄn hóa')
+ add_link('HN1', 'src_vtc', 'hanoi11', '', '', 'Hà Ná»i 1')
add_link('TRT1', 'src_trt', 'trt', '', '', 'Thừa Thiên Huế')
- add_link('LA34', 'src_tv24', 'la34.stream', '', '', 'Long An')
- add_link('THVL1', 'src_tv24', 'thvl1.stream', '', '', 'VÄ©nh Long')
- add_link('ÄN1', 'src_tv24', 'dn1.stream', '', '', 'Äá»ng Nai 1')
- add_link('HGV', 'src_tv24', 'thhg.stream', '', '', 'Háºu Giang')
- add_link('STV', 'src_tv24', 'thst.stream', '', '', 'Sóc TrÄng')
- add_link('THTG', 'src_tv24', 'thtg.stream', '', '', 'Tiá»n Giang')
- add_link('QRT', 'src_tv24', 'qrt.stream', '', '', 'Quảng Nam')
- add_link('BTV', 'src_tv24', 'bthtv.stream', '', '', 'Bình Thuáºn')
- add_link('THÄT', 'src_tv24', 'thdt.stream', '', '', 'Äá»ng
Tháp')
+ #add_link('LA34', 'src_tv24', 'la34.stream', '', '', 'Long An')
+ #add_link('THVL1', 'src_tv24', 'thvl1.stream', '', '', 'VÄ©nh Long')
+ #add_link('ÄN1', 'src_tv24', 'dn1.stream', '', '', 'Äá»ng Nai 1')
+ #add_link('HGV', 'src_tv24', 'thhg.stream', '', '', 'Háºu Giang')
+ #add_link('STV', 'src_tv24', 'thst.stream', '', '', 'Sóc TrÄng')
+ #add_link('THTG', 'src_tv24', 'thtg.stream', '', '', 'Tiá»n Giang')
+ #add_link('QRT', 'src_tv24', 'qrt.stream', '', '', 'Quảng Nam')
+ #add_link('BTV', 'src_tv24', 'bthtv.stream', '', '', 'Bình
Thuáºn')
+ #add_link('THÄT', 'src_tv24', 'thdt.stream', '', '', 'Äá»ng
Tháp')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def show_menu_overseas():
add_link('Vietface', 'src_vietface',
'urlparams_qm_channel:1005_qm_token:6436488_qm_video:L_qm_audio:L_qm_finished_gops:1',
'', 'vietfacetv.png', 'Vietface Media Group')
add_link('SaigonTV', 'src_sgtv', 'myStream.sdp', '',
'saigontv.png', 'Saigon TV')
add_link('GlobalTV', 'src_globaltv', 'myStream.sdp', '',
'globaltv.png', 'Global Television')
- add_link('VAN-TV', 'src_vantv', 'streams/live_1', '', 'vantv.png',
'Vietnamese American Network TV')
+ add_link('VAN-TV', 'src_vantv', 'ustream', '', 'vantv.png',
'Vietnamese American Network TV')
add_link('VBSTV', 'src_vbstv', 'myStream.sdp', '', 'vbstv.png',
'Vietnamese Broadcasting Services')
add_link('LSTV', 'src_lsgtv', 'livestream', '', 'lsaigontv.png',
'Little Saigon TV')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -241,14 +244,18 @@ def show_menu_vov():
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def Init():
- add_link('VTV1', 'src_tv24', 'vtv1.stream', '', 'vtv1.png', 'Thông
tin tá»ng hợp')
- add_link('VTV2', 'src_tv24', 'vtv2.stream', '', 'vtv2.png', 'Khoa
há»c, Giáo dục')
- add_link('VTV3', 'src_tv24', 'vtv3.stream', '', 'vtv3.png', 'Thá»
thao, Giải trÃ, Thông tin Kinh tế')
- add_link('VTV4', 'src_tv24', 'vtv4.stream', '', 'vtv4.png', 'Kênh
cho ngÆ°á»i Viá»t Nam á» nÆ°á»c ngoà i')
- add_link('VTV6', 'src_tv24', 'vtv6.stream', '', 'vtv6.png', 'Kênh
cho Thanh, thiếu niên')
+ #add_link('VTV1', 'src_tv24', 'vtv1.stream', '', 'vtv1.png', 'Thông
tin tá»ng hợp')
+ #add_link('VTV2', 'src_tv24', 'vtv2.stream', '', 'vtv2.png', 'Khoa
há»c, Giáo dục')
+ #add_link('VTV3', 'src_tv24', 'vtv3.stream', '', 'vtv3.png', 'Thá»
thao, Giải trÃ, Thông tin Kinh tế')
+ #add_link('VTV4', 'src_tv24', 'vtv4.stream', '', 'vtv4.png', 'Kênh
cho ngÆ°á»i Viá»t Nam á» nÆ°á»c ngoà i')
+ #add_link('VTV6', 'src_tv24', 'vtv6.stream', '', 'vtv6.png', 'Kênh
cho Thanh, thiếu niên')
+ #add_link('ANTV', 'src_tv24', 'antv.stream', '', 'antv.png', 'An
ninh TV')
+ add_link('VTV1', 'src_vtc', 'vtv11', 'VTV1/15', 'vtv1.png', 'Thông
tin tá»ng hợp')
+ add_link('VTV2', 'src_vtc', 'vtv2', 'VTV2/23', 'vtv2.png', 'Khoa
há»c, Giáo dục')
+ add_link('VTV3', 'src_vtc', 'vtv31', 'VTV3/3', 'vtv3.png', 'Thá»
thao, Giải trÃ, Thông tin Kinh tế')
+ add_link('VTV4', 'src_vtc', 'vtv4', 'VTV4/2', 'vtv4.png', 'Kênh
cho ngÆ°á»i Viá»t Nam á» nÆ°á»c ngoà i')
add_link('VTV9', 'src_tv24', 'vtv9.stream', '', 'vtv9.png', 'Kênh
cho Khán giả miá»n Nam')
- add_link('ANTV', 'src_tv24', 'antv.stream', '', 'antv.png', 'An ninh
TV')
- add_link('VpopTV', 'src_vpoptv', 'Stream33', '', 'vpoptv.png', 'Kênh
âm nhạc Äặc sắc')
+ add_link('VpopTV', 'src_vpoptv', 'mtv', '', 'vpoptv.png', 'Kênh âm
nhạc Äặc sắc')
add_link('lifetv', 'src_lifetv', 'Stream1', '', 'lifetv.png', 'Lá»i
sá»ng và sức khá»e')
add_link('VTC1', 'src_vtc', 'vtc11', 'VTC1/10', 'vtc1.png', 'Thá»i
sá»± tá»ng hợp')
add_link('VTC2', 'src_vtc', 'vtc21', 'VTC2/11', 'vtc2.png', 'Khoa
há»c, Công nghá»')
@@ -278,11 +285,11 @@ def play_video(src, name, stream_name, ref):
swfUrl=prov[1]
flashVer='LNX_11,2,202,233'
- fullURL=videoUrl+' swfVfy=1 live=1 playpath='+stream_name+'
flashVer='+flashVer+' pageUrl='+pageUrl+' tcUrl='+videoUrl+' swfUrl='+swfUrl
+ fullURL=videoUrl+' swfVfy=1 live=1 token=!3zxcvbnm4@
playpath='+stream_name+' flashVer='+flashVer+' pageUrl='+pageUrl+'
tcUrl='+videoUrl+' swfUrl='+swfUrl
if (prov[3] != ''):
fullURL=fullURL+' app='+prov[3]
if (src == "src_tv24" and mysettings.getSetting('tv24_http') == 'true'):
-
fullURL=prov[0].replace("rtmp://","http://";)+"/"+stream_name+"/playlist.m3u8"
+
fullURL=prov[0].replace("rtmpe://","http://";)+"/"+stream_name+"/playlist.m3u8"
xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(fullURL, item)
if mode==None:
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9e9528050808f08cdaf7deac530be1a8d3034273
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8089b6646f49994bfa378c3c6c792a43915aaefc
commit 8089b6646f49994bfa378c3c6c792a43915aaefc
Author: spiff <[email protected]>
Date: Tue Nov 13 09:41:22 2012 +0100
[plugin.video.sagetv] updated to version 1.3.8
diff --git a/plugin.video.sagetv/addon.xml b/plugin.video.sagetv/addon.xml
index 74fb61e..bf76d35 100644
--- a/plugin.video.sagetv/addon.xml
+++ b/plugin.video.sagetv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.sagetv"
name="SageTV"
- version="1.3.7"
+ version="1.3.8"
provider-name="kricker,lehighbri,aaronb">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -12,17 +12,25 @@
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
+ <summary lang="ar">ستÙج ت٠ÙÙ: استعراض ٠إدارة
اÙبث اÙÙ
باشر ٠اÙتسجÙÙات</summary>
+ <summary lang="bg">SageTV: ÐÑеглеждайÑе и
ÑпÑавлÑвайÑе излÑÑÐ²Ð°Ð½Ð¸Ñ Ð¸ запиÑи</summary>
+ <summary lang="de">SageTV: Verwalte und schaue Sendungen und
Aufnahmen</summary>
+ <summary lang="en">SageTV: Browse and manage airings and
recordings</summary>
+ <summary lang="es">SageTV: Examinar y administrar transmisiones y
grabaciones</summary>
+ <summary lang="fr">SageTV: Parcourir et gérer vos diffusions et
enregistrements</summary>
+ <summary lang="lt">SageTV: NarÅ¡yti ir valdyti rodymÄ
ir
įrašus</summary>
+ <summary lang="pt_BR">SageTV: Procurar e administrar transmissões e
gravações</summary>
+ <summary lang="sk">SageTV: prehliadajte a spravujte vysielania a
nahrávky</summary>
+ <summary lang="sv">SageTV: Bläddra och administrera sändningar och
inspelningar</summary>
+ <description lang="ar">ÙسÙ
Ø Ù٠اÙاتصا٠بÙ
خدÙ
ستÙج
ت٠Ù٠اÙخاص ب٠ØÙØ« تستطÙع استعراض ٠عرض
اÙتسجÙÙات, عرض ٠إدارة تسجÙÙات٠اÙÙادÙ
Ø©,
استعراض ÙÙائÙ
اÙÙ
Øطات, ٠اÙبØØ« ع٠اÙبث
اÙÙ
باشر ٠اÙتسجÙÙات اÙتبعات: Ù
ع ستÙج
ت٠ÙÙ: Jetty Web Server 2.3.0.14 أ٠أØدث Sagex-api vs
7.1.9.10 أ٠أØدث Batch Metadata Tools 4.10.1 xbmc.js
(Ùسخxbmc.js Ù
Ù"plugin.video.sagetv\extras\sagex\services" Ø¥ÙÙ
اÙخاص ب٠"SageTV\SageTV\sagex\services" ) </description>
+ <description lang="bg">ÐозволÑва Ðи да Ñе ÑвÑÑжеÑе
ÑÑÑ SageTV ÑÑÑвÑÑ, Ð¾Ñ ÐºÐ¾Ð¹Ñо можеÑе да
пÑеглеждаÑе и вÑзпÑоизвеждаÑе запиÑани
пÑедаваниÑ, да наÑÑÑойваÑе авÑомаÑиÑно
запиÑване на пÑедаваниÑ, пÑеглеждаÑе
ÑпиÑÑка Ñ ÐºÐ°Ð½Ð°Ð»Ð¸ и ÑÑÑÑиÑе излÑÑвани
пÑедаваниÑ/запиÑи. ÐзиÑкваниÑ: SageTV
Ñ: Jetty Web Server 2.3.0.14 или по-нов Sagex-api vs
7.1.9.10 или по-нов Batch Metadata Tools 4.10.1 xbmc.js
(ÐопиÑайÑе xbmc.js Ð¾Ñ "plugin.video.sagetv\extras\sagex\services"
вÑв ваÑаÑа "SageTV\SageTV\sagex\services"
диÑекÑоÑиÑ) </description>
+ <description lang="de">Erlaubt es Dir, dich zu einem SageTV-Server zu
verbinden, aus dem du Aufnahmen durchsuchen und ansehen, kommende Aufnahmen
verwalten und sehen, Kanallisten ansehen und nach Sendeterminen und Aufnahmen
suchen kannst. Anforderungen: SageTV mit: Jetty Web Server
2.3.0.14 oder neuer Sagex-api vs 7.1.9.10 oder neuer Batch Metadata
Tools 4.10.1 xbmc.js (Kopiere xbmc.js aus
"plugin.video.sagetv\extras\sagex\services" in den
"SageTV\SageTV\sagex\services" Ordner) </description>
+ <description lang="en">Allows you to connect to your SageTV server where
you can browse and view recordings, view and manage your upcoming recordings,
browse channel listings, and search for airings and
recordings. Dependencies: SageTV with: Jetty Web Server
2.3.0.14 or newer Sagex-api vs 7.1.9.10 or newer Batch Metadata
Tools 4.10.1 xbmc.js (Copy xbmc.js from
"plugin.video.sagetv\extras\sagex\services" to your
"SageTV\SageTV\sagex\services" directory) </description>
+ <description lang="es">Permitir conexiones con el servidor SageTV, donde
puedes examinar y ver grabaciones, ver y administrar tus próximas
grabaciones, examinar la lista de canales, y buscar transmisiones y
grabaciones Dependencias: SageTV con: Servidor Web Jetty
2.3.0.14 o superior Sagex-api ver. 7.1.9.10 o superior Lote de Metadata
Tools 4.10.1 xbmc.js (Copiar xbmc.js desde
"plugin.video.sagetv\extras\sagex\services" a tu directorio
"SageTV\SageTV\sagex\services" </description>
+ <description lang="lt">Leidžia jums prisijungti prie jūsų SageTV
serverio, kur jÅ«s galite narÅ¡yti ir peržiÅ«rÄti įraÅ¡us, peržiÅ«rÄti ir
valdyti savo bÅ«simÄ
(-us) įraÅ¡us, narÅ¡yti kanalų sÄ
rašus. Airings
įrašų paieÅ¡ka. PriklausomybÄs: SageTV with: Jetty Web Server
2.3.0.14 or newer Sagex-api vs 7.1.9.10 or newer Batch Metadata Tools
4.10.1 xbmc.js (Copy xbmc.js from
"plugin.video.sagetv\extras\sagex\services" to your
"SageTV\SageTV\sagex\services" directory) </description>
+ <description lang="pt_BR">Permite que você se conectar ao servidor SageTV
onde você pode navegar e ver gravações, visualizar e gerenciar suas
gravações futuras, procure listagem de canais e busca de transmissões e
gravações Dependências: SageTV com: Jetty Web Server
2.3.0.14 ou mais recente Sagex-api vs 7.1.9.10 ou mais recente
Batch Metadata Tools 4.10.1 xbmc.js (Copy xbmc.js from
"plugin.video.sagetv\extras\sagex\services" to your
"SageTV\SageTV\sagex\services" directory) </description>
+ <description lang="sk">Umožnà Vám pripojenie na Váš SageTV server,
kde môžete prehliadať a pozerať nahrávky, pozerať a spravovať
pripravované nahrávania, prehliadať zoznam kanálov a vyhľadávať
vysielania a nahrávky. Závislosti SageTV: Jetty Web Server
2.3.0.14 alebo novÅ¡Ã Sagex-api vs 7.1.9.10 alebo novÅ¡Ã
Batch Metadata Tools 4.10.1 xbmc.js (ZkopÃrujte xbmc.js z
"plugin.video.sagetv\extras\sagex\services" do Vášho
"SageTV\SageTV\sagex\services" prieÄinku) </description>
+ <description lang="sv">Gör det möjligt att ansluta till din SageTV
server där du kan bläddra och se inspelningar, se och administrera kommande
inspelningar, bläddra kanallistningar, och söka efter sändningar och
inspelningar. Krav på ytterligare tillägg: SageTV med:
Jetty Web Server 2.3.0.14 eller nyare Sagex-api vs 7.1.9.10 eller
nyare Batch Metadata Tools 4.10.1 xbmc.js (Kopiera xbmc.js
från "plugin.video.sagetv\extras\sagex\services" till
"SageTV\SageTV\sagex\services" katalogen) </description>
<platform>all</platform>
- <summary>SageTV: Browse and manage airings and recordings</summary>
- <description>Allows you to connect to your SageTV server where you can
browse and view recordings, view and manage your upcoming recordings, browse
channel listings, and search for airings and recordings.
-
-Dependencies:
-SageTV with:
- Jetty Web Server 2.3.0.14 or newer
- Sagex-api vs 7.1.9.10 or newer
- Batch Metadata Tools 4.10.1
- xbmc.js (Copy xbmc.js from "plugin.video.sagetv\extras\sagex\services" to
your "SageTV\SageTV\sagex\services" directory)
-
-</description>
</extension>
</addon>
\ No newline at end of file
diff --git a/plugin.video.sagetv/changelog.txt
b/plugin.video.sagetv/changelog.txt
index 0dec0d6..84b787c 100644
--- a/plugin.video.sagetv/changelog.txt
+++ b/plugin.video.sagetv/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.3.8 (Nov 8, 2012)[/B]
+- Added additional error checking upon launch of the addon to ensure the
correct sagex plugins are installed (and if they aren't it will kick you back
to the main menu after informing you of the issue)
+- Added in initial language translations for German, Slovak, Spanish, Swedish,
Lithuanian, and Portuguese (Brazil)
+
[B]Version 1.3.7 (Nov 1, 2012)[/B]
- Streamlined initial check for the sagex-api-services plugin upon launch of
the addon; this should enable loading the addon's main menu much faster
- **Note that this change requires you to copy the updated xbmc.js file to
your sagetv\sagex\services folder
diff --git a/plugin.video.sagetv/default.py b/plugin.video.sagetv/default.py
index aa7da63..7de92c4 100644
--- a/plugin.video.sagetv/default.py
+++ b/plugin.video.sagetv/default.py
@@ -73,13 +73,20 @@ def TOPLEVELCATEGORIES():
if(sagexVersion == None or sagexVersion.find("Exception") != -1):
#If no plugins were returned, first check that the user has the
appropriate xbmc.js which has the required GetPluginVersion method
print "************errorMsg=" + str(sagexVersion)
- if(sagexVersion == "java.lang.NoSuchMethodException: no such method:
GetPluginVersion"):
+ if(sagexVersion == "Exception: Problem accessing /sagex/api"):
+ print "Sagex API not installed on the SageTV server"
+ xbmcgui.Dialog().ok(__language__(21004),__language__(21005) + " "
+ MIN_VERSION_SAGEX_REQUIRED, __language__(21006),__language__(21007))
+ xbmc.executebuiltin('ActivateWindow(Home)')
+ return
+ elif(sagexVersion.find("java.lang.NoSuchMethodException: no such
method: GetPluginVersion") != -1 or sagexVersion.find("Missing Service File")
!= -1):
print "GetPluginVersion method not found in the xbmc.js file; user
must make sure they have the latest xbmc.js installed on their SageTV server"
xbmcgui.Dialog().ok(__language__(21004),__language__(21045),__language__(21046),__language__(21047))
+ xbmc.executebuiltin('ActivateWindow(Home)')
return
else:
print "SageTV not detected, or required plugins not installed"
xbmcgui.Dialog().ok(__language__(21000),__language__(21001),__language__(21002),__language__(21003))
+ xbmc.executebuiltin('ActivateWindow(Home)')
return
print "Successfully able to connect to the SageTV server @ " +
__settings__.getSetting("sage_ip") + ':' + __settings__.getSetting("sage_port")
@@ -87,9 +94,11 @@ def TOPLEVELCATEGORIES():
print "TOPLEVELCATEGORIES STARTED; sagex-api-services version=" +
sagexVersion
if(sagexVersion == ""):
xbmcgui.Dialog().ok(__language__(21004),__language__(21005) + " " +
MIN_VERSION_SAGEX_REQUIRED, __language__(21006),__language__(21007))
+ xbmc.executebuiltin('ActivateWindow(Home)')
return
if(comparePluginVersions(sagexVersion, MIN_VERSION_SAGEX_REQUIRED) < 0):
xbmcgui.Dialog().ok(__language__(21004),__language__(21005) + " " +
MIN_VERSION_SAGEX_REQUIRED, __language__(21008) + " " +
sagexVersion,__language__(21009) + " " + MIN_VERSION_SAGEX_REQUIRED)
+ xbmc.executebuiltin('ActivateWindow(Home)')
return
addTopLevelDir('1. Watch Recordings', strUrl +
'/sagex/api?c=xbmc:GetTVMediaFilesGroupedByTitle&size=500&encoder=json',1,IMAGE_POSTER,'Browse
previously recorded and currently recording shows')
@@ -616,6 +625,8 @@ def executeSagexAPIJSONCall(url, resultToGet):
input = urllib.urlopen(url)
fileData = input.read()
+ if(fileData.find("Problem accessing /sagex/api") != -1):
+ return "Exception: Problem accessing /sagex/api"
resp = unicodeToStr(json.JSONDecoder().decode(fileData))
objKeys = resp.keys()
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 2 +
plugin.video.mediathek/mediathek/__init__.py | 2 -
plugin.video.mediathek/mediathek/kika.py | 8 +-
plugin.video.mediathek/mediathek/ndr.py | 4 +-
plugin.video.mediathek/simplexbmc.py | 7 +-
plugin.video.sagetv/addon.xml | 32 ++--
plugin.video.sagetv/changelog.txt | 4 +
plugin.video.sagetv/default.py | 13 ++-
.../resources/language/German/strings.xml | 62 ++++++
.../resources/language/Lithuanian/strings.xml | 62 ++++++
.../language/Portuguese (Brazil)/strings.xml | 62 ++++++
.../resources/language/Slovak/strings.xml | 62 ++++++
.../resources/language/Spanish/strings.xml | 62 ++++++
.../LICENSE.txt | 0
plugin.video.screwattack/addon.py | 202 ++++++++++++++++++++
plugin.video.screwattack/addon.xml | 19 ++
plugin.video.screwattack/changelog.txt | 6 +
plugin.video.screwattack/fanart.jpg | Bin 0 -> 249362 bytes
plugin.video.screwattack/icon.png | Bin 0 -> 9800 bytes
.../resources/language/English/strings.xml | 27 +++
plugin.video.screwattack/resources/settings.xml | 8 +
plugin.video.tvvn/addon.xml | 2 +-
plugin.video.tvvn/changelog.txt | 5 +
plugin.video.tvvn/resources/settings.xml | 2 +-
plugin.video.tvvn/tvvn.py | 75 ++++----
26 files changed, 671 insertions(+), 59 deletions(-)
create mode 100644 plugin.video.sagetv/resources/language/German/strings.xml
create mode 100644
plugin.video.sagetv/resources/language/Lithuanian/strings.xml
create mode 100644 plugin.video.sagetv/resources/language/Portuguese
(Brazil)/strings.xml
create mode 100644 plugin.video.sagetv/resources/language/Slovak/strings.xml
create mode 100644 plugin.video.sagetv/resources/language/Spanish/strings.xml
copy {plugin.audio.abradio.cz => plugin.video.screwattack}/LICENSE.txt (100%)
create mode 100644 plugin.video.screwattack/addon.py
create mode 100644 plugin.video.screwattack/addon.xml
create mode 100644 plugin.video.screwattack/changelog.txt
create mode 100644 plugin.video.screwattack/fanart.jpg
create mode 100644 plugin.video.screwattack/icon.png
create mode 100644
plugin.video.screwattack/resources/language/English/strings.xml
create mode 100644 plugin.video.screwattack/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
