The branch, frodo has been updated
via 832d6d5241709864068e7b0c58e6b9fcc2381ff3 (commit)
via d5e9fa75ce0042bb4f3977c240a7e0b825ae8e12 (commit)
via 10f83a97e80675b4e5ffb3a07b2f1daa244d5b09 (commit)
from b07dad4b59edc8d7031a3da3a166ac98b19577f8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=832d6d5241709864068e7b0c58e6b9fcc2381ff3
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d5e9fa75ce0042bb4f3977c240a7e0b825ae8e12
commit d5e9fa75ce0042bb4f3977c240a7e0b825ae8e12
Author: Martijn Kaijser <[email protected]>
Date: Wed Apr 2 08:23:43 2014 +0200
[plugin.video.metalvideo] 1.0.2
diff --git a/plugin.video.metalvideo/addon.py b/plugin.video.metalvideo/addon.py
index be2c3fe..045bcd3 100644
--- a/plugin.video.metalvideo/addon.py
+++ b/plugin.video.metalvideo/addon.py
@@ -16,11 +16,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
+def selector():
+ action = xbmcutil.plugin.actions[0]
+ if action == u"system": xbmcutil.sysCheck()
+ else:
+ # Call Function Based on Action Param
+ import main as plugin
+ getattr(plugin, action)()
+
# Initiate Startup
import xbmcutil
-action = xbmcutil.plugin.actions[0]
-if action == u"system": xbmcutil.sysCheck()
-else:
- # Call Function Based on Action Param
- import main as plugin
- getattr(plugin, action)()
\ No newline at end of file
+if __name__ == "__main__": selector()
\ No newline at end of file
diff --git a/plugin.video.metalvideo/addon.xml
b/plugin.video.metalvideo/addon.xml
index ec2013d..1b3d9fa 100644
--- a/plugin.video.metalvideo/addon.xml
+++ b/plugin.video.metalvideo/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.metalvideo" name="Metalvideo"
provider-name="willforde" version="1.0.1">
+<addon id="plugin.video.metalvideo" name="Metalvideo"
provider-name="willforde" version="1.0.2">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcutil" version="2.0.2"/>
diff --git a/plugin.video.metalvideo/changelog.txt
b/plugin.video.metalvideo/changelog.txt
index 9e300b7..21035cf 100644
--- a/plugin.video.metalvideo/changelog.txt
+++ b/plugin.video.metalvideo/changelog.txt
@@ -1,3 +1,9 @@
+TODO: Create Unit Tests, Once I figure out how
+
+[B]Version 1.0.2[/B]
+- Fixed next page now showing bug. Unicode mistake
+- Small Change to prepare for Unit Tests
+
[B]Version 1.0.1[/B]
- Fixed artist needing to be a list of artists in Gotham
- Changed Addon to show under Music Addons as well as Video Addons
diff --git a/plugin.video.metalvideo/resources/lib/main.py
b/plugin.video.metalvideo/resources/lib/main.py
index acd87a3..c87c1d9 100644
--- a/plugin.video.metalvideo/resources/lib/main.py
+++ b/plugin.video.metalvideo/resources/lib/main.py
@@ -227,7 +227,7 @@ class VideoList(listitem.VirtualFS):
import CommonFunctions
# Add Next Page if Exists
- nextUrl = re.findall('<a href="(\S+?)">next \xc2\xbb</a>',
sourceCode)
+ nextUrl = re.findall('<a href="(\S+?)">next \xbb</a>',
sourceCode)
if nextUrl:
self.add_next_page(url={"url":u"http://www.metalvideo.com/%s"; % nextUrl[0]})
# Iterate the list of videos
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=10f83a97e80675b4e5ffb3a07b2f1daa244d5b09
commit 10f83a97e80675b4e5ffb3a07b2f1daa244d5b09
Author: Martijn Kaijser <[email protected]>
Date: Wed Apr 2 08:22:43 2014 +0200
[plugin.video.tvkaista] 4.0.2
diff --git a/plugin.video.tvkaista/addon.xml b/plugin.video.tvkaista/addon.xml
index 816c3a8..913be94 100644
--- a/plugin.video.tvkaista/addon.xml
+++ b/plugin.video.tvkaista/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.tvkaista" name="TVKaista.fi" version="4.0.1"
provider-name="Viljo Viitanen">
+<addon id="plugin.video.tvkaista" name="TVKaista" version="4.0.2"
provider-name="Viljo Viitanen">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
@@ -9,10 +9,10 @@
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<language>fi</language>
- <summary lang="en">Watch TVKaista.fi with XBMC</summary>
- <summary lang="fi">Katso TVKaista.fi:tä XBMC:llä</summary>
- <description lang="en">Watch Finnish commercial TVKaista streaming
services with XBMC. Requires a TVKaista user account. See
http://www.tvkaista.fi for more details.</description>
- <description lang="fi">Katso kaupallista TVKaista.fi -tv-tallenninta
XBMC:llä. Tarvitsee TVKaista-käyttäjätunnuksen. Lisätietoja:
http://www.tvkaista.fi</description>
+ <summary lang="en">Watch TVKaista.com with XBMC</summary>
+ <summary lang="fi">Katso TVKaista.com:ia XBMC:llä</summary>
+ <description lang="en">Watch Finnish commercial TVKaista streaming
services with XBMC. Requires a TVKaista user account. See
http://www.tvkaista.com for more details.</description>
+ <description lang="fi">Katso kaupallista TVKaista-tv-tallenninta
XBMC:llä. Tarvitsee TVKaista-käyttäjätunnuksen. Lisätietoja:
http://www.tvkaista.com</description>
<disclaimer lang="en">Updated for XBMC Dharma beta 1 by
stilester</disclaimer>
<disclaimer lang="fi">Päivittänyt XBMC Dharma beta 1:lle
stilester</disclaimer>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
diff --git a/plugin.video.tvkaista/changelog.txt
b/plugin.video.tvkaista/changelog.txt
index a222fbd..08e5361 100644
--- a/plugin.video.tvkaista/changelog.txt
+++ b/plugin.video.tvkaista/changelog.txt
@@ -1,3 +1,5 @@
+[B]4.0.2[/B]
+- Change to tvkaista.com
[B]4.0.1[/B]
- Bugfix
[B]4.0.0[/B]
diff --git a/plugin.video.tvkaista/default.py b/plugin.video.tvkaista/default.py
index b9c9a8f..58615b6 100644
--- a/plugin.video.tvkaista/default.py
+++ b/plugin.video.tvkaista/default.py
@@ -1,7 +1,7 @@
-#xbmc tvkaista.fi plugin
+#xbmc tvkaista.com plugin
# This Python file uses the following encoding: utf-8
#
-#Copyright (C) 2009-2013 Viljo Viitanen <[email protected]>
+#Copyright (C) 2009-2014 Viljo Viitanen <[email protected]>
#Copyright (C) 2010 stilester
#Copyright (C) 2008-2009 J. Luukko
#
@@ -38,6 +38,7 @@
# Add proper umlauts. Change code documentation to English.
#8.4.2013 Add support for new tvkaista 1M mpeg4 stream
#15.9.2013 Version 4.0.1, bugfix with username+password quoting
+#31.3.2014 Version 4.0.2, change from tvkaista.fi to tvkaista.com
#tvkaista api documentation is at https://code.google.com/p/tvkaista-api/
@@ -47,7 +48,7 @@ locale.setlocale(locale.LC_ALL, 'C')
import xbmcgui, urllib, urllib2, cookielib , re, os, xbmcplugin,
htmlentitydefs, time, xbmcaddon, calendar
tvkaista_addon = xbmcaddon.Addon("plugin.video.tvkaista");
-VERSION = "4.0.0"
+VERSION = "4.0.2"
MYHEADERS = { 'User-Agent': "tvkaista-xbmc version "+VERSION+";" }
BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join(
tvkaista_addon.getAddonInfo('path'), "resources" ) )
@@ -83,22 +84,22 @@ def settings():
# paavalikko
def menu():
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/channels/')+"&mode=1"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/channels/')+"&mode=1"
listfolder = xbmcgui.ListItem('Kanavat - tänään')
listfolder.setInfo('video', {'Title': "Kanavat"})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/seasonpasses/')+"&mode=1"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/seasonpasses/')+"&mode=1"
listfolder = xbmcgui.ListItem('Sarjat')
listfolder.setInfo('video', {'Title': "Sarjat"})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/playlist')+"&mode=2"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/playlist')+"&mode=2"
listfolder = xbmcgui.ListItem('Lista')
listfolder.setInfo('video', {'Title': 'Lista'})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/search/title/elokuva')+"&mode=2"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/search/title/elokuva')+"&mode=2"
listfolder = xbmcgui.ListItem('Elokuvat')
listfolder.setInfo('video', {'Title': 'Elokuvat'})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
@@ -177,7 +178,7 @@ def isdst(tt):
#list the programs in a feed
def listprograms(url):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
- passman.add_password(None, "http://www.tvkaista.fi";,
tvkaista_addon.getSetting("username"), \
+ passman.add_password(None, "http://www.tvkaista.com";,
tvkaista_addon.getSetting("username"), \
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
#print "listprograms avataan: "+url+'/'+bitrate()+'.rss'
@@ -242,7 +243,7 @@ def listprograms(url):
try:
if pat[0] != "":
pid=re.compile(r"/([0-9]+)[.].+$", re.IGNORECASE).findall(pat[0])
-
listitem.setThumbnailImage('http://%s:%[email protected]/feed/thumbnails/%s.jpg'
% (\
+
listitem.setThumbnailImage('http://%s:%[email protected]/feed/thumbnails/%s.jpg'
% (\
myusername, mypassword, pid[0]))
if url.find('/feed/playlist') > 0:
label='Poista Listalta'
@@ -268,7 +269,7 @@ def listprograms(url):
search=ptit.split(':')[0].encode('utf-8')
#double encoding cos it gets decoded twice.
menuitems.append(('Etsi
samannimisiä','XBMC.Container.Update(%s?mode=%d&url=%s)'%
-
(sys.argv[0],2,'http://www.tvkaista.fi/feed/search/title/'+urllib.quote_plus(urllib.quote_plus(search))
),))
+
(sys.argv[0],2,'http://www.tvkaista.com/feed/search/title/'+urllib.quote_plus(urllib.quote_plus(search))
),))
listitem.addContextMenuItems(menuitems, True )
except:
pass
@@ -288,12 +289,12 @@ def listprograms(url):
#note: the date parameter really is called url when specifying the plugin url
parameters. See mode 5 in main.
def listdates(date):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
- passman.add_password(None, "http://www.tvkaista.fi";,
tvkaista_addon.getSetting("username"), \
+ passman.add_password(None, "http://www.tvkaista.com";,
tvkaista_addon.getSetting("username"), \
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
#print "listdates avataan: "+date
try:
- request = urllib2.Request('http://www.tvkaista.fi/feed/channels/',
headers=MYHEADERS)
+ request = urllib2.Request('http://www.tvkaista.com/feed/channels/',
headers=MYHEADERS)
content = opener.open(request).read()
except urllib2.HTTPError,e:
if e.code == 401:
@@ -330,7 +331,7 @@ def listdates(date):
# list feeds contained in a feed
def listfeeds(url):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
- passman.add_password(None, "http://www.tvkaista.fi";,
tvkaista_addon.getSetting("username"), \
+ passman.add_password(None, "http://www.tvkaista.com";,
tvkaista_addon.getSetting("username"), \
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
#print "listfeeds avataan: "+url
@@ -382,7 +383,7 @@ def search():
if len(list)>20: list.pop()
list.insert(0,keyboard.getText())
tvkaista_addon.setSetting("searches","\n".join(list))
- url = 'http://www.tvkaista.fi/feed/search/title/%s' %
(urllib.quote_plus(keyboard.getText()))
+ url = 'http://www.tvkaista.com/feed/search/title/%s' %
(urllib.quote_plus(keyboard.getText()))
listprograms(url)
#list searches that are stored in plugin settings
@@ -392,7 +393,7 @@ def listsearches():
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
for i in tvkaista_addon.getSetting("searches").splitlines():
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/search/title/'+urllib.quote_plus(i))+"&mode=2"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/search/title/'+urllib.quote_plus(i))+"&mode=2"
listfolder = xbmcgui.ListItem('Haku: '+i)
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
@@ -417,24 +418,24 @@ def addremove(action,id):
'password': tvkaista_addon.getSetting("password"), 'rememberme':'on'}
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
- request = urllib2.Request('http://www.tvkaista.fi/login/', headers=MYHEADERS)
+ request = urllib2.Request('http://www.tvkaista.com/login/',
headers=MYHEADERS)
r = opener.open(request, urllib.urlencode(opts))
dialog = xbmcgui.Dialog()
try:
if action==1:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=addtoplaylist&id=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=addtoplaylist&id=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma lisätty listalle.')
elif action==2:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=removefromplaylist&id=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=removefromplaylist&id=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma poistettu listalta.')
elif action==3:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=addseasonpass&id=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=addseasonpass&id=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma lisätty sarjoihin')
elif action==4:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=removeseasonpass&spid=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=removeseasonpass&spid=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma poistettu sarjoista.')
else:
-----------------------------------------------------------------------
Summary of changes:
plugin.video.metalvideo/addon.py | 15 +-
plugin.video.metalvideo/addon.xml | 2 +-
plugin.video.metalvideo/changelog.txt | 6 +
plugin.video.metalvideo/resources/lib/main.py | 2 +-
plugin.video.oodnurdtv/LICENSE.txt | 339 ++++++++++++++++++++
plugin.video.oodnurdtv/README.md | 8 +
plugin.video.oodnurdtv/addon.py | 169 ++++++++++
plugin.video.oodnurdtv/addon.xml | 22 ++
plugin.video.oodnurdtv/changelog.txt | 2 +
plugin.video.oodnurdtv/icon.png | Bin 0 -> 17932 bytes
plugin.video.oodnurdtv/resources/drundoo.py | 147 +++++++++
.../resources/language/English/strings.xml | 15 +
plugin.video.oodnurdtv/resources/settings.xml | 11 +
plugin.video.tvkaista/addon.xml | 10 +-
plugin.video.tvkaista/changelog.txt | 2 +
plugin.video.tvkaista/default.py | 41 ++--
16 files changed, 758 insertions(+), 33 deletions(-)
create mode 100644 plugin.video.oodnurdtv/LICENSE.txt
create mode 100644 plugin.video.oodnurdtv/README.md
create mode 100644 plugin.video.oodnurdtv/addon.py
create mode 100644 plugin.video.oodnurdtv/addon.xml
create mode 100644 plugin.video.oodnurdtv/changelog.txt
create mode 100644 plugin.video.oodnurdtv/icon.png
create mode 100644 plugin.video.oodnurdtv/resources/drundoo.py
create mode 100644
plugin.video.oodnurdtv/resources/language/English/strings.xml
create mode 100644 plugin.video.oodnurdtv/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://%s:%[email protected]/feed/thumbnails/%s.jpg](http://%s:%s...@www.tvkaista.fi/feed/thumbnails/%s.jpg){kind=link}
![http://%s:%[email protected]/feed/thumbnails/%s.jpg](http://%s:%s...@www.tvkaista.com/feed/thumbnails/%s.jpg){kind=link}