The branch, eden has been updated
via f0eddf59b0e79a1ac3553d5cf6cb4b50be661128 (commit)
via 18ac3b4c0405767ae4fa657c47608f75f06542e8 (commit)
via 3bbcc353e0f121027348b8de4dc00dc544956597 (commit)
via afa1ea9dcfb03fef8f00235055a98c227fc116b2 (commit)
via 2afc20dd018a10a25c0a32cfb68ff87403ff2046 (commit)
via b212c0cd9ca7bc8b6db4dfeeca53c9ef120282b6 (commit)
from e6041c41b2e4546688794d255a03f5b5d0106a02 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f0eddf59b0e79a1ac3553d5cf6cb4b50be661128
commit f0eddf59b0e79a1ac3553d5cf6cb4b50be661128
Author: Martijn Kaijser <[email protected]>
Date: Sat Jul 21 00:01:20 2012 +0200
[plugin.video.giga_de] -v1.0.3
diff --git a/plugin.video.giga_de/addon.xml b/plugin.video.giga_de/addon.xml
index e04fa4f..291702d 100644
--- a/plugin.video.giga_de/addon.xml
+++ b/plugin.video.giga_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.giga_de" name="GIGA.de" version="1.0.2"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.giga_de" name="GIGA.de" version="1.0.3"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/plugin.video.giga_de/changelog.txt
b/plugin.video.giga_de/changelog.txt
index f2a6baa..4efc8e1 100644
--- a/plugin.video.giga_de/changelog.txt
+++ b/plugin.video.giga_de/changelog.txt
@@ -1,3 +1,4 @@
1.0.0 - First Try
1.0.1 - Various fixes and optical optimizations
-1.0.2 - Fixed site changes for "next page"
\ No newline at end of file
+1.0.2 - Fixed site changes for "next page"
+1.0.3 - Added site changes (new categories)
\ No newline at end of file
diff --git a/plugin.video.giga_de/default.py b/plugin.video.giga_de/default.py
index aee3fcd..db1220d 100644
--- a/plugin.video.giga_de/default.py
+++ b/plugin.video.giga_de/default.py
@@ -3,15 +3,37 @@
import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon
pluginhandle = int(sys.argv[1])
-
+xbox = xbmc.getCondVisibility("System.Platform.xbox")
settings = xbmcaddon.Addon(id='plugin.video.giga_de')
translation = settings.getLocalizedString
+forceViewMode=settings.getSetting("forceViewMode")
+if forceViewMode=="true":
+ forceViewMode=True
+else:
+ forceViewMode=False
+viewMode=str(settings.getSetting("viewMode"))
+
+maxVideoQuality=settings.getSetting("maxVideoQuality")
+qual=["360p","720p"]
+maxVideoQuality=qual[int(maxVideoQuality)]
+
def index():
- addDir("Top Videos","http://www.giga.de/tv/";,'listVideosTop',"")
addDir(translation(30001),"http://www.giga.de/tv/alle-videos/";,'listVideos',"")
- addDir("Giga
Live","http://www.giga.de/giga-tv/archiv/";,'listVideos',"")
+ addDir("Top Videos","http://www.giga.de/tv/";,'listVideosTop',"")
+ addDir("Giga
Live","http://www.giga.de/giga-tv/videos/giga-live/";,'listVideos',"")
+
addDir("Gameplay","http://www.giga.de/giga-tv/videos/giga-gameplay/";,'listVideos',"")
+
addDir("Specials","http://www.giga.de/giga-tv/videos/specials/";,'listVideos',"")
+
addDir("Monatsvorschau","http://www.giga.de/giga-tv/giga-monatsvorschau/";,'listVideos',"")
+
addDir("Nostalgiga","http://www.giga.de/giga-tv/videos/nostalgiga/";,'listVideos',"")
+ addDir("Radio
Giga","http://www.giga.de/giga-tv/videos/radio-giga/";,'listVideos',"")
+ addDir("Top100
Movies","http://www.giga.de/giga-tv/videos/top-100-filme/";,'listVideos',"")
+ addDir("Top100
Games","http://www.giga.de/giga-tv/videos/top-100-games/";,'listVideos',"")
+ addDir("Tobis tolle
Taktikanalyse","http://www.giga.de/giga-tv/videos/tobis-tolle-taktikanalyse/";,'listVideos',"")
+ addDir("Jonas
liest","http://www.giga.de/giga-tv/videos/jonas-liest/";,'listVideos',"")
xbmcplugin.endOfDirectory(pluginhandle)
+ if forceViewMode==True:
+ xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
def listVideosTop(url):
content = getUrl(url)
@@ -27,8 +49,11 @@ def listVideosTop(url):
title=cleanTitle(title)
addLink(title,url,'playVideo',thumb)
xbmcplugin.endOfDirectory(pluginhandle)
+ if forceViewMode==True:
+ xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
def listVideos(url):
+ mainUrl=url
content = getUrl(url)
spl=content.split('<div class="meta-posttype">')
for i in range(1,len(spl),1):
@@ -46,10 +71,21 @@ def listVideos(url):
thumb=match[0]
title=cleanTitle(title)
addLink(title,url,'playVideo',thumb)
- match=re.compile('<li class="notcurrent "><a href="(.+?)"',
re.DOTALL).findall(content)
- if len(match)>0:
- addDir(translation(30002),match[0],'listVideos',"")
+ if mainUrl.find("/page/")>=0:
+ match=re.compile('/page/(.+?)/', re.DOTALL).findall(mainUrl)
+ nr=str(int(match[0])+1)
+ newUrl=mainUrl[:-2]+nr+"/"
+ else:
+ nr="2"
+ newUrl=mainUrl+"page/2/"
+ fh = open("d:\\html.txt", 'w')
+ fh.write(newUrl)
+ fh.close()
+ if content.find("/page/"+nr+"/")>=0:
+ addDir(translation(30002)+" ("+nr+")",newUrl,'listVideos',"")
xbmcplugin.endOfDirectory(pluginhandle)
+ if forceViewMode==True:
+ xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
def playVideo(url):
if url.find("http://";)>=0:
@@ -65,7 +101,7 @@ def playVideo(url):
match1=re.compile('<high width="1280"
height="720">(.+?)<filename>(.+?)</filename>', re.DOTALL).findall(content)
match2=re.compile('<medium width="640"
height="360">(.+?)<filename>(.+?)</filename>', re.DOTALL).findall(content)
url=""
- if len(match1)==1:
+ if len(match1)==1 and maxVideoQuality=="720p":
url=match1[0][1]
elif len(match2)==1:
url=match2[0][1]
@@ -78,7 +114,11 @@ def cleanTitle(title):
def getUrl(url):
req = urllib2.Request(url)
req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0)
Gecko/20100101 Firefox/11.0')
- response = urllib2.urlopen(req,timeout=30)
+ if xbox==True:
+ socket.setdefaulttimeout(30)
+ response = urllib2.urlopen(req)
+ else:
+ response = urllib2.urlopen(req,timeout=30)
link=response.read()
response.close()
return link
diff --git a/plugin.video.giga_de/resources/language/English/strings.xml
b/plugin.video.giga_de/resources/language/English/strings.xml
index e0ad795..be83456 100644
--- a/plugin.video.giga_de/resources/language/English/strings.xml
+++ b/plugin.video.giga_de/resources/language/English/strings.xml
@@ -2,4 +2,7 @@
<strings>
<string id="30001">All Videos</string>
<string id="30002">Next Page</string>
+ <string id="30101">Maximum video quality</string>
+ <string id="30102">Force ViewMode</string>
+ <string id="30103">ViewMode</string>
</strings>
diff --git a/plugin.video.giga_de/resources/language/German/strings.xml
b/plugin.video.giga_de/resources/language/German/strings.xml
index e6ed9f4..d857fad 100644
--- a/plugin.video.giga_de/resources/language/German/strings.xml
+++ b/plugin.video.giga_de/resources/language/German/strings.xml
@@ -2,4 +2,6 @@
<strings>
<string id="30001">Alle Videos</string>
<string id="30002">Nächste Seite</string>
+ <string id="30101">Maximale Videoqualität</string>
+ <string id="30102">ViewMode erzwingen</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=18ac3b4c0405767ae4fa657c47608f75f06542e8
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3bbcc353e0f121027348b8de4dc00dc544956597
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=afa1ea9dcfb03fef8f00235055a98c227fc116b2
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2afc20dd018a10a25c0a32cfb68ff87403ff2046
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b212c0cd9ca7bc8b6db4dfeeca53c9ef120282b6
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
plugin.video.cbsnews_com/addon.xml | 16 +
plugin.video.cbsnews_com/changelog.txt | 4 +
plugin.video.cbsnews_com/default.py | 253 ++++++++++
plugin.video.cbsnews_com/icon.png | Bin 0 -> 23079 bytes
.../resources/language/English/strings.xml | 8 +
.../resources/language/German/strings.xml | 8 +
.../resources/settings.xml | 0
plugin.video.giga_de/addon.xml | 2 +-
plugin.video.giga_de/changelog.txt | 3 +-
plugin.video.giga_de/default.py | 56 ++-
.../resources/language/English/strings.xml | 3 +
.../resources/language/German/strings.xml | 2 +
plugin.video.giga_de/resources/settings.xml | 5 +
.../LICENSE.txt | 0
plugin.video.ign_com/addon.xml | 16 +
plugin.video.ign_com/changelog.txt | 4 +
plugin.video.ign_com/default.py | 186 +++++++
plugin.video.ign_com/icon.png | Bin 0 -> 14415 bytes
.../resources/language/English/strings.xml | 14 +
.../resources/language/German/strings.xml | 8 +
plugin.video.ign_com/resources/settings.xml | 5 +
plugin.video.nolife/addon.xml | 26 +
plugin.video.nolife/default.py | 518 ++++++++++++++++++++
.../LICENSE.txt => plugin.video.nolife/gpl.txt | 0
plugin.video.nolife/icon.png | Bin 0 -> 26843 bytes
.../resources/language/english/strings.xml | 11 +
.../resources/language/french/strings.xml | 11 +
plugin.video.nolife/resources/settings.xml | 18 +
.../LICENSE.txt | 0
plugin.video.time_com/addon.xml | 18 +
.../changelog.txt | 0
plugin.video.time_com/default.py | 196 ++++++++
plugin.video.time_com/icon.png | Bin 0 -> 17268 bytes
.../resources/language/English/strings.xml | 10 +
.../resources/language/German/strings.xml | 7 +
plugin.video.time_com/resources/settings.xml | 6 +
.../LICENSE.txt | 0
plugin.video.wired_com/addon.xml | 18 +
.../changelog.txt | 0
plugin.video.wired_com/default.py | 166 +++++++
plugin.video.wired_com/icon.png | Bin 0 -> 10975 bytes
.../resources/language/English/strings.xml | 7 +
.../resources/language/German/strings.xml | 6 +
.../resources/settings.xml | 0
45 files changed, 1601 insertions(+), 10 deletions(-)
copy {plugin.audio.einslive_de => plugin.video.cbsnews_com}/LICENSE.txt (100%)
create mode 100644 plugin.video.cbsnews_com/addon.xml
create mode 100644 plugin.video.cbsnews_com/changelog.txt
create mode 100644 plugin.video.cbsnews_com/default.py
create mode 100644 plugin.video.cbsnews_com/icon.png
create mode 100644
plugin.video.cbsnews_com/resources/language/English/strings.xml
create mode 100644
plugin.video.cbsnews_com/resources/language/German/strings.xml
copy {plugin.video.gronkh_de =>
plugin.video.cbsnews_com}/resources/settings.xml (100%)
create mode 100644 plugin.video.giga_de/resources/settings.xml
copy {plugin.audio.einslive_de => plugin.video.ign_com}/LICENSE.txt (100%)
create mode 100644 plugin.video.ign_com/addon.xml
create mode 100644 plugin.video.ign_com/changelog.txt
create mode 100644 plugin.video.ign_com/default.py
create mode 100644 plugin.video.ign_com/icon.png
create mode 100644 plugin.video.ign_com/resources/language/English/strings.xml
create mode 100644 plugin.video.ign_com/resources/language/German/strings.xml
create mode 100644 plugin.video.ign_com/resources/settings.xml
create mode 100644 plugin.video.nolife/addon.xml
create mode 100644 plugin.video.nolife/default.py
copy plugin.audio.groove/LICENSE.txt => plugin.video.nolife/gpl.txt (100%)
create mode 100644 plugin.video.nolife/icon.png
create mode 100644 plugin.video.nolife/resources/language/english/strings.xml
create mode 100644 plugin.video.nolife/resources/language/french/strings.xml
create mode 100644 plugin.video.nolife/resources/settings.xml
copy {plugin.audio.einslive_de => plugin.video.time_com}/LICENSE.txt (100%)
create mode 100644 plugin.video.time_com/addon.xml
copy {plugin.video.chefkoch_de => plugin.video.time_com}/changelog.txt (100%)
create mode 100644 plugin.video.time_com/default.py
create mode 100644 plugin.video.time_com/icon.png
create mode 100644 plugin.video.time_com/resources/language/English/strings.xml
create mode 100644 plugin.video.time_com/resources/language/German/strings.xml
create mode 100644 plugin.video.time_com/resources/settings.xml
copy {plugin.audio.einslive_de => plugin.video.wired_com}/LICENSE.txt (100%)
create mode 100644 plugin.video.wired_com/addon.xml
copy {plugin.video.chefkoch_de => plugin.video.wired_com}/changelog.txt (100%)
create mode 100644 plugin.video.wired_com/default.py
create mode 100644 plugin.video.wired_com/icon.png
create mode 100644
plugin.video.wired_com/resources/language/English/strings.xml
create mode 100644 plugin.video.wired_com/resources/language/German/strings.xml
copy {plugin.video.freshmilk_tv =>
plugin.video.wired_com}/resources/settings.xml (100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
