The branch, dharma-pre has been updated
via 67e642c373dc8092aabbef10016aa8a1185c506e (commit)
via a3e96afa47b76a17f639b05bf09322477cc7da66 (commit)
via 1c0fa954f2bfab51529fe8a032f767ee25cf4f06 (commit)
from 30b392472672d1691beb6149a9588357e50a6dc6 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=67e642c373dc8092aabbef10016aa8a1185c506e
commit 67e642c373dc8092aabbef10016aa8a1185c506e
Author: spiff <[email protected]>
Date: Wed Nov 24 16:24:09 2010 +0100
[plugin.video.earth.touch] updated to version 0.2
diff --git a/plugin.video.earth.touch/addon.xml
b/plugin.video.earth.touch/addon.xml
index 9c7872b..1754dff 100644
--- a/plugin.video.earth.touch/addon.xml
+++ b/plugin.video.earth.touch/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.earth.touch"
name="Earth Touch"
- version="0.1"
+ version="0.2"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.earth.touch/default.py
b/plugin.video.earth.touch/default.py
index fb461bc..734453c 100644
--- a/plugin.video.earth.touch/default.py
+++ b/plugin.video.earth.touch/default.py
@@ -2,23 +2,31 @@ import urllib,urllib2,re,xbmcplugin,xbmcgui,xbmcaddon
__settings__ = xbmcaddon.Addon(id='plugin.video.earth.touch')
__language__ = __settings__.getLocalizedString
+videoq = __settings__.getSetting('video_quality')
def CATEGORIES():
-
addDir(__language__(30000),'http://feeds2.feedburner.com/earth-touch_featured_720p_commentary',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30001),'http://feeds2.feedburner.com/earth-touch_featured_480p_commentary',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30002),'http://feeds2.feedburner.com/earth-touch_featured_720p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30003),'http://feeds2.feedburner.com/earth-touch_featured_480p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30004),'http://feeds2.feedburner.com/WeeklyMarinePodcast-hd',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30005),'http://feeds2.feedburner.com/WeeklyMarinePodcast-ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30006),'http://feeds2.feedburner.com/moremi_podcast_720',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30007),'http://feeds2.feedburner.com/moremi_podcast_ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30008),'http://feeds2.feedburner.com/earth-touch_podcast_720p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30009),'http://feeds2.feedburner.com/earth-touch_podcast_480p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30010),'http://feeds2.feedburner.com/earth-touch_podcast_ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30011),'http://feeds2.feedburner.com/kids-hd',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
addDir(__language__(30012),'http://feeds2.feedburner.com/kids-ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
-
-
+ if videoq==__language__(30011):
+
addDir(__language__(30000),'http://feeds2.feedburner.com/earth-touch_featured_720p_commentary',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30001),'http://feeds2.feedburner.com/earth-touch_featured_720p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30003),'http://feeds2.feedburner.com/WeeklyMarinePodcast-hd',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30004),'http://feeds2.feedburner.com/moremi_podcast_720',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30002),'http://feeds2.feedburner.com/earth-touch_podcast_720p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30005),'http://feeds2.feedburner.com/kids-hd',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+ elif videoq==__language__(30012):
+
addDir(__language__(30000),'http://feeds2.feedburner.com/earth-touch_featured_480p_commentary',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30001),'http://feeds2.feedburner.com/earth-touch_featured_480p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30003),'http://feeds2.feedburner.com/WeeklyMarinePodcast-ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30002),'http://feeds2.feedburner.com/earth-touch_podcast_480p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30004),'http://feeds2.feedburner.com/moremi_podcast_ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30005),'http://feeds2.feedburner.com/kids-ipod',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+ else:
+
addDir(__language__(30000),'http://feeds2.feedburner.com/earth-touch_featured_720p_commentary',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30001),'http://feeds2.feedburner.com/earth-touch_featured_720p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30003),'http://feeds2.feedburner.com/WeeklyMarinePodcast-hd',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30004),'http://feeds2.feedburner.com/moremi_podcast_720',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30002),'http://feeds2.feedburner.com/earth-touch_podcast_720p',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
addDir(__language__(30005),'http://feeds2.feedburner.com/kids-hd',1,'http://podcast.earth-touch.com/i/podcast/ET_IT3.jpg')
+
def INDEX(url):
req = urllib2.Request(url)
req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1;
en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')
@@ -42,8 +50,7 @@ def INDEX(url):
for index in range(len(match)):
addLink(name[index],match[index],icon[index],plot[index],date[index])
-
-
+
def get_params():
param=[]
paramstring=sys.argv[2]
@@ -112,5 +119,8 @@ elif mode==1:
print ""+url
INDEX(url)
-
+elif mode==2:
+ print ""+url
+ INDEXWEB(url)
+
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.earth.touch/resources/language/English/strings.xml
b/plugin.video.earth.touch/resources/language/English/strings.xml
index a05e1ad..1174025 100644
--- a/plugin.video.earth.touch/resources/language/English/strings.xml
+++ b/plugin.video.earth.touch/resources/language/English/strings.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30000">Featured stories with field commentary 720p</string>
- <string id="30001">Featured stories with field commentary 480p</string>
- <string id="30002">Featured stories - Ambient 720p</string>
- <string id="30003">Featured stories - Ambient 480p</string>
- <string id="30004">Marine Channel, HD</string>
- <string id="30005">Marine Channel, iPod</string>
- <string id="30006">Moremi Lions Channel, HD</string>
- <string id="30007">Moremi Lions Channel, iPod</string>
- <string id="30008">Wildlife Highlights, HD</string>
- <string id="30009">Wildlife Highlights</string>
- <string id="30010">Wildlife Highlights, iPod</string>
- <string id="30011">Kids Channel, HD</string>
- <string id="30012">Kids Channel, iPod</string>
+ <string id="30000">Featured stories with field commentary</string>
+ <string id="30001">Featured stories - Ambient</string>
+ <string id="30002">Wildlife Highlights</string>
+ <string id="30003">Marine Channel</string>
+ <string id="30004">Moremi Lions Channel</string>
+ <string id="30005">Kids Channel</string>
+ <string id="30006"></string>
+ <string id="30007"></string>
+ <string id="30008"></string>
+ <string id="30009"></string>
+ <string id="30010">Select Video Quality</string>
+ <string id="30011">HD 720p</string>
+ <string id="30012">SD</string>
</strings>
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a3e96afa47b76a17f639b05bf09322477cc7da66
commit a3e96afa47b76a17f639b05bf09322477cc7da66
Author: spiff <[email protected]>
Date: Wed Nov 24 16:23:12 2010 +0100
[plugin.video.cnet.podcasts] updated to version 0.0.4
diff --git a/plugin.video.cnet.podcasts/addon.xml
b/plugin.video.cnet.podcasts/addon.xml
index 09107d0..5baac37 100644
--- a/plugin.video.cnet.podcasts/addon.xml
+++ b/plugin.video.cnet.podcasts/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.cnet.podcasts"
name="cnet Podcasts"
- version="0.0.3"
+ version="0.0.4"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.cnet.podcasts/changelog.txt
b/plugin.video.cnet.podcasts/changelog.txt
index b0f8c41..104bf89 100644
--- a/plugin.video.cnet.podcasts/changelog.txt
+++ b/plugin.video.cnet.podcasts/changelog.txt
@@ -6,4 +6,7 @@ added video descriptions
added categories for SD and HD
version - 0.0.3
-updated icon.png
\ No newline at end of file
+updated icon.png
+
+version - 0.0.4
+added addon settings for video quality instead of categories
\ No newline at end of file
diff --git a/plugin.video.cnet.podcasts/default.py
b/plugin.video.cnet.podcasts/default.py
index 64aeee9..7cd5448 100644
--- a/plugin.video.cnet.podcasts/default.py
+++ b/plugin.video.cnet.podcasts/default.py
@@ -2,53 +2,68 @@ import urllib,urllib2,re,xbmcplugin,xbmcgui,xbmcaddon
__settings__ = xbmcaddon.Addon(id='plugin.video.cnet.podcasts')
__language__ = __settings__.getLocalizedString
+videoq = __settings__.getSetting('video_quality')
+
def CATEGORIES():
- addDir(__language__(30038),'',1,'')
- addDir(__language__(30039),'',2,'')
-
-def CATEGORIESHD():
+ if videoq==__language__(30022):
addDir(__language__(30000),'http://feeds2.feedburner.com/cnet/allhdpodcast',3,'http://www.cnet.com/i/pod/images/allCNETvideo_600x600.jpg')
-
addDir(__language__(30002),'http://feeds.feedburner.com/cnet/buzzreporthd',3,'http://www.cnet.com/i/pod/images/podcastsHD_buzzreport_600x600.jpg')
-
addDir(__language__(30004),'http://feeds.feedburner.com/cnet/cnetnewshd',3,'http://www.cnet.com/i/pod/images/podcastsHD_news_600x600.jpg')
-
addDir(__language__(30006),'http://feeds2.feedburner.com/cnet/cartechvideohd',3,'http://www.cnet.com/i/pod/images/podcastsHD_cartech_600x600.jpg')
-
addDir(__language__(30008),'http://feeds.feedburner.com/cnet/applebytehd',3,'http://www.cnet.com//i/pod/images/podcastsHD_applebyte_600x600.jpg')
-
addDir(__language__(30010),'http://feeds.feedburner.com/cnet/conversationshd',3,'http://www.cnet.com/i/pod/images/podcastsHD_conversations_600x600.jpg')
-
addDir(__language__(30012),'http://feeds2.feedburner.com/cnet/loadedhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_loaded_600x600.jpg')
-
addDir(__language__(30014),'http://feeds2.feedburner.com/cnet/top5hd',3,'http://www.cnet.com/i/pod/images/podcastsHD_top5_600x600.jpg')
-
addDir(__language__(30018),'http://feeds2.feedburner.com/cnet/firstlookhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_firstlook_600x600.jpg')
-
addDir(__language__(30020),'http://feeds2.feedburner.com/cnet/techreviewhd',3,'http://www.cnet.com/i/pod/images/cnetTechReviewHD_600x600.jpg')
-
addDir(__language__(30022),'http://feeds2.feedburner.com/cnet/howtohd',3,'http://www.cnet.com/i/pod/images/podcastsHD_howto_600x600.jpg')
-
addDir(__language__(30024),'http://feeds2.feedburner.com/cnet/greenshowhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_greenshow_600x600.jpg')
-
addDir(__language__(30026),'http://feeds2.feedburner.com/cnet/prizefighthd',3,'http://www.cnet.com/i/pod/images/podcastsHD_prizefight_600x600.jpg')
-
addDir(__language__(30028),'http://feeds2.feedburner.com/cnet/tapthatapphd',3,'http://www.cnet.com/i/pod/images/tapThatAppHD_600x600.jpg')
-
addDir(__language__(30033),'http://feeds.feedburner.com/cnet/bolhqvideo',3,'http://www.cnet.com/i/pod/images/bol_600x600.jpg')
-
addDir(__language__(30035),'http://feeds.feedburner.com/cnet/the404hqvideo',3,'http://www.cnet.com/i/pod/images/the404_600x600.jpg')
-
addDir(__language__(30036),'http://feeds.feedburner.com/cnet/pregamehq',3,'http://www.cnet.com/i/pod/images/pregame_d_600x600.jpg')
-
addDir(__language__(30037),'http://feeds.feedburner.com/cnet/roundtablehqvideo',3,'http://www.cnet.com/i/pod/images/reporters_roundtable_600x600.jpg')
-
-def CATEGORIESSD():
-
addDir(__language__(30001),'http://feeds2.feedburner.com/allcnetvideopodcasts',3,'http://www.cnet.com/i/pod/images/allCNETvideo_300x300.jpg')
-
addDir(__language__(30003),'http://feeds.feedburner.com/cnet/buzzreport',3,'http://www.cnet.com/i/pod/images/buzzreport_600x600.jpg')
-
#addDir(__language__(30005),'http://feeds.feedburner.com/cnet/cnetnews',3,'http://www.cnet.com/i/pod/images/podcasts_news_600x600.jpg')
-
addDir(__language__(30007),'http://feeds.feedburner.com/cnet/cartechvideo?format=xml',3,'http://www.cnet.com/i/pod/images/cartech_600x600.jpg')
-
addDir(__language__(30009),'http://feeds.feedburner.com/cnet/applebyte',3,'http://www.cnet.com//i/pod/images/applebyte_600x600.jpg')
-
addDir(__language__(30011),'http://feeds.feedburner.com/cnet/conversations',3,'http://www.cnet.com/i/pod/images/cnetconversations_600x600.jpg')
-
addDir(__language__(30013),'http://feeds2.feedburner.com/cnet/loaded',3,'http://www.cnet.com/i/pod/images/loaded_600x600.jpg')
-
addDir(__language__(30015),'http://feeds2.feedburner.com/cnet/top5',3,'http://www.cnet.com/i/pod/images/top5_600x600.jpg')
-
addDir(__language__(30016),'http://feeds2.feedburner.com/cnet/dialedinvideo',3,'http://www.cnet.com/i/pod/images/dialedin_600x600.jpg')
-
#addDir(__language__(30017),'http://feeds2.feedburner.com/cnet/dialedinvideo',3,'http://www.cnet.com/i/pod/images/dialedin_600x600.jpg')
-
addDir(__language__(30019),'http://feeds2.feedburner.com/cnet/firstlook',3,'http://www.cnet.com/i/pod/images/firstlook_600x600.jpg')
-
addDir(__language__(30021),'http://feeds2.feedburner.com/cnet/techreview',3,'http://www.cnet.com/i/pod/images/cnetTechReview_600x600.jpg')
-
addDir(__language__(30023),'http://feeds2.feedburner.com/cnet/howto',3,'http://www.cnet.com/i/pod/images/HowTo_300x300.jpg')
-
addDir(__language__(30025),'http://feeds2.feedburner.com/cnet/greenshow',3,'http://www.cnet.com/i/pod/images/greenshow_300x300.jpg')
-
addDir(__language__(30027),'http://feeds2.feedburner.com/cnet/prizefight',3,'http://www.cnet.com/i/pod/images/prizefight_300x300.jpg')
-
addDir(__language__(30029),'http://feeds2.feedburner.com/cnet/tapthatapp',3,'http://www.cnet.com/i/pod/images/tapThatApp_600x600.jpg')
-
addDir(__language__(30030),'http://feeds.feedburner.com/cnet/roundtablevideo',3,'http://www.cnet.com/i/pod/images/reporters_roundtable_600x600.jpg')
-
addDir(__language__(30031),'http://feeds.feedburner.com/cnet/the404video',3,'http://www.cnet.com/i/pod/images/the404_600x600.jpg')
-
addDir(__language__(30032),'http://feeds.feedburner.com/cnet/pregame',3,'http://www.cnet.com/i/pod/images/pregame_d_600x600.jpg')
-
addDir(__language__(30034),'http://feeds.feedburner.com/cnet/bolvideo',3,'http://www.cnet.com/i/pod/images/bol_600x600.jpg')
-
+
addDir(__language__(30001),'http://feeds.feedburner.com/cnet/buzzreporthd',3,'http://www.cnet.com/i/pod/images/podcastsHD_buzzreport_600x600.jpg')
+
addDir(__language__(30002),'http://feeds.feedburner.com/cnet/cnetnewshd',3,'http://www.cnet.com/i/pod/images/podcastsHD_news_600x600.jpg')
+
addDir(__language__(30003),'http://feeds2.feedburner.com/cnet/cartechvideohd',3,'http://www.cnet.com/i/pod/images/podcastsHD_cartech_600x600.jpg')
+
addDir(__language__(30004),'http://feeds.feedburner.com/cnet/applebytehd',3,'http://www.cnet.com//i/pod/images/podcastsHD_applebyte_600x600.jpg')
+
addDir(__language__(30005),'http://feeds.feedburner.com/cnet/conversationshd',3,'http://www.cnet.com/i/pod/images/podcastsHD_conversations_600x600.jpg')
+
addDir(__language__(30006),'http://feeds2.feedburner.com/cnet/loadedhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_loaded_600x600.jpg')
+
addDir(__language__(30007),'http://feeds2.feedburner.com/cnet/top5hd',3,'http://www.cnet.com/i/pod/images/podcastsHD_top5_600x600.jpg')
+
addDir(__language__(30009),'http://feeds2.feedburner.com/cnet/firstlookhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_firstlook_600x600.jpg')
+
addDir(__language__(30010),'http://feeds2.feedburner.com/cnet/techreviewhd',3,'http://www.cnet.com/i/pod/images/cnetTechReviewHD_600x600.jpg')
+
addDir(__language__(30011),'http://feeds2.feedburner.com/cnet/howtohd',3,'http://www.cnet.com/i/pod/images/podcastsHD_howto_600x600.jpg')
+
addDir(__language__(30012),'http://feeds2.feedburner.com/cnet/greenshowhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_greenshow_600x600.jpg')
+
addDir(__language__(30013),'http://feeds2.feedburner.com/cnet/prizefighthd',3,'http://www.cnet.com/i/pod/images/podcastsHD_prizefight_600x600.jpg')
+
addDir(__language__(30014),'http://feeds2.feedburner.com/cnet/tapthatapphd',3,'http://www.cnet.com/i/pod/images/tapThatAppHD_600x600.jpg')
+
addDir(__language__(30018),'http://feeds.feedburner.com/cnet/bolhqvideo',3,'http://www.cnet.com/i/pod/images/bol_600x600.jpg')
+
addDir(__language__(30016),'http://feeds.feedburner.com/cnet/the404hqvideo',3,'http://www.cnet.com/i/pod/images/the404_600x600.jpg')
+
addDir(__language__(30017),'http://feeds.feedburner.com/cnet/pregamehq',3,'http://www.cnet.com/i/pod/images/pregame_d_600x600.jpg')
+
addDir(__language__(30015),'http://feeds.feedburner.com/cnet/roundtablehqvideo',3,'http://www.cnet.com/i/pod/images/reporters_roundtable_600x600.jpg')
+ elif videoq==__language__(30023):
+
addDir(__language__(30000),'http://feeds2.feedburner.com/allcnetvideopodcasts',3,'http://www.cnet.com/i/pod/images/allCNETvideo_300x300.jpg')
+
addDir(__language__(30001),'http://feeds.feedburner.com/cnet/buzzreport',3,'http://www.cnet.com/i/pod/images/buzzreport_600x600.jpg')
+
#addDir(__language__(30002),'http://feeds.feedburner.com/cnet/cnetnews',3,'http://www.cnet.com/i/pod/images/podcasts_news_600x600.jpg')
+
addDir(__language__(30003),'http://feeds.feedburner.com/cnet/cartechvideo?format=xml',3,'http://www.cnet.com/i/pod/images/cartech_600x600.jpg')
+
addDir(__language__(30004),'http://feeds.feedburner.com/cnet/applebyte',3,'http://www.cnet.com//i/pod/images/applebyte_600x600.jpg')
+
addDir(__language__(30005),'http://feeds.feedburner.com/cnet/conversations',3,'http://www.cnet.com/i/pod/images/cnetconversations_600x600.jpg')
+
addDir(__language__(30006),'http://feeds2.feedburner.com/cnet/loaded',3,'http://www.cnet.com/i/pod/images/loaded_600x600.jpg')
+
addDir(__language__(30007),'http://feeds2.feedburner.com/cnet/top5',3,'http://www.cnet.com/i/pod/images/top5_600x600.jpg')
+
addDir(__language__(30008),'http://feeds2.feedburner.com/cnet/dialedinvideo',3,'http://www.cnet.com/i/pod/images/dialedin_600x600.jpg')
+
addDir(__language__(30009),'http://feeds2.feedburner.com/cnet/firstlook',3,'http://www.cnet.com/i/pod/images/firstlook_600x600.jpg')
+
addDir(__language__(30010),'http://feeds2.feedburner.com/cnet/techreview',3,'http://www.cnet.com/i/pod/images/cnetTechReview_600x600.jpg')
+
addDir(__language__(30011),'http://feeds2.feedburner.com/cnet/howto',3,'http://www.cnet.com/i/pod/images/HowTo_300x300.jpg')
+
addDir(__language__(30012),'http://feeds2.feedburner.com/cnet/greenshow',3,'http://www.cnet.com/i/pod/images/greenshow_300x300.jpg')
+
addDir(__language__(30013),'http://feeds2.feedburner.com/cnet/prizefight',3,'http://www.cnet.com/i/pod/images/prizefight_300x300.jpg')
+
addDir(__language__(30014),'http://feeds2.feedburner.com/cnet/tapthatapp',3,'http://www.cnet.com/i/pod/images/tapThatApp_600x600.jpg')
+
addDir(__language__(30015),'http://feeds.feedburner.com/cnet/roundtablevideo',3,'http://www.cnet.com/i/pod/images/reporters_roundtable_600x600.jpg')
+
addDir(__language__(30016),'http://feeds.feedburner.com/cnet/the404video',3,'http://www.cnet.com/i/pod/images/the404_600x600.jpg')
+
addDir(__language__(30017),'http://feeds.feedburner.com/cnet/pregame',3,'http://www.cnet.com/i/pod/images/pregame_d_600x600.jpg')
+
addDir(__language__(30018),'http://feeds.feedburner.com/cnet/bolvideo',3,'http://www.cnet.com/i/pod/images/bol_600x600.jpg')
+ else:
+
addDir(__language__(30000),'http://feeds2.feedburner.com/cnet/allhdpodcast',3,'http://www.cnet.com/i/pod/images/allCNETvideo_600x600.jpg')
+
addDir(__language__(30001),'http://feeds.feedburner.com/cnet/buzzreporthd',3,'http://www.cnet.com/i/pod/images/podcastsHD_buzzreport_600x600.jpg')
+
addDir(__language__(30002),'http://feeds.feedburner.com/cnet/cnetnewshd',3,'http://www.cnet.com/i/pod/images/podcastsHD_news_600x600.jpg')
+
addDir(__language__(30003),'http://feeds2.feedburner.com/cnet/cartechvideohd',3,'http://www.cnet.com/i/pod/images/podcastsHD_cartech_600x600.jpg')
+
addDir(__language__(30004),'http://feeds.feedburner.com/cnet/applebytehd',3,'http://www.cnet.com//i/pod/images/podcastsHD_applebyte_600x600.jpg')
+
addDir(__language__(30005),'http://feeds.feedburner.com/cnet/conversationshd',3,'http://www.cnet.com/i/pod/images/podcastsHD_conversations_600x600.jpg')
+
addDir(__language__(30006),'http://feeds2.feedburner.com/cnet/loadedhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_loaded_600x600.jpg')
+
addDir(__language__(30007),'http://feeds2.feedburner.com/cnet/top5hd',3,'http://www.cnet.com/i/pod/images/podcastsHD_top5_600x600.jpg')
+
addDir(__language__(30009),'http://feeds2.feedburner.com/cnet/firstlookhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_firstlook_600x600.jpg')
+
addDir(__language__(30010),'http://feeds2.feedburner.com/cnet/techreviewhd',3,'http://www.cnet.com/i/pod/images/cnetTechReviewHD_600x600.jpg')
+
addDir(__language__(30011),'http://feeds2.feedburner.com/cnet/howtohd',3,'http://www.cnet.com/i/pod/images/podcastsHD_howto_600x600.jpg')
+
addDir(__language__(30012),'http://feeds2.feedburner.com/cnet/greenshowhd',3,'http://www.cnet.com/i/pod/images/podcastsHD_greenshow_600x600.jpg')
+
addDir(__language__(30013),'http://feeds2.feedburner.com/cnet/prizefighthd',3,'http://www.cnet.com/i/pod/images/podcastsHD_prizefight_600x600.jpg')
+
addDir(__language__(30014),'http://feeds2.feedburner.com/cnet/tapthatapphd',3,'http://www.cnet.com/i/pod/images/tapThatAppHD_600x600.jpg')
+
addDir(__language__(30018),'http://feeds.feedburner.com/cnet/bolhqvideo',3,'http://www.cnet.com/i/pod/images/bol_600x600.jpg')
+
addDir(__language__(30016),'http://feeds.feedburner.com/cnet/the404hqvideo',3,'http://www.cnet.com/i/pod/images/the404_600x600.jpg')
+
addDir(__language__(30017),'http://feeds.feedburner.com/cnet/pregamehq',3,'http://www.cnet.com/i/pod/images/pregame_d_600x600.jpg')
+
addDir(__language__(30015),'http://feeds.feedburner.com/cnet/roundtablehqvideo',3,'http://www.cnet.com/i/pod/images/reporters_roundtable_600x600.jpg')
def INDEX(url):
@@ -67,7 +82,7 @@ def INDEX(url):
if len(match)<1:
match=re.compile('<title><!\[\CDATA\[(.+?)]\]\></title>
<link>(.+?)</link>
<author>.+?</author><itunes:subtitle><!\[\CDATA\[(.+?)]\]\></itunes:subtitle>').findall(code)
for name,url,plot in match:
- addLink(name,url,plot,'')
+
addLink(name,url,plot,'special://home/addons/plugin.video.cnet.podcasts/icon.png')
def get_params():
@@ -89,8 +104,6 @@ def get_params():
return param
-
-
def addLink(name,url,plot,iconimage):
ok=True
liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
@@ -133,14 +146,6 @@ print "Name: "+str(name)
if mode==None:
print ""
CATEGORIES()
-
-elif mode==1:
- print ""
- CATEGORIESHD()
-
-elif mode==2:
- print ""
- CATEGORIESSD()
elif mode==3:
print ""+url
diff --git a/plugin.video.cnet.podcasts/resources/language/English/strings.xml
b/plugin.video.cnet.podcasts/resources/language/English/strings.xml
index 67421e0..2064cc1 100644
--- a/plugin.video.cnet.podcasts/resources/language/English/strings.xml
+++ b/plugin.video.cnet.podcasts/resources/language/English/strings.xml
@@ -1,43 +1,30 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30000">Most Recent CNET Video Podcasts (HD)</string>
- <string id="30001">Most Recent CNET Video Podcasts</string>
- <string id="30002">Buzz Report (HD)</string>
- <string id="30003">Buzz Report</string>
- <string id="30004">CNET News (HD)</string>
- <string id="30005">CNET News</string>
- <string id="30006">Car Tech (HD)</string>
- <string id="30007">Car Tech</string>
- <string id="30008">The Apple Byte (HD)</string>
- <string id="30009">The Apple Byte</string>
- <string id="30010">CNET Conversations (HD)</string>
- <string id="30011">CNET Conversations</string>
- <string id="30012">Loaded (HD)</string>
- <string id="30013">Loaded</string>
- <string id="30014">CNET's Top 5 (HD)</string>
- <string id="30015">CNET's Top 5</string>
- <string id="30016">Dialed In Video</string>
- <string id='30017'></string>
- <string id='30018'>First Look (HD)</string>
- <string id='30019'>First Look</string>
- <string id='30020'>CNET Tech Review (HD)</string>
- <string id='30021'>CNET Tech Review</string>
- <string id='30022'>How To (HD)</string>
- <string id='30023'>How To</string>
- <string id='30024'>The Green Show (HD)</string>
- <string id='30025'>The Green Show</string>
- <string id='30026'>Prizefight (HD)</string>
- <string id='30027'>Prizefight</string>
- <string id='30028'>Tap That App (HD)</string>
- <string id='30029'>Tap That App</string>
- <string id='30030'>Reporters' Roundtable Video</string>
- <string id='30031'>The 404 Video</string>
- <string id='30032'>preGAME</string>
- <string id='30033'>Buzz Out Loud (HQ)</string>
- <string id='30034'>Buzz Out Loud</string>
- <string id='30035'>The 404 Video (HQ)</string>
- <string id='30036'>preGAME (HQ)</string>
- <string id='30037'>Reporters' Roundtable Video (HQ)</string>
- <string id="30038">HD Podcasts</string>
- <string id="30039">SD Podcasts</string>
+ <string id="30000">Most Recent CNET Video Podcasts</string>
+ <string id="30001">Buzz Report</string>
+ <string id="30002">CNET News</string>
+ <string id="30003">Car Tech</string>
+ <string id="30004">The Apple Byte</string>
+ <string id="30005">CNET Conversations</string>
+ <string id="30006">Loaded</string>
+ <string id="30007">CNET's Top 5</string>
+ <string id="30008">Dialed In Video</string>
+ <string id="30009">First Look</string>
+ <string id="30010">CNET Tech Review</string>
+ <string id="30011">How To</string>
+ <string id="30012">The Green Show</string>
+ <string id="30013">Prizefight</string>
+ <string id="30014">Tap That App</string>
+ <string id="30015">Reporters' Roundtable Video</string>
+ <string id="30016">The 404 Video</string>
+ <string id='30017'>preGAME</string>
+ <string id='30018'>Buzz Out Loud</string>
+ <string id='30019'></string>
+ <string id='30020'></string>
+ <string id='30021'></string>
+ <string id='30022'>HD</string>
+ <string id='30023'>SD</string>
+ <string id='30024'>Video Quality</string>
+ <string id='30025'></string>
+
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1c0fa954f2bfab51529fe8a032f767ee25cf4f06
commit 1c0fa954f2bfab51529fe8a032f767ee25cf4f06
Author: spiff <[email protected]>
Date: Wed Nov 24 16:22:12 2010 +0100
[plugin.video.zapiks] updated to version 0.0.5
diff --git a/plugin.video.zapiks/addon.xml b/plugin.video.zapiks/addon.xml
index 68ec60e..c6825e1 100644
--- a/plugin.video.zapiks/addon.xml
+++ b/plugin.video.zapiks/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.zapiks"
name="Zapiks"
- version="0.0.4"
+ version="0.0.5"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.zapiks/changelog.txt
b/plugin.video.zapiks/changelog.txt
index 075006d..7e6432f 100644
--- a/plugin.video.zapiks/changelog.txt
+++ b/plugin.video.zapiks/changelog.txt
@@ -6,4 +6,7 @@ new icon thanks freezy!
Version 0.0.4
added sorting of videos with addon settings
-cleaned up names a bit
\ No newline at end of file
+cleaned up names a bit
+
+Version 0.0.5
+fix for pagenation
\ No newline at end of file
diff --git a/plugin.video.zapiks/default.py b/plugin.video.zapiks/default.py
index 3a61669..70f232a 100644
--- a/plugin.video.zapiks/default.py
+++ b/plugin.video.zapiks/default.py
@@ -59,7 +59,7 @@ def INDEX(url):
match=re.compile('<div class="media_thumbnail medium">\n
\t\t\t\t<a href="(.+?)" title="(.+?)">\n \t\t\t\t\t<img class="thumb"
src="(.+?)" alt="video" /><br />\n \t\t\t\t\t<span
class="description">.+?</span>\n').findall(link)
for url,name,thumbnail in match:
addLink(name,'http://www.zapiks.fr'+url,2,thumbnail)
- page=re.compile('<h4 class="pagination"><span
class="prev"></span><span class="next"><a href=".+?"><img
src="/c/i/resultset_last.png" alt=">|" title=">|" height="16"
width="16"></a><a href=".+?"><img src=".+?" alt=">" title=">" height="16"
width="16"></a></span> <a href=".+?" class="current">.+?</a> <a href="(.+?)"
class="normal">.+?</a>').findall(link)
+ page=re.compile('<h4 class=".+?"><span class="prev"></span><span
class="next"><a href=".+?"><img src=".+?" alt=">|" title=">|" height="16"
width="16"></a><a href=".+?"><img src=".+?" alt=">" title=">" height="16"
width="16"></a></span><span class="pages"> <a href=".+?"
class="current">.+?</a> <a href="(.+?)" class="normal">.+?</a> <a href=".+?"
class="normal">.+?</a>.+?<a href=".+?">.+?</a></span></h4>').findall(link)
if len(page)>1:del page[0];del page[0]
for url in page:
addDir(__language__(30006),'http://www.zapiks.fr'+url,1,'special://home/addons/plugin.video.zapiks/resources/images/next.png')
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cnet.podcasts/addon.xml | 2 +-
plugin.video.cnet.podcasts/changelog.txt | 5 +-
plugin.video.cnet.podcasts/default.py | 115 ++++++++++----------
.../resources/language/English/strings.xml | 67 +++++-------
plugin.video.cnet.podcasts/resources/settings.xml | 3 +
plugin.video.earth.touch/addon.xml | 2 +-
plugin.video.earth.touch/changelog.txt | 5 +
plugin.video.earth.touch/default.py | 46 +++++---
.../resources/language/English/strings.xml | 26 +++---
plugin.video.earth.touch/resources/settings.xml | 3 +
plugin.video.zapiks/addon.xml | 2 +-
plugin.video.zapiks/changelog.txt | 5 +-
plugin.video.zapiks/default.py | 2 +-
13 files changed, 151 insertions(+), 132 deletions(-)
create mode 100644 plugin.video.cnet.podcasts/resources/settings.xml
create mode 100644 plugin.video.earth.touch/changelog.txt
create mode 100644 plugin.video.earth.touch/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
