The branch, eden-pre has been updated
via 8cb4d4bce03f61b861d6d9ba5e8a00ed664d1faa (commit)
via c0bc4832a68c2039992ba9497cbc4530b7a2d20f (commit)
from fae846e9d6986a29e376454e15931faa5589957d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8cb4d4bce03f61b861d6d9ba5e8a00ed664d1faa
commit 8cb4d4bce03f61b861d6d9ba5e8a00ed664d1faa
Author: spiff <[email protected]>
Date: Mon Jan 30 18:56:44 2012 +0100
[plugin.audio.radio_de] updated to version 1.0.2
diff --git a/plugin.audio.radio_de/addon.py b/plugin.audio.radio_de/addon.py
index ea52e73..fa20d98 100644
--- a/plugin.audio.radio_de/addon.py
+++ b/plugin.audio.radio_de/addon.py
@@ -154,7 +154,7 @@ def search():
keyboard = xbmc.Keyboard('', plugin.get_string(30201))
keyboard.doModal()
if keyboard.isConfirmed() and keyboard.getText():
- search_string = keyboard.getText().decode('utf8')
+ search_string = keyboard.getText()
__log('search gots a string: "%s"' % search_string)
language = __get_language()
stations = scraper.search_stations_by_string(language, search_string)
diff --git a/plugin.audio.radio_de/addon.xml b/plugin.audio.radio_de/addon.xml
index aca647e..0c1c51a 100644
--- a/plugin.audio.radio_de/addon.xml
+++ b/plugin.audio.radio_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.radio_de" name="Radio" version="1.0.1"
provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.audio.radio_de" name="Radio" version="1.0.2"
provider-name="Tristan Fischer ([email protected])">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.xbmcswift" version="0.2.0"/>
diff --git a/plugin.audio.radio_de/changelog.txt
b/plugin.audio.radio_de/changelog.txt
index e69de29..927114d 100644
--- a/plugin.audio.radio_de/changelog.txt
+++ b/plugin.audio.radio_de/changelog.txt
@@ -0,0 +1,5 @@
+1.0.2 (29.01.2012)
+ - Fix error with UTF-8 characters in search string
+
+1.0.1 (13.01.2012)
+ - Initial Release
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c0bc4832a68c2039992ba9497cbc4530b7a2d20f
commit c0bc4832a68c2039992ba9497cbc4530b7a2d20f
Author: spiff <[email protected]>
Date: Mon Jan 30 18:17:55 2012 +0100
[plugin.program.advanced.launcher] updated to version 1.7.5
diff --git a/plugin.program.advanced.launcher/addon.py
b/plugin.program.advanced.launcher/addon.py
index 1bc8e08..d3a05d8 100644
--- a/plugin.program.advanced.launcher/addon.py
+++ b/plugin.program.advanced.launcher/addon.py
@@ -12,7 +12,7 @@ __author__ = "Angelscry"
__url__ = "http://code.google.com/p/xbmc-advanced-launcher/";
__svn_url__ =
"http://xbmc-advanced-launcher.googlecode.com/svn/trunk/plugin.program.advanced.launcher/";
__credits__ = "Leo212, CinPoU, JustSomeUser, Zerqent, Zosky, Atsumori"
-__version__ = "1.7.4"
+__version__ = "1.7.5"
if ( __name__ == "__main__" ):
import resources.lib.launcher_plugin as plugin
diff --git a/plugin.program.advanced.launcher/addon.xml
b/plugin.program.advanced.launcher/addon.xml
index ef0e6a6..a908a09 100644
--- a/plugin.program.advanced.launcher/addon.xml
+++ b/plugin.program.advanced.launcher/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.program.advanced.launcher" name="Advanced Launcher"
version="1.7.4" provider-name="Angelscry">
+<addon id="plugin.program.advanced.launcher" name="Advanced Launcher"
version="1.7.5" provider-name="Angelscry">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.9"/>
@@ -9,7 +9,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <disclaimer>For XBMC Eden</disclaimer>
+ <disclaimer>XBMC Eden only</disclaimer>
<summary lang="en">Start any applications from XBMC.</summary>
<summary lang="fr">Lancer n'importer quelle application depuis
XBMC.</summary>
<summary lang="fi">Käynnistää sovelluksia XBMC:stä</summary>
diff --git a/plugin.program.advanced.launcher/changelog.txt
b/plugin.program.advanced.launcher/changelog.txt
index 0b9236d..2c8662f 100644
--- a/plugin.program.advanced.launcher/changelog.txt
+++ b/plugin.program.advanced.launcher/changelog.txt
@@ -1,4 +1,12 @@
-[B]1.7.4/B]
+[B]1.7.5/B]
+. Fix thumb/fanart local import for items (image extension bug).
+. Fix thumb/fanart local import for launcher (image extension bug).
+. Fix defaut thumb/fanart paths for launcher (set into addon userdata
directory).
+. Auto disable/restore LIRC inputs for Linux system.
+. Modification of launchers and items modify info menu.
+. Clean menu text strings.
+
+[B]1.7.4/B]
. Fix Dharma compatibility problem under Windows
. Replace "System Platform" string by simply "Platform"
diff --git
a/plugin.program.advanced.launcher/resources/language/English/strings.xml
b/plugin.program.advanced.launcher/resources/language/English/strings.xml
index a74b3f3..3071983 100644
--- a/plugin.program.advanced.launcher/resources/language/English/strings.xml
+++ b/plugin.program.advanced.launcher/resources/language/English/strings.xml
@@ -137,12 +137,12 @@
<string id="30309">Modify Studio : %s</string>
<string id="30310">Modify Genre : %s</string>
<string id="30328">Modify Description : %s ...</string>
- <string id="30311">Import Infos from %s</string>
- <string id="30333">Import Infos from .nfo file</string>
+ <string id="30311">Import from %s</string>
+ <string id="30333">Import from .nfo file</string>
<string id="30312">Import Image from %s</string>
<string id="30313">Select Local Image (Link)</string>
<string id="30315">Modify Arguments : %s</string>
- <string id="30316">Save Infos to .nfo file</string>
+ <string id="30316">Save to .nfo file</string>
<string id="30329">Toggle XBMC Fullscreen : %s</string>
<string id="30317">Modify Items Extensions : %s</string>
<string id="30318">Clear Items List</string>
diff --git
a/plugin.program.advanced.launcher/resources/language/French/strings.xml
b/plugin.program.advanced.launcher/resources/language/French/strings.xml
index 5b5b45a..7001b08 100644
--- a/plugin.program.advanced.launcher/resources/language/French/strings.xml
+++ b/plugin.program.advanced.launcher/resources/language/French/strings.xml
@@ -137,12 +137,12 @@
<string id="30309">Modifier le studio : %s</string>
<string id="30310">Modifier le genre : %s</string>
<string id="30328">Modifier la description : %s ...</string>
- <string id="30311">Importer les informations depuis %s</string>
- <string id="30333">Importer les informations depuis le fichier
.nfo</string>
+ <string id="30311">Importer depuis %s</string>
+ <string id="30333">Importer depuis un fichier .nfo</string>
<string id="30312">Importer l'image depuis %s</string>
<string id="30313">Choisir une image locale (créer un lien)</string>
<string id="30315">Modifier les arguments : %s</string>
- <string id="30316">Sauver les informations dans le fichier .nfo</string>
+ <string id="30316">Sauver dans un fichier .nfo</string>
<string id="30329">Basculer XBMC en plein écran : %s</string>
<string id="30317">Modifier les extensions des objets : %s</string>
<string id="30318">Vider la liste des objets</string>
diff --git a/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
b/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
index f0434a8..6cf8052 100644
--- a/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
+++ b/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
@@ -34,10 +34,6 @@ import shutil
from file_item import Thumbnails
thumbnails = Thumbnails()
-# Code for XBMC Eden & Dharma
-#try: import hashlib
-#except: import md5
-# Code for XBMC Eden only
import md5
from xbmcaddon import Addon
@@ -54,6 +50,13 @@ BASE_CURRENT_SOURCE_PATH = os.path.join( PLUGIN_DATA_PATH ,
"launchers.xml" )
TEMP_CURRENT_SOURCE_PATH = os.path.join( PLUGIN_DATA_PATH , "launchers.tmp" )
SHORTCUT_FILE = os.path.join( PLUGIN_DATA_PATH , "shortcut.cut" )
+DEFAULT_THUMB_PATH = os.path.join( PLUGIN_DATA_PATH , "thumbs" )
+if not os.path.exists(DEFAULT_THUMB_PATH): os.makedirs(DEFAULT_THUMB_PATH)
+DEFAULT_FANART_PATH = os.path.join( PLUGIN_DATA_PATH , "fanarts" )
+if not os.path.exists(DEFAULT_FANART_PATH): os.makedirs(DEFAULT_FANART_PATH)
+DEFAULT_NFO_PATH = os.path.join( PLUGIN_DATA_PATH , "nfos" )
+if not os.path.exists(DEFAULT_NFO_PATH): os.makedirs(DEFAULT_NFO_PATH)
+
REMOVE_COMMAND = "%%REMOVE%%"
ADD_COMMAND = "%%ADD%%"
EDIT_COMMAND = "%%EDIT%%"
@@ -309,9 +312,9 @@ class Main:
if (os.path.isfile(image)):
filename =
self.launchers[launcher]["roms"][rom]["filename"]
if (self.launchers[launcher]["thumbpath"] ==
self.launchers[launcher]["fanartpath"] ):
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_thumb.jpg')))
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_thumb'+os.path.splitext(image)[-1])))
else:
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'.jpg')))
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
os.path.splitext(image)[-1])))
if ( image != file_path ):
shutil.copy2(
image.decode(sys.getfilesystemencoding(),'ignore') ,
file_path.decode(sys.getfilesystemencoding(),'ignore') )
self.launchers[launcher]["roms"][rom]["thumb"] =
file_path
@@ -348,9 +351,9 @@ class Main:
if (os.path.isfile(image)):
filename =
self.launchers[launcher]["roms"][rom]["filename"]
if (self.launchers[launcher]["thumbpath"] ==
self.launchers[launcher]["fanartpath"] ):
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_fanart.jpg')))
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_fanart'+os.path.splitext(image)[-1])))
else:
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'.jpg')))
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
os.path.splitext(image)[-1])))
if ( image != file_path ):
shutil.copy2(
image.decode(sys.getfilesystemencoding(),'ignore') ,
file_path.decode(sys.getfilesystemencoding(),'ignore') )
self.launchers[launcher]["roms"][rom]["fanart"] =
file_path
@@ -448,7 +451,13 @@ class Main:
if (not self.image_url == self.launchers[launcherID]["thumb"]):
img_url = self._get_thumbnail(self.image_url)
if ( img_url != '' ):
- file_path =
os.path.join(self.launchers[launcherID]["thumbpath"],os.path.basename(self.launchers[launcherID]["application"])+'_thumb.jpg')
+ filename = self.launchers[launcherID]["application"]
+ if (
os.path.join(self.launchers[launcherID]["thumbpath"]) != "" ):
+ file_path =
os.path.join(self.launchers[launcherID]["thumbpath"],os.path.basename(self.launchers[launcherID]["application"])+'_thumb'+os.path.splitext(img_url)[-1])
+ else:
+ if (self.settings[ "launcher_thumb_path" ] == "" ):
+ self.settings[ "launcher_thumb_path" ] =
DEFAULT_THUMB_PATH;
+ file_path = os.path.join(self.settings[
"launcher_thumb_path"
],os.path.basename(self.launchers[launcherID]["application"])+'_thumb'+os.path.splitext(img_url)[-1])
xbmc.executebuiltin("XBMC.Notification(%s,%s, 3000)" %
(__language__( 30000 ), __language__( 30069 )))
h = urllib.urlretrieve(img_url,file_path)
self.launchers[launcherID]["thumb"] = file_path
@@ -525,7 +534,12 @@ class Main:
img_url = self._get_fanart(self.image_url)
if ( img_url != '' ):
filename = self.launchers[launcherID]["application"]
- file_path =
os.path.join(self.launchers[launcherID]["fanartpath"],os.path.basename(self.launchers[launcherID]["application"])+'_fanart.jpg')
+ if (
os.path.join(self.launchers[launcherID]["fanartpath"]) != "" ):
+ file_path =
os.path.join(self.launchers[launcherID]["fanartpath"],os.path.basename(self.launchers[launcherID]["application"])+'_fanart'+os.path.splitext(img_url)[-1])
+ else:
+ if (self.settings[ "launcher_fanart_path" ] == ""
):
+ self.settings[ "launcher_fanart_path" ] =
DEFAULT_FANART_PATH;
+ file_path = os.path.join(self.settings[
"launcher_fanart_path"
],os.path.basename(self.launchers[launcherID]["application"])+'_fanart'+os.path.splitext(img_url)[-1])
xbmc.executebuiltin("XBMC.Notification(%s,%s, 3000)" %
(__language__( 30000 ), __language__( 30074 )))
h = urllib.urlretrieve(img_url,file_path)
self.launchers[launcherID]["fanart"] = file_path
@@ -688,15 +702,12 @@ class Main:
type_nb = type_nb+1
if (type == type_nb ):
dialog = xbmcgui.Dialog()
- type2 = dialog.select(__language__( 30319 ), [__language__( 30311
) % self.settings[ "datas_scraper" ],__language__( 30333 ),__language__( 30306
) % self.launchers[launcherID]["name"],__language__( 30307 ) %
self.launchers[launcherID]["gamesys"],__language__( 30308 ) %
self.launchers[launcherID]["release"],__language__( 30309 ) %
self.launchers[launcherID]["studio"],__language__( 30310 ) %
self.launchers[launcherID]["genre"],__language__( 30328 ) %
self.launchers[launcherID]["plot"][0:20],__language__( 30316 )])
+ type2 = dialog.select(__language__( 30319 ), [__language__( 30311
) % self.settings[ "datas_scraper" ],__language__( 30306 ) %
self.launchers[launcherID]["name"],__language__( 30307 ) %
self.launchers[launcherID]["gamesys"],__language__( 30308 ) %
self.launchers[launcherID]["release"],__language__( 30309 ) %
self.launchers[launcherID]["studio"],__language__( 30310 ) %
self.launchers[launcherID]["genre"],__language__( 30328 ) %
self.launchers[launcherID]["plot"][0:20],__language__( 30333 ),__language__(
30316 )])
if (type2 == 0 ):
# Edition of the launcher name
self._scrap_launcher(launcherID)
if (type2 == 1 ):
# Edition of the launcher name
- self._import_launcher_nfo(launcherID)
- if (type2 == 2 ):
- # Edition of the launcher name
keyboard = xbmc.Keyboard(self.launchers[launcherID]["name"],
__language__( 30037 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
@@ -705,7 +716,7 @@ class Main:
title = self.launchers[launcherID]["name"]
self.launchers[launcherID]["name"] =
title.replace(",","â").replace('"',"''").replace("/"," â ").rstrip()
self._save_launchers()
- if (type2 == 3 ):
+ if (type2 == 2 ):
# Selection of the launcher game system
dialog = xbmcgui.Dialog()
platforms = _get_game_system_list()
@@ -713,28 +724,28 @@ class Main:
if (not gamesystem == -1 ):
self.launchers[launcherID]["gamesys"] =
platforms[gamesystem]
self._save_launchers()
- if (type2 == 4 ):
+ if (type2 == 3 ):
# Edition of the launcher release date
keyboard =
xbmc.Keyboard(self.launchers[launcherID]["release"], __language__( 30038 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
self.launchers[launcherID]["release"] = keyboard.getText()
self._save_launchers()
- if (type2 == 5 ):
+ if (type2 == 4 ):
# Edition of the launcher studio name
keyboard = xbmc.Keyboard(self.launchers[launcherID]["studio"],
__language__( 30039 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
self.launchers[launcherID]["studio"] = keyboard.getText()
self._save_launchers()
- if (type2 == 6 ):
+ if (type2 == 5 ):
# Edition of the launcher genre
keyboard = xbmc.Keyboard(self.launchers[launcherID]["genre"],
__language__( 30040 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
self.launchers[launcherID]["genre"] = keyboard.getText()
self._save_launchers()
- if (type2 == 7 ):
+ if (type2 == 6 ):
# Import of the launcher plot
text_file = xbmcgui.Dialog().browse(1,__language__( 30080
),"files",".txt|.dat", False, False, self.launchers[launcherID]["application"])
if ( os.path.isfile(text_file) == True ):
@@ -742,6 +753,9 @@ class Main:
self.launchers[launcherID]["plot"] = text_plot.read()
text_plot.close()
self._save_launchers()
+ if (type2 == 7 ):
+ # Edition of the launcher name
+ self._import_launcher_nfo(launcherID)
if (type2 == 8 ):
# Edition of the launcher name
self._export_launcher_nfo(launcherID)
@@ -764,7 +778,12 @@ class Main:
if (image):
if (os.path.isfile(image)):
filename = self.launchers[launcherID]["application"]
- file_path =
os.path.join(self.launchers[launcherID]["thumbpath"],os.path.basename(self.launchers[launcherID]["application"])+'_thumb.jpg')
+ if (
os.path.join(self.launchers[launcherID]["thumbpath"]) != "" ):
+ file_path =
os.path.join(self.launchers[launcherID]["thumbpath"],os.path.basename(self.launchers[launcherID]["application"])+'_thumb'+os.path.splitext(image)[-1])
+ else:
+ if (self.settings[ "launcher_thumb_path" ] == "" ):
+ self.settings[ "launcher_thumb_path" ] =
DEFAULT_THUMB_PATH;
+ file_path = os.path.join(self.settings[
"launcher_thumb_path"
],os.path.basename(self.launchers[launcherID]["application"])+'_thumb'+os.path.splitext(image)[-1])
if ( image != file_path ):
shutil.copy2(
image.decode(sys.getfilesystemencoding(),'ignore') ,
file_path.decode(sys.getfilesystemencoding(),'ignore') )
self.launchers[launcherID]["thumb"] = file_path
@@ -802,7 +821,12 @@ class Main:
if (image):
if (os.path.isfile(image)):
filename = self.launchers[launcherID]["application"]
- file_path =
os.path.join(self.launchers[launcherID]["fanartpath"],os.path.basename(self.launchers[launcherID]["application"])+'_fanart.jpg')
+ if (
os.path.join(self.launchers[launcherID]["fanartpath"]) != "" ):
+ file_path =
os.path.join(self.launchers[launcherID]["fanartpath"],os.path.basename(self.launchers[launcherID]["application"])+'_fanart'+os.path.splitext(image)[-1])
+ else:
+ if (self.settings[ "launcher_fanart_path" ] == ""
):
+ self.settings[ "launcher_fanart_path" ] =
DEFAULT_FANART_PATH;
+ file_path = os.path.join(self.settings[
"launcher_fanart_path"
],os.path.basename(self.launchers[launcherID]["application"])+'_fanart'+os.path.splitext(image)[-1])
if ( image != file_path ):
shutil.copy2(
image.decode(sys.getfilesystemencoding(),'ignore') ,
file_path.decode(sys.getfilesystemencoding(),'ignore') )
self.launchers[launcherID]["fanart"] = file_path
@@ -1107,7 +1131,9 @@ class Main:
info = 'None'
subprocess_hack.Popen(r'%s %s' %
(launcher["application"], arguments), cwd=apppath, startupinfo=info)
elif (sys.platform.startswith('linux')):
+ xbmc.executebuiltin('LIRC.stop')
os.system("\"%s\" %s " % (launcher["application"],
arguments))
+ xbmc.executebuiltin('LIRC.start')
elif (sys.platform.startswith('darwin')):
os.system("\"%s\" %s " % (launcher["application"],
arguments))
else:
@@ -1265,7 +1291,9 @@ class Main:
info = 'None'
subprocess_hack.Popen(r'%s %s' %
(launcher["application"], arguments), cwd=apppath, startupinfo=info)
elif (sys.platform.startswith('linux')):
+ xbmc.executebuiltin('LIRC.stop')
os.system("\"%s\" %s " % (launcher["application"],
arguments))
+ xbmc.executebuiltin('LIRC.start')
elif (sys.platform.startswith('darwin')):
os.system("\"%s\" %s " % (launcher["application"],
arguments))
else:
@@ -2238,10 +2266,6 @@ def clean_filename(title):
def _get_SID():
t1 = time.time()
t2 = t1 + random.getrandbits(32)
- # Code for XBMC Eden & Dharma
- #try: base = hashlib.md5( str(t1 +t2) )
- #except: base = md5.new( str(t1 +t2) )
- # Code for XBMC Eden only
base = md5.new( str(t1 +t2) )
sid = base.hexdigest()
return sid
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.radio_de/addon.py | 2 +-
plugin.audio.radio_de/addon.xml | 2 +-
plugin.audio.radio_de/changelog.txt | 5 ++
plugin.program.advanced.launcher/addon.py | 2 +-
plugin.program.advanced.launcher/addon.xml | 4 +-
plugin.program.advanced.launcher/changelog.txt | 10 +++-
.../resources/language/English/strings.xml | 6 +-
.../resources/language/French/strings.xml | 6 +-
.../resources/lib/launcher_plugin.py | 74 +++++++++++++-------
9 files changed, 74 insertions(+), 37 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
