The branch, eden-pre has been updated
via 5db65e4c6b3f3399ad64b8ef23dfdc791818c06f (commit)
from 7e0e9bd0e6bd52c0402e37afca716b93bad29eef (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=5db65e4c6b3f3399ad64b8ef23dfdc791818c06f
commit 5db65e4c6b3f3399ad64b8ef23dfdc791818c06f
Author: amet <[email protected]>
Date: Tue Feb 21 10:21:03 2012 +0400
[script.xbmc.subtitles] -2.9.33
- fix: BetaSeries service and series with ' in it
- fix: Itasa year bug fixed
- fix: decode utf-8 paths to internal encoding otherwise the addon fails to
load on windows with non-ascii profile paths like G:\XBMC\Ãö. thx chadoe for
this
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 459467a..8b78b54 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="2.9.32"
+ version="2.9.33"
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 52bfbd0..0833d52 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,8 @@
+2.9.33
+- fix: BetaSeries service and series with ' in it
+- fix: Itasa year bug fixed
+- fix: decode utf-8 paths to internal encoding otherwise the addon fails to
load on windows with non-ascii profile paths like G:\XBMC\Ãö. thx chadoe for
this
+
2.9.32
- added: Chinese (Simple) localization , thanks taxigps
- added: new service , Shooter. thanks taxigps
diff --git a/script.xbmc.subtitles/default.py b/script.xbmc.subtitles/default.py
index cb810d4..f33dfc8 100644
--- a/script.xbmc.subtitles/default.py
+++ b/script.xbmc.subtitles/default.py
@@ -15,8 +15,8 @@ __cwd__ = __addon__.getAddonInfo('path')
__version__ = __addon__.getAddonInfo('version')
__language__ = __addon__.getLocalizedString
-__profile__ = xbmc.translatePath( __addon__.getAddonInfo('profile') )
-__resource__ = xbmc.translatePath( os.path.join( __cwd__, 'resources', 'lib'
) )
+__profile__ = xbmc.translatePath( __addon__.getAddonInfo('profile')
).decode("utf-8")
+__resource__ = xbmc.translatePath( os.path.join( __cwd__, 'resources', 'lib'
) ).decode("utf-8")
sys.path.append (__resource__)
diff --git a/script.xbmc.subtitles/resources/lib/gui.py
b/script.xbmc.subtitles/resources/lib/gui.py
index f946715..23fd775 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -54,7 +54,8 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.list = []
service_list = []
self.stackPath = []
- service = ""
+ service = ""
+ self.man_search_str = ""
self.newWindow = True
self.temp = False
self.rar = False
@@ -74,7 +75,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
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
- if ( movieFullPath.find("http://";) > -1 ):
+ if ( movieFullPath.find("http") > -1 ):
if not xbmcvfs.exists(self.stream_sub_dir):
os.makedirs(self.stream_sub_dir)
else:
@@ -435,11 +436,16 @@ class GUI( xbmcgui.WindowXMLDialog ):
def keyboard(self, parent):
dir, self.year = xbmc.getCleanMovieTitle(self.file_original_path,
self.parsearch)
if not parent:
- kb = xbmc.Keyboard("%s (%s)" % (dir,self.year,), _( 751 ), False)
+ if self.man_search_str != "":
+ srchstr = self.man_search_str
+ else:
+ srchstr = "%s (%s)" % (dir,self.year,)
+ kb = xbmc.Keyboard(srchstr, _( 751 ), False)
text = self.file_name
kb.doModal()
if (kb.isConfirmed()): text, self.year =
xbmc.getCleanMovieTitle(kb.getText())
self.title = text
+ self.man_search_str = text
else:
self.title = dir
diff --git a/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
b/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
index b14771f..f666d0a 100644
--- a/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
@@ -48,7 +48,7 @@ def getShortTV(title):
try:
# search TVDB's id from tvshow's title
- query = "select c12 from tvshow where c00 = '" + unicode(title) + "'
limit 1"
+ query = 'select c12 from tvshow where c00 = "' + unicode(title) + '"
limit 1'
res = xbmc.executehttpapi("queryvideodatabase(" + query + ")")
# get the result
diff --git a/script.xbmc.subtitles/resources/lib/services/Itasa/service.py
b/script.xbmc.subtitles/resources/lib/services/Itasa/service.py
index 4e07bdc..156bc7a 100644
--- a/script.xbmc.subtitles/resources/lib/services/Itasa/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Itasa/service.py
@@ -83,6 +83,10 @@ def search_subtitles( file_original_path, title, tvshow,
year, season, episode,
content= geturl(main_url +
'index.php?option=com_remository&Itemid=6')
if content is not None:
match = re.search(show_pattern % tvshow, content,
re.IGNORECASE | re.DOTALL)
+ if match is None and tvshow[-1] == ")":
+ log( __name__ ," Year Bug? '%s'" % tvshow)
+ tvshow = tvshow[:-7]
+ match = re.search(show_pattern % tvshow, content,
re.IGNORECASE | re.DOTALL)
if match:
log( __name__ ," Tv show '%s' found" % tvshow)
content= geturl(main_url + match.group(1))
diff --git a/script.xbmc.subtitles/resources/settings.xml
b/script.xbmc.subtitles/resources/settings.xml
index f2a2c57..07ad983 100644
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -6,52 +6,61 @@
<setting id="Lang03" type="enum" label="30111" default="11"
lvalues="30201|30202|30203|30204|30205|30206|30207|30208|30209|30210|30211|30212|30213|30247|30214|30215|30216|30217|30218|30219|30220|30221|30222|30224|30225|30226|30227|30228|30229|30230|30232|30233|30234|30235|30236|30237|30238|30239|30240|30242|30243|30244|30245|30246"
/>
</category>
<category label="30103">
- <setting id="Shooter" type="bool" label="Shooter.cn (Chinese and English
subs only)" default="false"/>
- <setting id="Sublight" type="bool" label="Sublight.si" default="false"/>
- <setting id="Podnapisi" type="bool" label="Podnapisi.net"
default="true"/>
- <setting id="PNuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30104" default=""/>
- <setting id="PNpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30105" default=""/>
- <setting id="OpenSubtitles" type="bool" label="OpenSubtitles.org"
default="true"/>
- <setting id="Subscene" type="bool" label="Subscene.com" default="false"/>
- <setting id="Undertexter" type="bool" label="Undertexter.se (Swedish and
English subs only)" default="false"/>
- <setting id="Ondertitel" type="bool" label="Ondertitel.com (Movies and
Dutch subs only)" default="false"/>
- <setting id="Bierdopje" type="bool" label="Bierdopje.com (TV Shows and
Dutch/English subs only)" default="false"/>
- <setting id="Napiprojekt" type="bool" label="Napiprojekt.pl
(Polish/English subs only)" default="false"/>
- <setting id="Napisy24pl" type="bool" label="Napisy24.pl (Mostly
Polish/English subs)" default="false"/>
- <setting id="Napisy24_type" type="enum"
lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)"
default="2" label="30140"/>
- <setting id="Napisyme" type="bool" label="Napisy.me (Mostly
Polish/English subs from napisy24.pl database)" default="false"/>
- <setting id="Napisyme_type" type="enum"
lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)"
default="2" label="30140"/>
- <setting id="LegendasTV" type="bool" label="Legendas.tv"
default="false"/>
- <setting id="LTVuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30123" default=""/>
- <setting id="LTVpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30124" default=""/>
- <setting id="Titlovi" type="bool" label="Titlovi.com" default="false"/>
- <setting id="Titulky" type="bool" label="Titulky.com (Czech and Slovak
subs only)" default="false"/>
- <setting id="Titulkyuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30128" default=""/>
- <setting id="Titulkypass" type="text" option ="hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30129" default=""/>
- <setting id="Subdivx" type="bool" label="Subdivx.com (Spanish subs
only)" default="false"/>
- <setting id="Swesub" type="bool" label="Swesub.nu" default="false"/>
+ <setting id="Argenteam" type="bool" label="Argenteam.net"
default="false"/>
+ <setting id="AsiaTeam" type="bool" label="Asia-Team.net"
default="false"/>
+
+ <setting id="BetaSeries" type="bool" label="betaseries.com"
default="false"/>
+ <setting id="Bierdopje" type="bool" label="Bierdopje.com (TV Shows and
Dutch/English subs only)" default="false"/>
+
<setting id="Itasa" type="bool" label="Itasa (Italiansubs.net, TV Shows
and Italian only)" default="false"/>
<setting id="ITuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30126" default=""/>
<setting id="ITpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30127" default=""/>
- <setting id="SubDB" type="bool" label="theSubDB.com" default="false"/>
- <setting id="BetaSeries" type="bool" label="betaseries.com"
default="false"/>
+
<setting id="LegendasDivx" type="bool" label="LegendasDivx.com"
default="false"/>
<setting id="LDivxuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30132" default=""/>
<setting id="LDivxpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30133" default=""/>
- <setting id="Argenteam" type="bool" label="Argenteam.net"
default="false"/>
+ <setting id="LegendasTV" type="bool" label="Legendas.tv"
default="false"/>
+ <setting id="LTVuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30123" default=""/>
+ <setting id="LTVpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30124" default=""/>
+ <setting id="LegendasZone" type="bool" label="Legendas-Zone.org"
default="false"/>
+ <setting id="LZuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30138" default=""/>
+ <setting id="LZpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30139" default=""/>
+
+ <setting id="Napiprojekt" type="bool" label="Napiprojekt.pl
(Polish/English subs only)" default="false"/>
+ <setting id="Napisy24pl" type="bool" label="Napisy24.pl (Mostly
Polish/English subs)" default="false"/>
+ <setting id="Napisy24_type" type="enum"
lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)"
default="2" label="30140"/>
+ <setting id="Napisyme" type="bool" label="Napisy.me (Mostly
Polish/English subs from napisy24.pl database)" default="false"/>
+ <setting id="Napisyme_type" type="enum"
lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)"
default="2" label="30140"/>
+
+ <setting id="OmniSubs" type="bool" label="OmniSubs.net" default="false"/>
+ <setting id="Omniuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30136" default=""/>
+ <setting id="Omnipass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30137" default=""/>
+ <setting id="Ondertitel" type="bool" label="Ondertitel.com (Movies and
Dutch subs only)" default="false"/>
+ <setting id="OpenSubtitles" type="bool" label="OpenSubtitles.org"
default="true"/>
+
+ <setting id="Podnapisi" type="bool" label="Podnapisi.net"
default="true"/>
+ <setting id="PNuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30104" default=""/>
+ <setting id="PNpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30105" default=""/>
<setting id="PTSubs" type="bool" label="PT-SUBS.NET" default="false"/>
<setting id="PTSuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30134" default=""/>
<setting id="PTSpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30135" default=""/>
- <setting id="OmniSubs" type="bool" label="OmniSubs.net" default="false"/>
- <setting id="Omniuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30136" default=""/>
- <setting id="Omnipass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30137" default=""/>
- <setting id="Subscenter" type="bool" label="Subscenter.org"
default="false"/>
- <setting id="AsiaTeam" type="bool" label="Asia-Team.net"
default="false"/>
+
+ <setting id="Shooter" type="bool" label="Shooter.cn (Chinese and English
subs only)" default="false"/>
<setting id="Sratim" type="bool" label="Sratim.co.il" default="false"/>
- <setting id="SuperSubtitles" type="bool" label="SuperSubtitles
(Feliratok.info)" default="false"/>
- <setting id="LegendasZone" type="bool" label="Legendas-Zone.org"
default="false"/>
- <setting id="LZuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30138" default=""/>
- <setting id="LZpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30139" default=""/>
+ <setting id="SubDB" type="bool" label="theSubDB.com" default="false"/>
+ <setting id="Subdivx" type="bool" label="Subdivx.com (Spanish subs
only)" default="false"/>
+ <setting id="Sublight" type="bool" label="Sublight.si" default="false"/>
+ <setting id="Subscene" type="bool" label="Subscene.com" default="false"/>
+ <setting id="Subscenter" type="bool" label="Subscenter.org"
default="false"/>
+ <setting id="SuperSubtitles" type="bool" label="SuperSubtitles
(Feliratok.info)" default="false"/>
+ <setting id="Swesub" type="bool" label="Swesub.nu" default="false"/>
+
+ <setting id="Titlovi" type="bool" label="Titlovi.com" default="false"/>
+ <setting id="Titulky" type="bool" label="Titulky.com (Czech and Slovak
subs only)" default="false"/>
+ <setting id="Titulkyuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30128" default=""/>
+ <setting id="Titulkypass" type="text" option ="hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30129" default=""/>
+
+ <setting id="Undertexter" type="bool" label="Undertexter.se (Swedish and
English subs only)" default="false"/>
</category>
<category label="30106">
<setting id="defmovieservice" type="fileenum" mask="/" label="30113"
default="OpenSubtitles" values="/resources/lib/services" />
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 5 +
script.xbmc.subtitles/default.py | 4 +-
script.xbmc.subtitles/resources/lib/gui.py | 12 ++-
.../resources/lib/services/BetaSeries/service.py | 2 +-
.../resources/lib/services/Itasa/service.py | 4 +
script.xbmc.subtitles/resources/settings.xml | 81 +++++++++++---------
7 files changed, 67 insertions(+), 43 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
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-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
