The branch, eden-pre has been updated
via 882c27ce172f096a08c95e7803fb52bdd958d476 (commit)
from 5d657dfa199b930dc705ed996afb672b40d0f9e9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=882c27ce172f096a08c95e7803fb52bdd958d476
commit 882c27ce172f096a08c95e7803fb52bdd958d476
Author: amet <[email protected]>
Date: Sat May 28 22:49:12 2011 +0400
[script.xbmc.subtitles] -v 2.9.9
- fixed: typo that was crashing on streamed videos, thx Araluccl0 for
making me look at this :)
- added: set sub_stream folder as subtitle download location for streamed
content
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 1b31038..657071a 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.8"
+ version="2.9.9"
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 b6b918c..a66354c 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,5 +1,9 @@
+2.9.9
+- fixed: typo that was crashing on streamed videos, thx Araluccl0 for making
me look at this :)
+- added: set sub_stream folder as subtitle download location for streamed
content
+
2.9.8
-- fixed Podnapisi search
+- fixed: Podnapisi search
2.9.7
- fixed: non-Hebrew subtitles in Subscenter, thanks Ori Varon
diff --git a/script.xbmc.subtitles/resources/lib/gui.py
b/script.xbmc.subtitles/resources/lib/gui.py
index 85cf594..59703d0 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -56,12 +56,18 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.language_2 = languageTranslate(__settings__.getSetting( "Lang02"
), 4, 0) # Full language 2
self.language_3 = languageTranslate(__settings__.getSetting( "Lang03"
), 4, 0) # Full language 3
self.tmp_sub_dir = os.path.join( __profile__ ,"sub_tmp" )
# Temporary subtitle extraction directory
+ self.stream_sub_dir = os.path.join( __profile__ ,"sub_stream" )
# Stream subtitle directory
def_movie_service = __settings__.getSetting( "defmovieservice")
# Default Movie service
def_tv_service = __settings__.getSetting( "deftvservice")
# Default TV Show service
self.getControl( 111 ).setVisible( False )
# check for existing subtitles and set to "True" if found
if (movieFullPath.find("http://";) > -1 ):
+ if not xbmcvfs.exists(self.stream_sub_dir):
+ os.makedirs(self.stream_sub_dir)
+ else:
+ self.rem_files(self.stream_sub_dir)
+ self.sub_folder = self.stream_sub_dir
self.temp = True
elif (movieFullPath.find("rar://") > -1 ):
@@ -80,7 +86,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
if len(self.sub_folder) < 1 :
self.sub_folder = os.path.dirname( movieFullPath )
- if path and not self.rar:
+ if path and not self.rar and not self.temp:
if self.sub_folder.find("smb://") > -1:
if self.temp:
dialog = xbmcgui.Dialog()
diff --git
a/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/service.py
b/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/service.py
index 38d267b..0531457 100644
--- a/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/service.py
@@ -28,16 +28,16 @@ def search_subtitles( file_original_path, title, tvshow,
year, season, episode,
if set_temp :
hash_search = False
- file_size = "000000000"
- hashTry = "000000000000"
+ file_size = "000000000"
+ SubHash = "000000000000"
else:
try:
file_size, SubHash = xbmc.subHashAndFileSize(file_original_path)
log( __name__ ,"xbmc module hash and size")
hash_search = True
except:
- file_size = ""
- SubHash = ""
+ file_size = ""
+ SubHash = ""
hash_search = False
if file_size != "" and SubHash != "":
diff --git a/script.xbmc.subtitles/resources/lib/services/Podnapisi/service.py
b/script.xbmc.subtitles/resources/lib/services/Podnapisi/service.py
index 0138d22..26afbbe 100644
--- a/script.xbmc.subtitles/resources/lib/services/Podnapisi/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Podnapisi/service.py
@@ -24,16 +24,16 @@ def search_subtitles( file_original_path, title, tvshow,
year, season, episode,
language3 = languageTranslate(lang3,0,1)
if set_temp :
hash_search = False
- file_size = "000000000"
- hashTry = "000000000000"
+ file_size = "000000000"
+ SubHash = "000000000000"
else:
try:
file_size, SubHash = xbmc.subHashAndFileSize(file_original_path)
log( __name__ ,"xbmc module hash and size")
hash_search = True
except:
- file_size = ""
- SubHash = ""
+ file_size = ""
+ SubHash = ""
hash_search = False
if file_size != "" and SubHash != "":
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 6 +++++-
script.xbmc.subtitles/resources/lib/gui.py | 8 +++++++-
.../lib/services/OpenSubtitles/service.py | 8 ++++----
.../resources/lib/services/Podnapisi/service.py | 8 ++++----
5 files changed, 21 insertions(+), 11 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
