The branch, dharma-pre has been updated
via 6d1d428772ab27f6f279fabd2cfa6279036785fb (commit)
via 65908b5926f7e94da5acdf494653c31b1ff635c4 (commit)
from f246581e421ebf210c67b0fe551d845fd392f24f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6d1d428772ab27f6f279fabd2cfa6279036785fb
commit 6d1d428772ab27f6f279fabd2cfa6279036785fb
Author: spiff <[email protected]>
Date: Fri Nov 19 14:38:11 2010 +0100
[plugin.video.funny.or.die] updated to version 0.0.4
diff --git a/plugin.video.funny.or.die/addon.xml
b/plugin.video.funny.or.die/addon.xml
index 8bc1962..40ee627 100644
--- a/plugin.video.funny.or.die/addon.xml
+++ b/plugin.video.funny.or.die/addon.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.funny.or.die"
name="Funny or Die"
- version="0.0.3"
+ version="0.0.4"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
+ <import addon="script.module.beautifulsoup" version="3.0.8"/>
</requires>
<extension point="xbmc.python.pluginsource"
library="default.py">
diff --git a/plugin.video.funny.or.die/changelog.txt
b/plugin.video.funny.or.die/changelog.txt
index 26d9013..998efda 100644
--- a/plugin.video.funny.or.die/changelog.txt
+++ b/plugin.video.funny.or.die/changelog.txt
@@ -6,4 +6,8 @@ added the ability to sort videos via settings - most favorited,
most recent... e
new icon. thanks freezy!
Version 0.0.3
-now plays the hd version if avaliable. thanks to maruchan!
\ No newline at end of file
+now plays the hd version if avaliable. thanks to maruchan!
+changed code to get better thumbnails
+
+Version 0.0.4
+added proper language strings to settings
\ No newline at end of file
diff --git a/plugin.video.funny.or.die/default.py
b/plugin.video.funny.or.die/default.py
index 75eb48e..caea074 100644
--- a/plugin.video.funny.or.die/default.py
+++ b/plugin.video.funny.or.die/default.py
@@ -7,20 +7,32 @@ sort = __settings__.getSetting('sort_by')
def CATEGORIES():
-
addDir(__language__(30000),'http://www.funnyordie.com/browse/videos/all/exclusives/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30001),'http://www.funnyordie.com/browse/videos/all/immortal/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30002),'http://www.funnyordie.com/browse/videos/stand_up/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30003),'http://www.funnyordie.com/browse/videos/animation/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30004),'http://www.funnyordie.com/browse/videos/web_series/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30005),'http://www.funnyordie.com/browse/videos/nsfw/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30006),'http://www.funnyordie.com/browse/videos/sketch/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30007),'http://www.funnyordie.com/browse/videos/sports/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30008),'http://www.funnyordie.com/browse/videos/clean_comedy/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30009),'http://www.funnyordie.com/browse/videos/politics/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30010),'http://www.funnyordie.com/browse/videos/music/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30011),'http://www.funnyordie.com/browse/videos/parody/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30012),'http://www.funnyordie.com/browse/videos/real_life/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30013),'http://www.funnyordie.com/browse/videos/all/all/'+sort,1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
+ if sort==__language__(30015):
+ u = ''
+ elif sort==__language__(30016):
+ u = 'most_recent'
+ elif sort==__language__(30017):
+ u = 'most_viewed'
+ elif sort==__language__(30018):
+ u = 'most_favorited'
+ elif sort==__language__(30019):
+ u = 'highest_rated'
+ else:
+ u = ''
+
addDir(__language__(30000),'http://www.funnyordie.com/browse/videos/all/exclusives/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30001),'http://www.funnyordie.com/browse/videos/all/immortal/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30002),'http://www.funnyordie.com/browse/videos/stand_up/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30003),'http://www.funnyordie.com/browse/videos/animation/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30004),'http://www.funnyordie.com/browse/videos/web_series/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30005),'http://www.funnyordie.com/browse/videos/nsfw/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30006),'http://www.funnyordie.com/browse/videos/sketch/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30007),'http://www.funnyordie.com/browse/videos/sports/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30008),'http://www.funnyordie.com/browse/videos/clean_comedy/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30009),'http://www.funnyordie.com/browse/videos/politics/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30010),'http://www.funnyordie.com/browse/videos/music/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30011),'http://www.funnyordie.com/browse/videos/parody/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30012),'http://www.funnyordie.com/browse/videos/real_life/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
+
addDir(__language__(30013),'http://www.funnyordie.com/browse/videos/all/all/'+u,1,'special://home/addons/plugin.video.funny.or.die/icon.png')
def INDEX(url):
@@ -42,6 +54,7 @@ def INDEX(url):
for url in page:
addDir('Next Page','http://www.funnyordie.com'+url,1,'')
+
def playVid(url):
name, url = get_smil(url)
info = xbmcgui.ListItem(name)
diff --git a/plugin.video.funny.or.die/resources/settings.xml
b/plugin.video.funny.or.die/resources/settings.xml
index 299c53c..79170de 100644
--- a/plugin.video.funny.or.die/resources/settings.xml
+++ b/plugin.video.funny.or.die/resources/settings.xml
@@ -1,3 +1,3 @@
<settings>
- <setting id="sort_by" type="select"
values="|most_recent|most_viewed|most_favorited|highest_rated"
lvalues="|30016|30017|30018|30019" label="30014" default=""/>
+ <setting id="sort_by" type="select" lvalues="30015|30016|30017|30018|30019"
label="30014" default=""/>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=65908b5926f7e94da5acdf494653c31b1ff635c4
commit 65908b5926f7e94da5acdf494653c31b1ff635c4
Author: spiff <[email protected]>
Date: Fri Nov 19 14:33:26 2010 +0100
[plugin.video.zapiks] updated to version 0.0.4
diff --git a/plugin.video.zapiks/addon.xml b/plugin.video.zapiks/addon.xml
index edbcc60..68ec60e 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.3"
+ version="0.0.4"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.zapiks/default.py b/plugin.video.zapiks/default.py
index 3402842..3a61669 100644
--- a/plugin.video.zapiks/default.py
+++ b/plugin.video.zapiks/default.py
@@ -3,30 +3,68 @@ from BeautifulSoup import BeautifulSoup
__settings__ = xbmcaddon.Addon(id='plugin.video.zapiks')
__language__ = __settings__.getLocalizedString
+sort = __settings__.getSetting('sort_by')
+
def CATEGORIES():
-
addDir(__language__(30000),'http://www.zapiks.fr/surf_1',1,'special://home/addons/plugin.video.zapiks/resources/images/surf.png')
-
addDir(__language__(30001),'http://www.zapiks.fr/snowboard_1',1,'special://home/addons/plugin.video.zapiks/resources/images/snowboard.png')
-
addDir(__language__(30002),'http://www.zapiks.fr/vtt_1',1,'special://home/addons/plugin.video.zapiks/resources/images/vtt.png')
-
addDir(__language__(30003),'http://www.zapiks.fr/bmx_1',1,'special://home/addons/plugin.video.zapiks/resources/images/bmx.png')
-
addDir(__language__(30004),'http://www.zapiks.fr/skate_1',1,'special://home/addons/plugin.video.zapiks/resources/images/skate.png')
-
addDir(__language__(30005),'http://www.zapiks.fr/ski_1',1,'special://home/addons/plugin.video.zapiks/resources/images/ski.png')
-
+ if sort==__language__(30010):
+ u = '1'
+
addDir(__language__(30000),'http://www.zapiks.fr/surf_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/surf.png')
+
addDir(__language__(30001),'http://www.zapiks.fr/snowboard_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/snowboard.png')
+
addDir(__language__(30002),'http://www.zapiks.fr/vtt_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/vtt.png')
+
addDir(__language__(30003),'http://www.zapiks.fr/bmx_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/bmx.png')
+
addDir(__language__(30004),'http://www.zapiks.fr/skate_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/skate.png')
+
addDir(__language__(30005),'http://www.zapiks.fr/ski_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/ski.png')
+ elif sort==__language__(30011):
+ u = '/popular_1.php'
+
addDir(__language__(30000),'http://www.zapiks.fr/surf_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/surf.png')
+
addDir(__language__(30001),'http://www.zapiks.fr/snowboard_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/snowboard.png')
+
addDir(__language__(30002),'http://www.zapiks.fr/vtt_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/vtt.png')
+
addDir(__language__(30003),'http://www.zapiks.fr/bmx_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/bmx.png')
+
addDir(__language__(30004),'http://www.zapiks.fr/skate_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/skate.png')
+
addDir(__language__(30005),'http://www.zapiks.fr/ski_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/ski.png')
+ elif sort==__language__(30012):
+ u = '/alltimebuzzed_1.php'
+
addDir(__language__(30000),'http://www.zapiks.fr/surf_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/surf.png')
+
addDir(__language__(30001),'http://www.zapiks.fr/snowboard_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/snowboard.png')
+
addDir(__language__(30002),'http://www.zapiks.fr/vtt_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/vtt.png')
+
addDir(__language__(30003),'http://www.zapiks.fr/bmx_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/bmx.png')
+
addDir(__language__(30004),'http://www.zapiks.fr/skate_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/skate.png')
+
addDir(__language__(30005),'http://www.zapiks.fr/ski_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/ski.png')
+ elif sort==__language__(30013):
+ u = '/premium_1.php'
+
addDir(__language__(30000),'http://www.zapiks.fr/_surf_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/surf.png')
+
addDir(__language__(30001),'http://www.zapiks.fr/_snowboard_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/snowboard.png')
+
addDir(__language__(30002),'http://www.zapiks.fr/_vtt_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/vtt.png')
+
addDir(__language__(30003),'http://www.zapiks.fr/_bmx_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/bmx.png')
+
addDir(__language__(30004),'http://www.zapiks.fr/_skate_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/skate.png')
+
addDir(__language__(30005),'http://www.zapiks.fr/_ski_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/ski.png')
+ else:
+ u ='1'
+
addDir(__language__(30000),'http://www.zapiks.fr/surf_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/surf.png')
+
addDir(__language__(30001),'http://www.zapiks.fr/snowboard_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/snowboard.png')
+
addDir(__language__(30002),'http://www.zapiks.fr/vtt_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/vtt.png')
+
addDir(__language__(30003),'http://www.zapiks.fr/bmx_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/bmx.png')
+
addDir(__language__(30004),'http://www.zapiks.fr/skate_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/skate.png')
+
addDir(__language__(30005),'http://www.zapiks.fr/ski_'+u,1,'special://home/addons/plugin.video.zapiks/resources/images/ski.png')
+
+
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')
response = urllib2.urlopen(req)
link=response.read()
response.close()
-
link=link.replace('’',"'").replace(''',"'").replace('è','e').replace('&','&').replace('ê','e').replace('ü','u').replace('é','e')
+
link=link.replace('’',"'").replace(''',"'").replace('è','e').replace('&','
&
').replace('ê','e').replace('ü','u').replace('é','e').replace('à','a').replace('Ä','A').replace('"','"').replace('ë','e').replace('ï','i')
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="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)
if len(page)>1:del page[0];del page[0]
- for thumbnail,url in page:
+ for url in page:
addDir(__language__(30006),'http://www.zapiks.fr'+url,1,'special://home/addons/plugin.video.zapiks/resources/images/next.png')
+
def VIDEOLINKS(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')
@@ -65,8 +103,6 @@ def get_params():
return param
-
-
def addLink(name,url,mode,iconimage):
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)
ok=True
diff --git a/plugin.video.zapiks/resources/images/surf.png
b/plugin.video.zapiks/resources/images/surf.png
index 4707789..4ed2b3c 100644
Binary files a/plugin.video.zapiks/resources/images/surf.png and
b/plugin.video.zapiks/resources/images/surf.png differ
diff --git a/plugin.video.zapiks/resources/language/English/strings.xml
b/plugin.video.zapiks/resources/language/English/strings.xml
index 69cab26..48da7fd 100644
--- a/plugin.video.zapiks/resources/language/English/strings.xml
+++ b/plugin.video.zapiks/resources/language/English/strings.xml
@@ -10,11 +10,11 @@
<string id="30007"></string>
<string id="30008"></string>
<string id="30009"></string>
- <string id="30010"></string>
- <string id="30011"></string>
- <string id="30012"></string>
- <string id="30013"></string>
- <string id="30014"></string>
+ <string id="30010">Most Recent</string>
+ <string id="30011">Most Viewed</string>
+ <string id="30012">Most Buzzed</string>
+ <string id="30013">Most Favorited</string>
+ <string id="30014">Sort Videos by</string>
<string id="30015"></string>
<string id="30016"></string>
<string id="30017"></string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.funny.or.die/addon.xml | 3 +-
plugin.video.funny.or.die/changelog.txt | 6 ++-
plugin.video.funny.or.die/default.py | 41 +++++++++-----
plugin.video.funny.or.die/resources/settings.xml | 2 +-
plugin.video.zapiks/addon.xml | 2 +-
plugin.video.zapiks/changelog.txt | 9 +++
plugin.video.zapiks/default.py | 60 ++++++++++++++++----
plugin.video.zapiks/resources/images/surf.png | Bin 501417 -> 449772
bytes
.../resources/language/English/strings.xml | 10 ++--
plugin.video.zapiks/resources/settings.xml | 3 +
10 files changed, 101 insertions(+), 35 deletions(-)
create mode 100644 plugin.video.zapiks/changelog.txt
create mode 100644 plugin.video.zapiks/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
