The branch, eden-pre has been updated
via 334685c33c772f4c3887db210e6fe435537c5be7 (commit)
from d1bf1a36d3dd6c8f5ffb2e37c2cde19901e20267 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=334685c33c772f4c3887db210e6fe435537c5be7
commit 334685c33c772f4c3887db210e6fe435537c5be7
Author: amet <[email protected]>
Date: Thu Jul 14 23:26:45 2011 +0200
[script.xbmc.subtitles] -v2.9.16
- fix: detecting of existing subs will crash the script if on SMB://
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 5478026..8c6081a 100644
--- 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="2.9.15"
+ version="2.9.16"
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 a8ea0a9..8b88fde 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,6 @@
+2.9.16
+- fix: detecting of existing subs will crash the script if on SMB://
+
2.9.15
- fix: titulky.com service
- fix: issues with auto search
diff --git a/script.xbmc.subtitles/resources/lib/gui.py
b/script.xbmc.subtitles/resources/lib/gui.py
index 67c054e..f1e9237 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -35,7 +35,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.on_run()
def on_run( self ):
- if not checkExistingSubs( self.sub_folder, self.file_original_path ):
+ if not checkExistingSubs( self.sub_folder, self.file_original_path,
self.language_1, self.language_2, self.language_3 ):
self.getControl( 111 ).setVisible( False )
try:
self.list_services()
diff --git a/script.xbmc.subtitles/resources/lib/utilities.py
b/script.xbmc.subtitles/resources/lib/utilities.py
index 7271de1..f00a73b 100644
--- a/script.xbmc.subtitles/resources/lib/utilities.py
+++ b/script.xbmc.subtitles/resources/lib/utilities.py
@@ -188,12 +188,18 @@ def copy_files( subtitle_file, file_path ):
return subtitle_set, file_path
-def checkExistingSubs( subFolder, videoFile ):
+def checkExistingSubs( subFolder, videoFile, lang1, lang2, lang3 ):
sub_exts = [".srt", ".sub", ".txt", ".smi", ".ssa", ".ass" ]
- list_files = os.listdir(subFolder)
- file_name = os.path.splitext( os.path.basename( videoFile ) )[0]
- for file in list_files:
- if (os.path.splitext( file )[1] in sub_exts) and
(file.startswith(file_name)):
- return True
-
+ try:
+ list_files = os.listdir(subFolder)
+ file_name = os.path.splitext( os.path.basename( videoFile ) )[0]
+ for file in list_files:
+ if (os.path.splitext( file )[1] in sub_exts) and
(file.startswith(file_name)):
+ return True
+ except:
+ for i in range(3):
+ for sub_ext in sub_exts:
+ exec("lang = languageTranslate(lang%s, 0, 2)" % (str(i+1)) )
+ if xbmcvfs.exists("%s.%s%s" %
(os.path.join(subFolder,os.path.splitext( os.path.basename( videoFile )
)[0]),lang ,sub_ext,)):
+ return True
return False
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 3 +++
script.xbmc.subtitles/resources/lib/gui.py | 2 +-
script.xbmc.subtitles/resources/lib/utilities.py | 20 +++++++++++++-------
4 files changed, 18 insertions(+), 9 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
