The branch, eden-pre has been updated
via 0afbd663f144dd96d4d9c2af7d07b90753be0d0e (commit)
from 3388d6fbb875bbe3418e356e705c1d332cce96fb (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=0afbd663f144dd96d4d9c2af7d07b90753be0d0e
commit 0afbd663f144dd96d4d9c2af7d07b90753be0d0e
Author: amet <[email protected]>
Date: Sat Dec 3 20:38:10 2011 +0400
[script.xbmc.subtitles] -v2.9.28
- fixed: Subcenter
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 60e7df2..58de8c1 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.27"
+ version="2.9.28"
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 53aad36..3526e09 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,6 @@
+2.9.28
+- fixed Subcenter Service
+
2.9.27
- fixed searching for some tvshows in Titulky.com service, thx Libor
diff --git a/script.xbmc.subtitles/resources/language/Turkish/strings.xml
b/script.xbmc.subtitles/resources/language/Turkish/strings.xml
index d4d6bc2..1308d29 100644
--- a/script.xbmc.subtitles/resources/language/Turkish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Turkish/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Türkçe -->
@@ -68,7 +68,12 @@
<string id="30137">- OmniSubs Parola</string>
<string id="30138">- LegendasZone Kullanıcı Adı</string>
<string id="30139">- LegendasZone Parola</string>
-
+ <string id="30140">- Altyazı türünü seç:</string>
+ <string id="30141">SubRip</string>
+ <string id="30142">TMPlayer</string>
+ <string id="30143">MicroDVD</string>
+ <string id="30144">MPl2</string>
+
<!-- Languages -->
<string id="30201">Arnavutça</string>
diff --git a/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
b/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
index 82e2415..1e17726 100644
--- a/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
@@ -2,15 +2,16 @@
#===============================================================================
# Subscenter.org subtitles service.
-# Version: 1.1
+# Version: 1.2
#
# Change log:
# 1.1 - Fixed downloading of non-Hebrew subtitles.
+# 1.2 - Added key field for download URL
#
# Created by: Ori Varon
#===============================================================================
import os, re, xbmc, xbmcgui, string, time, urllib2
-from utilities import twotofull, toOpenSubtitles_two, log
+from utilities import languageTranslate, log
BASE_URL = "http://www.subscenter.org";
debug_pretext = ""
@@ -78,7 +79,7 @@ def
getAllSubtitles(subtitlePageID,languageList,subtitlesList):
exec(toExec)
log( __name__ ,"Built webpage dictionary")
for language in foundSubtitles.keys():
- if (twotofull(language) in languageList):
+ if (languageTranslate(language, 2, 0) in languageList):
for translator in foundSubtitles[language]:
for quality in foundSubtitles[language][translator]:
for rating in
foundSubtitles[language][translator][quality]:
@@ -86,7 +87,8 @@ def
getAllSubtitles(subtitlePageID,languageList,subtitlesList):
'filename':
foundSubtitles[language][translator][quality][rating]["subtitle_version"],
'subtitle_id':
foundSubtitles[language][translator][quality][rating]["id"],
'language_flag': 'flags/' + language + '.gif',
- 'language_name': twotofull(language)})
+ 'language_name': languageTranslate(language, 2, 0),
+ 'key':
foundSubtitles[language][translator][quality][rating]["key"]})
# Extracts the downloaded file and find a new sub/srt file to return.
# Note that Sratim.co.il currently isn't hosting subtitles in .txt format but
@@ -212,7 +214,8 @@ def search_subtitles( file_original_path, title, tvshow,
year, season, episode,
def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir,
sub_folder, session_id): #standard input
subtitle_id = subtitles_list[pos][ "subtitle_id" ]
filename = subtitles_list[pos][ "filename" ]
- url = BASE_URL +
"/subtitle/download/"+toOpenSubtitles_two(subtitles_list[pos][ "language_name"
])+"/"+str(subtitle_id)+"/?v="+filename
+ url = BASE_URL +
"/subtitle/download/"+languageTranslate(subtitles_list[pos][ "language_name" ],
0, 2)+"/"+str(subtitle_id)+"/?v="+filename
+ key = subtitles_list[pos][ "key" ]
log( __name__ ,"%s Fetching subtitles using url %s" % (debug_pretext, url))
# Get the intended filename (don't know if it's zip or rar)
archive_name = getURLfilename(url)
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 3 +++
.../resources/language/Turkish/strings.xml | 9 +++++++--
.../resources/lib/services/Subscenter/service.py | 13 ++++++++-----
4 files changed, 19 insertions(+), 8 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
