The branch, dharma-pre has been updated
via 3b40e7aa1eba3521904b083624c7f5ef4a8542e4 (commit)
from 6900fea179860fed427cbf539a9225af9c06f349 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3b40e7aa1eba3521904b083624c7f5ef4a8542e4
commit 3b40e7aa1eba3521904b083624c7f5ef4a8542e4
Author: spiff <[email protected]>
Date: Mon Nov 1 15:49:14 2010 +0100
[plugin.video.funny.or.die] updated to version 0.0.2
diff --git a/plugin.video.funny.or.die/addon.xml
b/plugin.video.funny.or.die/addon.xml
index d618eb5..dce7a3f 100644
--- a/plugin.video.funny.or.die/addon.xml
+++ b/plugin.video.funny.or.die/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.funny.or.die"
name="Funny or Die"
- version="0.0.1"
+ version="0.0.2"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.funny.or.die/default.py
b/plugin.video.funny.or.die/default.py
index c2e3038..e6bf49c 100644
--- a/plugin.video.funny.or.die/default.py
+++ b/plugin.video.funny.or.die/default.py
@@ -2,22 +2,24 @@ import urllib,urllib2,re,xbmcplugin,xbmcgui,xbmcaddon
__settings__ = xbmcaddon.Addon(id='plugin.video.funny.or.die')
__language__ = __settings__.getLocalizedString
+sort = __settings__.getSetting('sort_by')
+
def CATEGORIES():
-
addDir(__language__(30000),'http://www.funnyordie.com/browse/videos/all/exclusives',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30001),'http://www.funnyordie.com/browse/videos/all/immortal',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30002),'http://www.funnyordie.com/browse/videos/stand_up/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30003),'http://www.funnyordie.com/browse/videos/animation/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30004),'http://www.funnyordie.com/browse/videos/web_series/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30005),'http://www.funnyordie.com/browse/videos/nsfw/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30006),'http://www.funnyordie.com/browse/videos/sketch/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30007),'http://www.funnyordie.com/browse/videos/sports/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30008),'http://www.funnyordie.com/browse/videos/clean_comedy/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30009),'http://www.funnyordie.com/browse/videos/politics/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30010),'http://www.funnyordie.com/browse/videos/music/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30011),'http://www.funnyordie.com/browse/videos/parody/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30012),'http://www.funnyordie.com/browse/videos/real_life/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
-
addDir(__language__(30013),'http://www.funnyordie.com/browse/videos/all/all',1,'http://public0.ordienetworks.com/images/funny_or_die.gif?f85d7543')
+
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')
def INDEX(url):
diff --git a/plugin.video.funny.or.die/icon.png
b/plugin.video.funny.or.die/icon.png
index e95c171..fa5cfc3 100644
Binary files a/plugin.video.funny.or.die/icon.png and
b/plugin.video.funny.or.die/icon.png differ
diff --git a/plugin.video.funny.or.die/resources/language/English/strings.xml
b/plugin.video.funny.or.die/resources/language/English/strings.xml
index 56f7b99..fdd174b 100644
--- a/plugin.video.funny.or.die/resources/language/English/strings.xml
+++ b/plugin.video.funny.or.die/resources/language/English/strings.xml
@@ -14,4 +14,10 @@
<string id="30011">Parody</string>
<string id="30012">Real Life</string>
<string id="30013">All</string>
+ <string id="30014">Sort videos by</string>
+ <string id="30015">Most Buzzed</string>
+ <string id="30016">Most Recent</string>
+ <string id="30017">Most Viewed</string>
+ <string id="30018">Most Favorited</string>
+ <string id="30019">Highest Rated</string>
</strings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.funny.or.die/addon.xml | 2 +-
plugin.video.funny.or.die/default.py | 30 ++++++++++---------
plugin.video.funny.or.die/icon.png | Bin 41402 -> 51003 bytes
.../resources/language/English/strings.xml | 6 ++++
plugin.video.funny.or.die/resources/settings.xml | 3 ++
5 files changed, 26 insertions(+), 15 deletions(-)
create mode 100644 plugin.video.funny.or.die/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
