The branch, eden-pre has been updated
via 34318e34b796ae60eb582a5beb51980f1ffb3448 (commit)
via 536d669a53a335e09907027551d07dc82ad008db (commit)
from dad800c0783aa6d87ac2bda7414c756445f6d6f0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=34318e34b796ae60eb582a5beb51980f1ffb3448
commit 34318e34b796ae60eb582a5beb51980f1ffb3448
Author: spiff <[email protected]>
Date: Mon Feb 6 10:36:34 2012 +0100
[plugin.program.advanced.launcher] updated to version 1.7.6
diff --git a/plugin.program.advanced.launcher/addon.py
b/plugin.program.advanced.launcher/addon.py
index d3a05d8..752f387 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.5"
+__version__ = "1.7.6"
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 a908a09..62e5e4a 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.5" provider-name="Angelscry">
+<addon id="plugin.program.advanced.launcher" name="Advanced Launcher"
version="1.7.6" 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>XBMC Eden only</disclaimer>
+ <disclaimer>Only For XBMC Eden</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 2c8662f..7426b4e 100644
--- a/plugin.program.advanced.launcher/changelog.txt
+++ b/plugin.program.advanced.launcher/changelog.txt
@@ -1,4 +1,11 @@
-[B]1.7.5/B]
+[B]1.7.6/B]
+. Fix recursive thumb/fanart images scrap/save.
+. Fix recursive thumb/fanart images local import.
+. Fix bug when NFO file do not exist.
+. Create platform bonding between launcher and related items.
+. Remove modify platform option for items.
+
+[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).
diff --git a/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
b/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
index 6cf8052..8bc73db 100644
--- a/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
+++ b/plugin.program.advanced.launcher/resources/lib/launcher_plugin.py
@@ -238,7 +238,7 @@ class Main:
if (type == 1 ):
dialog = xbmcgui.Dialog()
- type2 = dialog.select(__language__( 30305 ), [__language__( 30311
) % self.settings[ "datas_scraper" ],__language__( 30333 ),__language__( 30306
) % self.launchers[launcher]["roms"][rom]["name"],__language__( 30307 ) %
self.launchers[launcher]["roms"][rom]["gamesys"],__language__( 30308 ) %
self.launchers[launcher]["roms"][rom]["release"],__language__( 30309 ) %
self.launchers[launcher]["roms"][rom]["studio"],__language__( 30310 ) %
self.launchers[launcher]["roms"][rom]["genre"],__language__( 30328 ) %
self.launchers[launcher]["roms"][rom]["plot"][0:20],__language__( 30316 )])
+ type2 = dialog.select(__language__( 30305 ), [__language__( 30311
) % self.settings[ "datas_scraper" ],__language__( 30333 ),__language__( 30306
) % self.launchers[launcher]["roms"][rom]["name"],__language__( 30308 ) %
self.launchers[launcher]["roms"][rom]["release"],__language__( 30309 ) %
self.launchers[launcher]["roms"][rom]["studio"],__language__( 30310 ) %
self.launchers[launcher]["roms"][rom]["genre"],__language__( 30328 ) %
self.launchers[launcher]["roms"][rom]["plot"][0:20],__language__( 30316 )])
# Scrap rom Infos
if (type2 == 0 ):
self._scrap_rom(launcher,rom)
@@ -255,35 +255,27 @@ class Main:
self.launchers[launcher]["roms"][rom]["name"] =
title.replace(",","â").replace('"',"''").replace("/"," â ").rstrip()
self._save_launchers()
if (type2 == 3 ):
- # Selection of the rom game system
- dialog = xbmcgui.Dialog()
- platforms = _get_game_system_list()
- gamesystem = dialog.select(__language__( 30077 ), platforms)
- if (not gamesystem == -1 ):
- self.launchers[launcher]["roms"][rom]["gamesys"] =
platforms[gamesystem]
- self._save_launchers()
- if (type2 == 4 ):
# Edition of the rom release date
keyboard =
xbmc.Keyboard(self.launchers[launcher]["roms"][rom]["release"], __language__(
30038 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
self.launchers[launcher]["roms"][rom]["release"] =
keyboard.getText()
self._save_launchers()
- if (type2 == 5 ):
+ if (type2 == 4 ):
# Edition of the rom studio name
keyboard =
xbmc.Keyboard(self.launchers[launcher]["roms"][rom]["studio"], __language__(
30039 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
self.launchers[launcher]["roms"][rom]["studio"] =
keyboard.getText()
self._save_launchers()
- if (type2 == 6 ):
+ if (type2 == 5 ):
# Edition of the rom game genre
keyboard =
xbmc.Keyboard(self.launchers[launcher]["roms"][rom]["genre"], __language__(
30040 ))
keyboard.doModal()
if (keyboard.isConfirmed()):
self.launchers[launcher]["roms"][rom]["genre"] =
keyboard.getText()
self._save_launchers()
- if (type2 == 7 ):
+ if (type2 == 6 ):
# Import of the rom game plot
text_file = xbmcgui.Dialog().browse(1,__language__( 30080
),"files",".txt|.dat", False, False)
if (os.path.isfile(text_file)):
@@ -292,7 +284,7 @@ class Main:
text_plot.close()
self.launchers[launcher]["roms"][rom]["plot"] =
string_plot.replace('"','"')
self._save_launchers()
- if (type2 == 8 ):
+ if (type2 == 7 ):
self._export_rom_nfo(launcher,rom)
if (type == 2 ):
@@ -312,9 +304,15 @@ 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'+os.path.splitext(image)[-1])))
+ if (self.launchers[launcher]["thumbpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
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],
'_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],
os.path.splitext(image)[-1])))
+ if (self.launchers[launcher]["thumbpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
filename.replace("."+filename.split(".")[-1], 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],
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
@@ -351,9 +349,15 @@ 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'+os.path.splitext(image)[-1])))
+ if (self.launchers[launcher]["fanartpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
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],
'_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],
os.path.splitext(image)[-1])))
+ if (self.launchers[launcher]["fanartpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
filename.replace("."+filename.split(".")[-1], 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],
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
@@ -411,9 +415,15 @@ class Main:
if ( img_url != '' ):
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')))
+ if (self.launchers[launcher]["thumbpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
filename.replace("."+filename.split(".")[-1], '_thumb.jpg')
+ else:
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_thumb.jpg')))
else:
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'.jpg')))
+ if (self.launchers[launcher]["thumbpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
filename.replace("."+filename.split(".")[-1], '.jpg')
+ else:
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["thumbpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'.jpg')))
xbmc.executebuiltin("XBMC.Notification(%s,%s, 3000)" %
(__language__( 30000 ), __language__( 30069 )))
h = urllib.urlretrieve(img_url,file_path)
self.launchers[launcher]["roms"][rom]["thumb"] =
file_path
@@ -493,9 +503,15 @@ class Main:
if ( img_url != '' ):
filename =
self.launchers[launcher]["roms"][rom]["filename"]
if (self.launchers[launcher]["fanartpath"] ==
self.launchers[launcher]["thumbpath"] ):
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_fanart.jpg')))
+ if (self.launchers[launcher]["fanartpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
filename.replace("."+filename.split(".")[-1], '_fanart.jpg')
+ else:
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'_fanart.jpg')))
else:
- file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'.jpg')))
+ if (self.launchers[launcher]["fanartpath"] ==
self.launchers[launcher]["rompath"] ):
+ file_path =
filename.replace("."+filename.split(".")[-1], '.jpg')
+ else:
+ file_path =
os.path.join(os.path.dirname(self.launchers[launcher]["fanartpath"]),os.path.basename(filename.replace("."+filename.split(".")[-1],
'.jpg')))
xbmc.executebuiltin("XBMC.Notification(%s,%s, 3000)" %
(__language__( 30000 ), __language__( 30074 )))
h = urllib.urlretrieve(img_url,file_path)
self.launchers[launcher]["roms"][rom]["fanart"] =
file_path
@@ -1366,7 +1382,6 @@ class Main:
# replace low-9 quotation mark by comma
usock.write("\t\t\t\t<name>"+romdata["name"].replace("â",",")+"</name>\n")
usock.write("\t\t\t\t<filename>"+romdata["filename"]+"</filename>\n")
-
usock.write("\t\t\t\t<platform>"+romdata["gamesys"]+"</platform>\n")
usock.write("\t\t\t\t<thumb>"+romdata["thumb"]+"</thumb>\n")
usock.write("\t\t\t\t<fanart>"+romdata["fanart"]+"</fanart>\n")
usock.write("\t\t\t\t<custom>"+romdata["custom"]+"</custom>\n")
@@ -1461,7 +1476,6 @@ class Main:
romid = re.findall( "<id>(.*?)</id>", rom )
romname = re.findall( "<name>(.*?)</name>", rom )
romfilename = re.findall( "<filename>(.*?)</filename>", rom )
- romgamesys = re.findall( "<platform>(.*?)</platform>", rom )
romthumb = re.findall( "<thumb>(.*?)</thumb>", rom )
romfanart = re.findall( "<fanart>(.*?)</fanart>", rom )
romcustom = re.findall( "<custom>(.*?)</custom>", rom )
@@ -1469,6 +1483,7 @@ class Main:
romrelease = re.findall( "<release>(.*?)</release>", rom )
romstudio = re.findall( "<publisher>(.*?)</publisher>", rom )
romplot = re.findall( "<gameplot>(.*?)</gameplot>", rom )
+ romgamesys = gamesys
if len(romid) > 0 : romid = romid[0]
else:
@@ -1480,8 +1495,6 @@ class Main:
else: romname = "unknown"
if len(romfilename) > 0 : romfilename = romfilename[0]
else: romfilename = ""
- if len(romgamesys) > 0 : romgamesys = romgamesys[0]
- else: romgamesys = ""
if len(romthumb) > 0 : romthumb = romthumb[0]
else: romthumb = ""
if len(romfanart) > 0 : romfanart = romfanart[0]
@@ -1684,6 +1697,8 @@ class Main:
if len(item_genre) > 0 : romdata["genre"] =
item_genre[0]
if len(item_plot) > 0 : romdata["plot"] =
item_plot[0].replace('"','"')
ff.close()
+ else:
+ romdata["name"] = title_format(self,romname)
else:
if ( self.settings[ "datas_method" ] != "0" ):
romdata["name"]
= clean_filename(romname)
@@ -1730,15 +1745,27 @@ class Main:
ext2s = ['png', 'jpg', 'gif', 'jpeg', 'bmp', 'PNG',
'JPG', 'GIF', 'JPEG', 'BMP']
for ext2 in ext2s:
if ( thumb_path == fanart_path ):
- test_thumb = os.path.join(thumb_path,
f.replace('.'+ext, '_thumb.'+ext2))
- test_fanart = os.path.join(fanart_path,
f.replace('.'+ext, '_fanart.'+ext2))
+ if ( thumb_path == path ):
+ test_thumb = fullname.replace('.'+ext,
'_thumb.'+ext2)
+ else:
+ test_thumb = os.path.join(thumb_path,
f.replace('.'+ext, '_thumb.'+ext2))
+ if ( fanart_path == path ):
+ test_fanart = fullname.replace('.'+ext,
'_fanart.'+ext2)
+ else:
+ test_fanart = os.path.join(fanart_path,
f.replace('.'+ext, '_fanart.'+ext2))
if ( os.path.isfile(test_thumb) ):
thumb = test_thumb
if ( os.path.isfile(test_fanart) ):
fanart = test_fanart
else:
- test_thumb = os.path.join(thumb_path,
f.replace('.'+ext, '.'+ext2))
- test_fanart = os.path.join(fanart_path,
f.replace('.'+ext, '.'+ext2))
+ if ( thumb_path == path ):
+ test_thumb = fullname.replace('.'+ext,
'.'+ext2)
+ else:
+ test_thumb = os.path.join(thumb_path,
f.replace('.'+ext, '.'+ext2))
+ if ( fanart_path == path ):
+ test_fanart = fullname.replace('.'+ext,
'.'+ext2)
+ else:
+ test_fanart = os.path.join(fanart_path,
f.replace('.'+ext, '.'+ext2))
if ( os.path.isfile(test_thumb) ):
thumb = test_thumb
if ( os.path.isfile(test_fanart) ):
@@ -1751,10 +1778,16 @@ class Main:
if ( self.settings[ "overwrite_thumbs"] ) or (
thumb == "" ):
pDialog.update(filesCount * 100 / len(files),
__language__( 30065 ) % (f.replace("."+f.split(".")[-1],""),self.settings[
"thumbs_scraper" ].encode('utf-8','ignore')))
img_url=""
- if (thumb_path == fanart_path):
- thumb = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '_thumb.jpg'))
+ if (thumb_path == fanart_path):
+ if (thumb_path == path):
+ thumb =
fullname.replace("."+f.split(".")[-1], '_thumb.jpg')
+ else:
+ thumb = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '_thumb.jpg'))
else:
- thumb = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '.jpg'))
+ if (thumb_path == path):
+ thumb =
fullname.replace("."+f.split(".")[-1], '.jpg')
+ else:
+ thumb = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '.jpg'))
if ( app.lower().find('mame') > 0 ) or (
self.settings[ "thumbs_scraper" ] == 'MAMEWorld' ):
covers =
self._get_thumbnails_list(romdata["gamesys"],title,self.settings[ "game_region"
],self.settings[ "thumb_image_size" ])
else:
@@ -1795,9 +1828,15 @@ class Main:
pDialog.update(filesCount * 100 / len(files),
__language__( 30071 ) % (f.replace("."+f.split(".")[-1],""),self.settings[
"fanarts_scraper" ].encode('utf-8','ignore')))
img_url=""
if (fanart_path == thumb_path):
- fanart = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '_fanart.jpg'))
+ if (fanart_path == path):
+ fanart =
fullname.replace("."+f.split(".")[-1], '_fanart.jpg')
+ else:
+ fanart = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '_fanart.jpg'))
else:
- fanart = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '.jpg'))
+ if (fanart_path == path):
+ fanart =
fullname.replace("."+f.split(".")[-1], '.jpg')
+ else:
+ fanart = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '.jpg'))
if ( app.lower().find('mame') > 0 ) or (
self.settings[ "fanarts_scraper" ] == 'MAMEWorld' ):
covers =
self._get_fanarts_list(romdata["gamesys"],title,self.settings[
"fanart_image_size" ])
else:
@@ -1934,23 +1973,40 @@ class Main:
f = os.path.basename(romfile)
for ext2 in ext2s:
if (thumb_path == fanart_path) :
- if (os.path.isfile(os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '_thumb.'+ext2)))):
- romdata["thumb"] = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '_thumb.'+ext2))
+ if (thumb_path == rompath) :
+ if
(os.path.isfile(os.path.join(os.path.dirname(romfile),
f.replace("."+f.split(".")[-1], '_thumb.'+ext2)))):
+ romdata["thumb"] =
os.path.join(os.path.dirname(romfile), f.replace("."+f.split(".")[-1],
'_thumb.'+ext2))
+ else:
+ if (os.path.isfile(os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '_thumb.'+ext2)))):
+ romdata["thumb"] = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '_thumb.'+ext2))
else:
if (thumb_path == "") :
romdata["thumb"] =
os.path.join(os.path.dirname(romfile), f.replace("."+f.split(".")[-1],
'_thumb.jpg'))
else:
- if (os.path.isfile(os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '.'+ext2)))):
- romdata["thumb"] = os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '.'+ext2))
+ if (thumb_path == rompath) :
+ if
(os.path.isfile(os.path.join(os.path.dirname(romfile),
f.replace("."+f.split(".")[-1], '.'+ext2)))):
+ romdata["thumb"] =
os.path.join(os.path.dirname(romfile), f.replace("."+f.split(".")[-1],
'.'+ext2))
+ else:
+ if (os.path.isfile(os.path.join(thumb_path,
f.replace("."+f.split(".")[-1], '.'+ext2)))):
+ romdata["thumb"] =
os.path.join(thumb_path, f.replace("."+f.split(".")[-1], '.'+ext2))
+
if (fanart_path == thumb_path) :
- if (os.path.isfile(os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '_fanart.'+ext2)))):
- romdata["fanart"] = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '_fanart.'+ext2))
+ if (fanart_path == rompath) :
+ if
(os.path.isfile(os.path.join(os.path.dirname(romfile),
f.replace("."+f.split(".")[-1], '_fanart.'+ext2)))):
+ romdata["fanart"] =
os.path.join(os.path.dirname(romfile), f.replace("."+f.split(".")[-1],
'_fanart.'+ext2))
+ else:
+ if (os.path.isfile(os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '_fanart.'+ext2)))):
+ romdata["fanart"] = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '_fanart.'+ext2))
else:
if (fanart_path == "") :
- romdata["fanart"] =
os.path.join(os.path.dirname(rompath), f.replace("."+f.split(".")[-1],
'_fanart.jpg'))
+ romdata["fanart"] =
os.path.join(os.path.dirname(romfile), f.replace("."+f.split(".")[-1],
'_fanart.jpg'))
else:
- if (os.path.isfile(os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '.'+ext2)))):
- romdata["fanart"] = os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '.'+ext2))
+ if (fanart_path == rompath) :
+ if
(os.path.isfile(os.path.join(os.path.dirname(romfile),
f.replace("."+f.split(".")[-1], '.'+ext2)))):
+ romdata["fanart"] =
os.path.join(os.path.dirname(romfile), f.replace("."+f.split(".")[-1],
'.'+ext2))
+ else:
+ if (os.path.isfile(os.path.join(fanart_path,
f.replace("."+f.split(".")[-1], '.'+ext2)))):
+ romdata["fanart"] =
os.path.join(fanart_path, f.replace("."+f.split(".")[-1], '.'+ext2))
romdata["custom"] = custom_path
romdata["genre"] = ""
romdata["release"] = ""
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=536d669a53a335e09907027551d07dc82ad008db
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
plugin.image.picasa/addon.py | 127 +
plugin.image.picasa/addon.xml | 23 +
plugin.image.picasa/atom/__init__.py | 1484 ++++++
plugin.image.picasa/atom/auth.py | 43 +
plugin.image.picasa/atom/client.py | 182 +
plugin.image.picasa/atom/core.py | 545 ++
plugin.image.picasa/atom/data.py | 340 ++
plugin.image.picasa/atom/http.py | 318 ++
plugin.image.picasa/atom/http_core.py | 597 +++
plugin.image.picasa/atom/http_interface.py | 156 +
plugin.image.picasa/atom/mock_http.py | 132 +
plugin.image.picasa/atom/mock_http_core.py | 323 ++
plugin.image.picasa/atom/mock_service.py | 243 +
plugin.image.picasa/atom/service.py | 740 +++
plugin.image.picasa/atom/token_store.py | 117 +
plugin.image.picasa/atom/url.py | 139 +
plugin.image.picasa/changelog.txt | 42 +
plugin.image.picasa/default.py | 363 ++
plugin.image.picasa/gdata/__init__.py | 835 +++
plugin.image.picasa/gdata/apps_property.py | 39 +
plugin.image.picasa/gdata/auth.py | 952 ++++
plugin.image.picasa/gdata/client.py | 1126 ++++
plugin.image.picasa/gdata/core.py | 279 +
plugin.image.picasa/gdata/data.py | 1186 +++++
plugin.image.picasa/gdata/exif/__init__.py | 217 +
plugin.image.picasa/gdata/gauth.py | 1306 +++++
plugin.image.picasa/gdata/geo/__init__.py | 185 +
plugin.image.picasa/gdata/geo/data.py | 92 +
plugin.image.picasa/gdata/media/__init__.py | 355 ++
plugin.image.picasa/gdata/media/data.py | 159 +
plugin.image.picasa/gdata/oauth/CHANGES.txt | 17 +
plugin.image.picasa/gdata/oauth/__init__.py | 529 ++
plugin.image.picasa/gdata/oauth/rsa.py | 120 +
plugin.image.picasa/gdata/photos/__init__.py | 1112 ++++
plugin.image.picasa/gdata/photos/service.py | 680 +++
plugin.image.picasa/gdata/sample_util.py | 269 +
plugin.image.picasa/gdata/service.py | 1718 ++++++
plugin.image.picasa/gdata/test_config.py | 421 ++
plugin.image.picasa/gdata/test_data.py | 5495 ++++++++++++++++++++
plugin.image.picasa/gdata/tlslite/BaseDB.py | 120 +
plugin.image.picasa/gdata/tlslite/Checker.py | 146 +
plugin.image.picasa/gdata/tlslite/FileObject.py | 220 +
.../gdata/tlslite/HandshakeSettings.py | 159 +
plugin.image.picasa/gdata/tlslite/Session.py | 131 +
plugin.image.picasa/gdata/tlslite/SessionCache.py | 103 +
plugin.image.picasa/gdata/tlslite/SharedKeyDB.py | 58 +
plugin.image.picasa/gdata/tlslite/TLSConnection.py | 1600 ++++++
.../gdata/tlslite/TLSRecordLayer.py | 1123 ++++
plugin.image.picasa/gdata/tlslite/VerifierDB.py | 90 +
plugin.image.picasa/gdata/tlslite/X509.py | 133 +
plugin.image.picasa/gdata/tlslite/X509CertChain.py | 181 +
plugin.image.picasa/gdata/tlslite/__init__.py | 39 +
plugin.image.picasa/gdata/tlslite/api.py | 75 +
plugin.image.picasa/gdata/tlslite/constants.py | 225 +
plugin.image.picasa/gdata/tlslite/errors.py | 149 +
.../gdata/tlslite/integration/AsyncStateMachine.py | 235 +
.../gdata/tlslite/integration/ClientHelper.py | 163 +
.../gdata/tlslite/integration/HTTPTLSConnection.py | 169 +
.../gdata/tlslite/integration/IMAP4_TLS.py | 132 +
.../gdata/tlslite/integration/IntegrationHelper.py | 52 +
.../gdata/tlslite/integration/POP3_TLS.py | 142 +
.../gdata/tlslite/integration/SMTP_TLS.py | 114 +
.../tlslite/integration/TLSAsyncDispatcherMixIn.py | 139 +
.../tlslite/integration/TLSSocketServerMixIn.py | 59 +
.../integration/TLSTwistedProtocolWrapper.py | 196 +
.../gdata/tlslite/integration/XMLRPCTransport.py | 137 +
.../gdata/tlslite/integration/__init__.py | 17 +
plugin.image.picasa/gdata/tlslite/mathtls.py | 170 +
plugin.image.picasa/gdata/tlslite/messages.py | 561 ++
plugin.image.picasa/gdata/tlslite/utils/AES.py | 31 +
.../gdata/tlslite/utils/ASN1Parser.py | 34 +
.../gdata/tlslite/utils/Cryptlib_AES.py | 34 +
.../gdata/tlslite/utils/Cryptlib_RC4.py | 28 +
.../gdata/tlslite/utils/Cryptlib_TripleDES.py | 35 +
.../gdata/tlslite/utils/OpenSSL_AES.py | 49 +
.../gdata/tlslite/utils/OpenSSL_RC4.py | 25 +
.../gdata/tlslite/utils/OpenSSL_RSAKey.py | 148 +
.../gdata/tlslite/utils/OpenSSL_TripleDES.py | 44 +
.../gdata/tlslite/utils/PyCrypto_AES.py | 22 +
.../gdata/tlslite/utils/PyCrypto_RC4.py | 22 +
.../gdata/tlslite/utils/PyCrypto_RSAKey.py | 61 +
.../gdata/tlslite/utils/PyCrypto_TripleDES.py | 22 +
.../gdata/tlslite/utils/Python_AES.py | 68 +
.../gdata/tlslite/utils/Python_RC4.py | 39 +
.../gdata/tlslite/utils/Python_RSAKey.py | 209 +
plugin.image.picasa/gdata/tlslite/utils/RC4.py | 17 +
plugin.image.picasa/gdata/tlslite/utils/RSAKey.py | 264 +
.../gdata/tlslite/utils/TripleDES.py | 26 +
.../gdata/tlslite/utils/__init__.py | 31 +
.../gdata/tlslite/utils/cipherfactory.py | 111 +
plugin.image.picasa/gdata/tlslite/utils/codec.py | 94 +
plugin.image.picasa/gdata/tlslite/utils/compat.py | 140 +
.../gdata/tlslite/utils/cryptomath.py | 404 ++
.../gdata/tlslite/utils/dateFuncs.py | 75 +
plugin.image.picasa/gdata/tlslite/utils/entropy.c | 173 +
plugin.image.picasa/gdata/tlslite/utils/hmac.py | 104 +
.../gdata/tlslite/utils/jython_compat.py | 195 +
.../gdata/tlslite/utils/keyfactory.py | 243 +
.../gdata/tlslite/utils/rijndael.py | 392 ++
.../gdata/tlslite/utils/win32prng.c | 63 +
.../gdata/tlslite/utils/xmltools.py | 202 +
plugin.image.picasa/gdata/urlfetch.py | 247 +
plugin.image.picasa/icon.png | Bin 0 -> 26741 bytes
plugin.image.picasa/maps.py | 102 +
plugin.image.picasa/resources/images/albums.png | Bin 0 -> 30611 bytes
plugin.image.picasa/resources/images/contacts.png | Bin 0 -> 47483 bytes
.../resources/images/next.png | Bin 19006 -> 19006 bytes
.../resources/images/previous.png | Bin 19199 -> 19199 bytes
plugin.image.picasa/resources/images/search.png | Bin 0 -> 52058 bytes
.../resources/images/search_picasa.png | Bin 0 -> 43414 bytes
plugin.image.picasa/resources/images/tags.png | Bin 0 -> 46950 bytes
.../resources/language/Dutch/strings.xml | 34 +
.../resources/language/English/strings.xml | 45 +
plugin.image.picasa/resources/settings.xml | 14 +
plugin.program.advanced.launcher/addon.py | 2 +-
plugin.program.advanced.launcher/addon.xml | 4 +-
plugin.program.advanced.launcher/changelog.txt | 9 +-
.../resources/lib/launcher_plugin.py | 142 +-
119 files changed, 33801 insertions(+), 47 deletions(-)
copy {plugin.audio.abradio.cz => plugin.image.picasa}/LICENSE.txt (100%)
create mode 100644 plugin.image.picasa/addon.py
create mode 100644 plugin.image.picasa/addon.xml
create mode 100755 plugin.image.picasa/atom/__init__.py
create mode 100644 plugin.image.picasa/atom/auth.py
create mode 100755 plugin.image.picasa/atom/client.py
create mode 100644 plugin.image.picasa/atom/core.py
create mode 100644 plugin.image.picasa/atom/data.py
create mode 100644 plugin.image.picasa/atom/http.py
create mode 100644 plugin.image.picasa/atom/http_core.py
create mode 100644 plugin.image.picasa/atom/http_interface.py
create mode 100644 plugin.image.picasa/atom/mock_http.py
create mode 100644 plugin.image.picasa/atom/mock_http_core.py
create mode 100755 plugin.image.picasa/atom/mock_service.py
create mode 100755 plugin.image.picasa/atom/service.py
create mode 100644 plugin.image.picasa/atom/token_store.py
create mode 100644 plugin.image.picasa/atom/url.py
create mode 100644 plugin.image.picasa/changelog.txt
create mode 100644 plugin.image.picasa/default.py
create mode 100755 plugin.image.picasa/gdata/__init__.py
create mode 100644 plugin.image.picasa/gdata/apps_property.py
create mode 100644 plugin.image.picasa/gdata/auth.py
create mode 100644 plugin.image.picasa/gdata/client.py
create mode 100644 plugin.image.picasa/gdata/core.py
create mode 100644 plugin.image.picasa/gdata/data.py
create mode 100644 plugin.image.picasa/gdata/exif/__init__.py
create mode 100644 plugin.image.picasa/gdata/gauth.py
create mode 100644 plugin.image.picasa/gdata/geo/__init__.py
create mode 100644 plugin.image.picasa/gdata/geo/data.py
create mode 100644 plugin.image.picasa/gdata/media/__init__.py
create mode 100644 plugin.image.picasa/gdata/media/data.py
create mode 100755 plugin.image.picasa/gdata/oauth/CHANGES.txt
create mode 100755 plugin.image.picasa/gdata/oauth/__init__.py
create mode 100755 plugin.image.picasa/gdata/oauth/rsa.py
create mode 100644 plugin.image.picasa/gdata/photos/__init__.py
create mode 100755 plugin.image.picasa/gdata/photos/service.py
create mode 100644 plugin.image.picasa/gdata/sample_util.py
create mode 100755 plugin.image.picasa/gdata/service.py
create mode 100644 plugin.image.picasa/gdata/test_config.py
create mode 100755 plugin.image.picasa/gdata/test_data.py
create mode 100755 plugin.image.picasa/gdata/tlslite/BaseDB.py
create mode 100755 plugin.image.picasa/gdata/tlslite/Checker.py
create mode 100755 plugin.image.picasa/gdata/tlslite/FileObject.py
create mode 100755 plugin.image.picasa/gdata/tlslite/HandshakeSettings.py
create mode 100755 plugin.image.picasa/gdata/tlslite/Session.py
create mode 100755 plugin.image.picasa/gdata/tlslite/SessionCache.py
create mode 100755 plugin.image.picasa/gdata/tlslite/SharedKeyDB.py
create mode 100755 plugin.image.picasa/gdata/tlslite/TLSConnection.py
create mode 100755 plugin.image.picasa/gdata/tlslite/TLSRecordLayer.py
create mode 100755 plugin.image.picasa/gdata/tlslite/VerifierDB.py
create mode 100755 plugin.image.picasa/gdata/tlslite/X509.py
create mode 100755 plugin.image.picasa/gdata/tlslite/X509CertChain.py
create mode 100755 plugin.image.picasa/gdata/tlslite/__init__.py
create mode 100755 plugin.image.picasa/gdata/tlslite/api.py
create mode 100755 plugin.image.picasa/gdata/tlslite/constants.py
create mode 100755 plugin.image.picasa/gdata/tlslite/errors.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/AsyncStateMachine.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/ClientHelper.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/HTTPTLSConnection.py
create mode 100755 plugin.image.picasa/gdata/tlslite/integration/IMAP4_TLS.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/IntegrationHelper.py
create mode 100755 plugin.image.picasa/gdata/tlslite/integration/POP3_TLS.py
create mode 100755 plugin.image.picasa/gdata/tlslite/integration/SMTP_TLS.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/TLSAsyncDispatcherMixIn.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/TLSSocketServerMixIn.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/TLSTwistedProtocolWrapper.py
create mode 100755
plugin.image.picasa/gdata/tlslite/integration/XMLRPCTransport.py
create mode 100755 plugin.image.picasa/gdata/tlslite/integration/__init__.py
create mode 100755 plugin.image.picasa/gdata/tlslite/mathtls.py
create mode 100755 plugin.image.picasa/gdata/tlslite/messages.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/AES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/ASN1Parser.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/Cryptlib_AES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/Cryptlib_RC4.py
create mode 100755
plugin.image.picasa/gdata/tlslite/utils/Cryptlib_TripleDES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/OpenSSL_AES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/OpenSSL_RC4.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/OpenSSL_RSAKey.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/OpenSSL_TripleDES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/PyCrypto_AES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/PyCrypto_RC4.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/PyCrypto_RSAKey.py
create mode 100755
plugin.image.picasa/gdata/tlslite/utils/PyCrypto_TripleDES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/Python_AES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/Python_RC4.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/Python_RSAKey.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/RC4.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/RSAKey.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/TripleDES.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/__init__.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/cipherfactory.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/codec.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/compat.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/cryptomath.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/dateFuncs.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/entropy.c
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/hmac.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/jython_compat.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/keyfactory.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/rijndael.py
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/win32prng.c
create mode 100755 plugin.image.picasa/gdata/tlslite/utils/xmltools.py
create mode 100644 plugin.image.picasa/gdata/urlfetch.py
create mode 100644 plugin.image.picasa/icon.png
create mode 100644 plugin.image.picasa/maps.py
create mode 100644 plugin.image.picasa/resources/images/albums.png
create mode 100644 plugin.image.picasa/resources/images/contacts.png
copy {plugin.image.flickr => plugin.image.picasa}/resources/images/next.png
(100%)
copy {plugin.image.flickr =>
plugin.image.picasa}/resources/images/previous.png (100%)
create mode 100644 plugin.image.picasa/resources/images/search.png
create mode 100644 plugin.image.picasa/resources/images/search_picasa.png
create mode 100644 plugin.image.picasa/resources/images/tags.png
create mode 100644 plugin.image.picasa/resources/language/Dutch/strings.xml
create mode 100644 plugin.image.picasa/resources/language/English/strings.xml
create mode 100644 plugin.image.picasa/resources/settings.xml
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
