The branch, dharma has been updated
via cbca85bbff457febb8448a928f8ac877fbc91eb7 (commit)
via beeedca2dc138aaefa871b0837e7fbab6b762915 (commit)
from 39642498c67fc369f88a4d763fa0d3a1942bdddd (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=cbca85bbff457febb8448a928f8ac877fbc91eb7
commit cbca85bbff457febb8448a928f8ac877fbc91eb7
Author: spiff <[email protected]>
Date: Wed Dec 29 18:05:36 2010 +0100
[plugin.program.SABnzbd] updated to version 2.1.5
diff --git a/plugin.program.SABnzbd/addon.xml b/plugin.program.SABnzbd/addon.xml
index f9946c2..68118d8 100644
--- a/plugin.program.SABnzbd/addon.xml
+++ b/plugin.program.SABnzbd/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.program.SABnzbd"
name="SABnzbd"
- version="2.1.4"
+ version="2.1.5"
provider-name="Kricker, Maruchan">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.program.SABnzbd/changelog.txt
b/plugin.program.SABnzbd/changelog.txt
index ef7c228..bf09bb9 100644
--- a/plugin.program.SABnzbd/changelog.txt
+++ b/plugin.program.SABnzbd/changelog.txt
@@ -1,3 +1,9 @@
+2.1.5
+- Added NZBMatrix searching for TV, Movies and Music
+- NZBs.org Music searching
+- NZBindex.nl search settings adjusted
+- Newzbin fixes
+
2.1.4
- Fixed NZBMatrix Music Video feed label
diff --git a/plugin.program.SABnzbd/default.py
b/plugin.program.SABnzbd/default.py
index 889e212..51f886d 100644
--- a/plugin.program.SABnzbd/default.py
+++ b/plugin.program.SABnzbd/default.py
@@ -12,7 +12,7 @@ __author__ = "switch, Kricker, maruchan"
__url__ = "http://sabnzbd.org";
__svn_url__ = ""
__credits__ = "Team SABnzbd & Team XBMC"
-__version__ = "2.1.4"
+__version__ = "2.1.5"
__settings__ = xbmcaddon.Addon(id='plugin.program.SABnzbd')
__language__ = __settings__.getLocalizedString
diff --git a/plugin.program.SABnzbd/nzb/rss_parser.py
b/plugin.program.SABnzbd/nzb/rss_parser.py
index 801380f..a8d4475 100644
--- a/plugin.program.SABnzbd/nzb/rss_parser.py
+++ b/plugin.program.SABnzbd/nzb/rss_parser.py
@@ -161,7 +161,7 @@ class RSSParser:
""" Retrieve the post link from this entry """
uri = uri.lower()
# Special handling for nzbindex.nl
- if 'nzbindex.nl' in uri:
+ if 'nzbindex.nl' in uri or "newzbin" in uri:
try:
link = entry.enclosures[0]['href']
except:
diff --git a/plugin.program.SABnzbd/settings.py
b/plugin.program.SABnzbd/settings.py
index 967b7c1..a363be9 100644
--- a/plugin.program.SABnzbd/settings.py
+++ b/plugin.program.SABnzbd/settings.py
@@ -1,4 +1,4 @@
-import xbmcplugin
+import xbmcplugin
import sys
__settings__ = sys.modules[ "__main__" ].__settings__
@@ -11,12 +11,12 @@ The '#' character is a comment in python, delete it to use
commented out feeds
'''
#if you use newzbin, add custom rss feeds here
newzbin_rss = [
-{'name':'Newzbin - Search',
'url':'http://www.newzbin.com/search/query/?q=%s&area=-1&fpn=p&searchaction=Go&areadone=-1&feed=rss'},
-{'name':'Newzbin - TV',
'url':'http://www.newzbin.com/browse/category/p/tv/?feed=rss'},
-{'name':'Newzbin - Movies',
'url':'http://www.newzbin.com/browse/category/p/movies/?feed=rss'},
-{'name':'Newzbin - Music',
'url':'http://www.newzbin.com/browse/category/p/music/?feed=rss'},
-#{'name':'Newzbin - Games (Latest)',
'url':'http://www.newzbin.com/browse/category/p/games/?feed=rss'},
-#{'name':'Newzbin - Consoles (Latest)',
'url':'http://www.newzbin.com/browse/category/p/consoles/?feed=rss'},
+{'name':'Newzbin - Search', 'url':'http://' +
__settings__.getSetting('username_newzbin') + ':' +
__settings__.getSetting('password_newzbin') +
'@www.newzbin.com/search/query/?q=%s&area=-1&fpn=p&searchaction=Go&areadone=-1&feed=rss'},
+{'name':'Newzbin - TV', 'url':'http://' +
__settings__.getSetting('username_newzbin') + ':' +
__settings__.getSetting('password_newzbin') +
'@www.newzbin.com/browse/category/p/tv/?feed=rss', 'category':'tv'},
+{'name':'Newzbin - Movies', 'url':'http://' +
__settings__.getSetting('username_newzbin') + ':' +
__settings__.getSetting('password_newzbin') +
'@www.newzbin.com/browse/category/p/movies/?feed=rss', 'category':'movies'},
+{'name':'Newzbin - Music', 'url':'http://' +
__settings__.getSetting('username_newzbin') + ':' +
__settings__.getSetting('password_newzbin') +
'@www.newzbin.com/browse/category/p/music/?feed=rss', 'category':'music'},
+#{'name':'Newzbin - Games (Latest)', 'url':'http://' +
__settings__.getSetting('username_newzbin') + ':' +
__settings__.getSetting('password_newzbin') +
'@www.newzbin.com/browse/category/p/games/?feed=rss', 'category':'games'},
+#{'name':'Newzbin - Consoles (Latest)', 'url':'http://' +
__settings__.getSetting('username_newzbin') + ':' +
__settings__.getSetting('password_newzbin') +
'@www.newzbin.com/browse/category/p/consoles/?feed=rss', 'category':'consoles'},
]
binsearch_rss = [{'name':'Binsearch - TV (Latest)',
'url':'http://rss.binsearch.net/rss.php?max=50&g=alt.binaries.multimedia',
'category':'tv'},
@@ -29,8 +29,10 @@ nzbs_rss = [
{'name':'NZBs.org - Movies (XVID)',
'url':'http://nzbs.org/rss.php?catid=2&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'movies'},
{'name':'NZBs.org - Music',
'url':'http://nzbs.org/rss.php?catid=5&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'music'},
{'name':'NZBs.org - Music Videos',
'url':'http://nzbs.org/rss.php?catid=10&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'musicvideos'},
-{'name':'NZBs.org - Movies Search',
'url':'http://nzbs.org/rss.php?q=%s&type=2&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'movies'},
{'name':'NZBs.org - TV Search',
'url':'http://nzbs.org/rss.php?q=%s&type=1&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'tv'},
+{'name':'NZBs.org - Movies Search',
'url':'http://nzbs.org/rss.php?q=%s&type=2&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'movies'},
+{'name':'NZBs.org - Music Search',
'url':'http://nzbs.org/rss.php?q=%s&catid=5&num=50&dl=1&i=' +
__settings__.getSetting('nzbs_id') + '&h=' +
__settings__.getSetting('nzbs_hash'), 'category':'music'},
+
]
nzbsrus_rss = [
@@ -50,15 +52,19 @@ nzbmatrix_rss = [
{'name':'NZBMatrix - Anime',
'url':'http://rss.nzbmatrix.com/rss.php?cat=Anime', 'category':'anime'},
{'name':'NZBMatrix - Music',
'url':'http://rss.nzbmatrix.com/rss.php?cat=Music', 'category':'music'},
{'name':'NZBMatrix - Music Videos',
'url':'http://rss.nzbmatrix.com/rss.php?subcat=25', 'category':'musicvideos'},
+{'name':'NZBMatrix - TV Search',
'url':'http://rss.nzbmatrix.com/rss.php?page=details&subcat=6,41,7&term=%s',
'category':'tv'},
+{'name':'NZBMatrix - Movies Search',
'url':'http://rss.nzbmatrix.com/rss.php?page=details&subcat=2,54,42&term=%s',
'category':'movies'},
+{'name':'NZBMatrix - Music Search',
'url':'http://rss.nzbmatrix.com/rss.php?page=details&cat=Music&term=%s',
'category':'music'},
]
nzbindex_rss = [
-{'name':'NZBIndex - Search',
'url':'http://www.nzbindex.nl/rss/?searchitem=%s&x=0&y=0&age=30&group=&min_size=&max_size=&poster='},
+{'name':'NZBIndex - Search',
'url':'http://www.nzbindex.nl/rss/?searchitem=%s&x=0&y=0&age=&max=50&sort=agedesc&minsize=&maxsize=&dq=&poster=&nfo=&hidecross=1&hidespam=0&hidespam=1&more=1'},
]
""" ADD CUSTOM RSS FEEDS HERE """
#add other rss feeds here, just copy an existing one and change the name and
url
-other_rss = []
+other_rss = [
+]
sabnzbd_rss = [
{'name':'SABnzbd - Queue', 'url':''}, #leave the url blank for this one
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=beeedca2dc138aaefa871b0837e7fbab6b762915
commit beeedca2dc138aaefa871b0837e7fbab6b762915
Author: spiff <[email protected]>
Date: Wed Dec 29 18:04:18 2010 +0100
[plugin.audio.soundcloud] updated to version 0.1.5
diff --git a/plugin.audio.soundcloud/addon.xml
b/plugin.audio.soundcloud/addon.xml
index 1203ac4..c9693f8 100644
--- a/plugin.audio.soundcloud/addon.xml
+++ b/plugin.audio.soundcloud/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.soundcloud"
name="SoundCloud"
- version="0.1.4"
+ version="0.1.5"
provider-name="Zsolt Török">
<requires>
<import addon="xbmc.python" version="1.0"/>
@@ -13,7 +13,8 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <summary lang="en">Listen to music from SoundCloud, the online audio
distribution service.</summary>
- <description lang="en">SoundCloud is a platform for musicians to promote
and distribute their music online.</description>
+ <summary lang="en">XBMC Plugin for SoundCloud</summary>
+ <description lang="en">SoundCloud is a platform for musicians to promote
and distribute their music online.
+This is a third-party add-on, which uses public web services exposed by
SoundCloud. Neither the XBMC community, nor the developer of this add-on is in
any way affiliated with SoundCloud Ltd.</description>
</extension>
</addon>
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.soundcloud/addon.xml | 7 ++++---
plugin.program.SABnzbd/addon.xml | 2 +-
plugin.program.SABnzbd/changelog.txt | 6 ++++++
plugin.program.SABnzbd/default.py | 2 +-
plugin.program.SABnzbd/nzb/rss_parser.py | 2 +-
plugin.program.SABnzbd/settings.py | 26 ++++++++++++++++----------
6 files changed, 29 insertions(+), 16 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
