The branch, eden has been updated
via b536d91fb4c1482a44c6248d1121fe9be4adc996 (commit)
from 52a6ec7b2f4bc7d8713776133dc131c7a6019029 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=b536d91fb4c1482a44c6248d1121fe9be4adc996
commit b536d91fb4c1482a44c6248d1121fe9be4adc996
Author: amet <[email protected]>
Date: Wed Oct 3 23:06:56 2012 +0400
[script.xbmc.subtitles] -v3.3.3
- [fix] safe streaming subtitle name
- xbmc.validatePath() should fix activating subs in some windows cases, thx
WiSo and Martijn
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 9388a75..f33dd25 100755
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.xbmc.subtitles"
name="XBMC Subtitles"
- version="3.3.2"
+ version="3.3.3"
provider-name="amet, mr_blobby">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt
b/script.xbmc.subtitles/changelog.txt
index 3eaeabd..fc79037 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,7 @@
+3.3.3
+- [fix] safe streaming subtitle name
+- xbmc.validatePath() should fix activating subs in some windows cases, thx
WiSo and Martijn
+
3.3.2
- use OpenSubtitles XMLRPC for downloading subs if possible
- fixed Napysy24 subs download speed
diff --git a/script.xbmc.subtitles/resources/lib/gui.py
b/script.xbmc.subtitles/resources/lib/gui.py
index b12281e..1a6e127 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -312,13 +312,16 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.Extract_Subtitles(zip_subs,sub_lang, gui)
else:
sub_ext = os.path.splitext( file )[1]
- sub_name = os.path.splitext( os.path.basename( self.file_original_path )
)[0]
+ if self.temp:
+ sub_name = "temp_sub"
+ else:
+ sub_name = os.path.splitext( os.path.basename( self.file_original_path
) )[0]
if (__addon__.getSetting( "lang_to_end" ) == "true"):
file_name = u"%s.%s%s" % ( sub_name, sub_lang, sub_ext )
else:
file_name = u"%s%s" % ( sub_name, sub_ext )
file_from = file
- file_to = os.path.join(self.sub_folder, file_name)
+ file_to = xbmc.validatePath(os.path.join(self.sub_folder, file_name))
# Create a files list of from-to tuples so that multiple files may be
# copied (sub+idx etc')
files_list = [(file_from,file_to)]
@@ -427,8 +430,8 @@ class GUI( xbmcgui.WindowXMLDialog ):
file_name = u"%s%s" % ( name, os.path.splitext( zip_entry )[1] )
log( __name__ ,"Sub in Zip [%s], File Name [%s]" % (zip_entry,
file_name,))
- ret_zip_entry = os.path.join(self.tmp_sub_dir,zip_entry)
- ret_file_name = os.path.join(self.sub_folder,file_name)
+ ret_zip_entry = xbmc.validatePath(os.path.join(self.tmp_sub_dir,zip_entry))
+ ret_file_name = xbmc.validatePath(os.path.join(self.sub_folder,file_name))
return ret_zip_entry,ret_file_name
def list_services( self ):
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 4 ++++
script.xbmc.subtitles/resources/lib/gui.py | 11 +++++++----
3 files changed, 12 insertions(+), 5 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
