The branch, eden-pre has been updated
via 433029342159a9f78424a70b8b9dd2cf2489d791 (commit)
from 8548bfa8114336e1cb8b2dfdc4c2f020dac28d03 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=433029342159a9f78424a70b8b9dd2cf2489d791
commit 433029342159a9f78424a70b8b9dd2cf2489d791
Author: ronie <[email protected]>
Date: Fri Oct 28 00:34:57 2011 +0200
[script.globalsearch] -v1.0.3
added option for skins to specify search categories
diff --git a/script.globalsearch/README.txt b/script.globalsearch/README.txt
index 1a40703..8d09331 100644
--- a/script.globalsearch/README.txt
+++ b/script.globalsearch/README.txt
@@ -5,6 +5,7 @@ INFORMATION FOR SKINNERS
CONTENTS:
+0. Running the addon
I. Infolabels available in script-globalsearch-main.xml
II. Infolabels available in script-globalsearch-infodialog.xml
III. Control id's used in script-globalsearch-main.xml
@@ -13,6 +14,20 @@ V. Control id's used in script-globalsearch-contextmenu.xml
+0. Running the addon
+------------------
+The addon can be run in two ways:
+- the user executes the addon
+- the script executes the addon: RunScript(script.globalsearch)
+
+You can specify which categories should be searched (this overrides the user
preferences set in the addon settings):
+RunScript(script.globalsearch,movies=true)
+RunScript(script.globalsearch,tvshows=true&musicvideos=true&songs=true)
+
+available options: movies, tvshows, episodes, musicvideos, artists, albums,
songs
+
+
+
I. Infolabels available in script-globalsearch-main.xml
-------------------------------------------------------
MOVIES:
diff --git a/script.globalsearch/addon.xml b/script.globalsearch/addon.xml
index 2c8a454..45b34d7 100644
--- a/script.globalsearch/addon.xml
+++ b/script.globalsearch/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.globalsearch" name="Global Search" version="0.1.2"
provider-name="ronie">
+<addon id="script.globalsearch" name="Global Search" version="0.1.3"
provider-name="ronie">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/script.globalsearch/changelog.txt
b/script.globalsearch/changelog.txt
index ad9dc29..44eda1a 100644
--- a/script.globalsearch/changelog.txt
+++ b/script.globalsearch/changelog.txt
@@ -1,3 +1,6 @@
+v0.1.3
+- added option for skins to specify search categories
+
v0.1.2
- removed some debug logging
- added Portuguese (Brazil) translation
diff --git a/script.globalsearch/resources/lib/gui.py
b/script.globalsearch/resources/lib/gui.py
index 78340a6..81d7f54 100644
--- a/script.globalsearch/resources/lib/gui.py
+++ b/script.globalsearch/resources/lib/gui.py
@@ -24,6 +24,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
xbmcgui.WindowXMLDialog.__init__( self )
self.searchstring = kwargs[ "searchstring"
].replace('(','[(]').replace(')','[)]').replace('+','[+]')
log('script version %s started' % __addonversion__)
+ self.nextsearch = False
def onInit( self ):
@@ -31,7 +32,10 @@ class GUI( xbmcgui.WindowXMLDialog ):
self._close()
else:
self._hide_controls()
- self._load_settings()
+ if not self.nextsearch:
+ self._parse_argv()
+ if self.params == {}:
+ self._load_settings()
self._reset_variables()
self._init_variables()
self._fetch_items()
@@ -79,6 +83,20 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.getControl( 181 ).reset()
+ def _parse_argv( self ):
+ try:
+ self.params = dict( arg.split( "=" ) for arg in sys.argv[ 1
].split( "&" ) )
+ except:
+ self.params = {}
+ self.movies = self.params.get( "movies", "" )
+ self.tvshows = self.params.get( "tvshows", "" )
+ self.episodes = self.params.get( "episodes", "" )
+ self.musicvideos = self.params.get( "musicvideos", "" )
+ self.artists = self.params.get( "artists", "" )
+ self.albums = self.params.get( "albums", "" )
+ self.songs = self.params.get( "songs", "" )
+
+
def _load_settings( self ):
self.movies = __addon__.getSetting( "movies" )
self.tvshows = __addon__.getSetting( "tvshows" )
-----------------------------------------------------------------------
Summary of changes:
script.globalsearch/README.txt | 15 +++++++++++++++
script.globalsearch/addon.xml | 2 +-
script.globalsearch/changelog.txt | 3 +++
script.globalsearch/resources/lib/gui.py | 20 +++++++++++++++++++-
4 files changed, 38 insertions(+), 2 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
