The branch, eden-pre has been updated
via 5d657dfa199b930dc705ed996afb672b40d0f9e9 (commit)
from bf203e9138c4719fe0102b64d98719b3af3b4f5e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=5d657dfa199b930dc705ed996afb672b40d0f9e9
commit 5d657dfa199b930dc705ed996afb672b40d0f9e9
Author: amet <[email protected]>
Date: Thu May 26 22:36:38 2011 +0400
[script.xbmc.subtitles] -v 2.9.8
2.9.8
- fixed Podnapisi search
2.9.7
- fixed: non-Hebrew subtitles in Subscenter, thanks Ori Varon
- added: Sratim version 2.0 added, thanks Ori Varon
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 8190f6b..1b31038 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.6"
+ version="2.9.8"
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 c697fd5..b6b918c 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,10 @@
+2.9.8
+- fixed Podnapisi search
+
+2.9.7
+- fixed: non-Hebrew subtitles in Subscenter, thanks Ori Varon
+- added: Sratim version 2.0 added, thanks Ori Varon
+
2.9.6
- fixed: Subscenter service
diff --git
a/script.xbmc.subtitles/resources/lib/services/Podnapisi/pn_utilities.py
b/script.xbmc.subtitles/resources/lib/services/Podnapisi/pn_utilities.py
index 06191d7..8515020 100644
--- a/script.xbmc.subtitles/resources/lib/services/Podnapisi/pn_utilities.py
+++ b/script.xbmc.subtitles/resources/lib/services/Podnapisi/pn_utilities.py
@@ -116,10 +116,7 @@ class OSDBServer:
name = tvshow
search_url1 = None
search_url2 = None
- name = urllib.quote(name.replace(" ","+"))
-
- search_url_base =
"http://www.podnapisi.net/ppodnapisi/search?tbsl=1&sK=%s&sJ=%s&sY=%s&sTS=%s&sTE=%s&sXML=1&lang=0";
% (name, "%s", str(year), str(season), str(episode))
-
+ search_url_base =
"http://www.podnapisi.net/ppodnapisi/search?tbsl=1&sK=%s&sJ=%s&sY=%s&sTS=%s&sTE=%s&sXML=1&lang=0";
% (name.replace(" ","+"), "%s", str(year), str(season), str(episode))
search_url = search_url_base % str(lang1)
log( __name__ ,"%s - Language 1" % search_url)
if lang2!=lang1:
diff --git a/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
b/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
index 6a352a6..82e2415 100644
--- a/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
@@ -2,14 +2,15 @@
#===============================================================================
# Subscenter.org subtitles service.
-# Version: 1.0
+# Version: 1.1
#
# Change log:
+# 1.1 - Fixed downloading of non-Hebrew subtitles.
#
# Created by: Ori Varon
#===============================================================================
import os, re, xbmc, xbmcgui, string, time, urllib2
-from utilities import twotofull, log
+from utilities import twotofull, toOpenSubtitles_two, log
BASE_URL = "http://www.subscenter.org";
debug_pretext = ""
@@ -211,7 +212,7 @@ 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/he/"+str(subtitle_id)+"/?v="+filename
+ url = BASE_URL +
"/subtitle/download/"+toOpenSubtitles_two(subtitles_list[pos][ "language_name"
])+"/"+str(subtitle_id)+"/?v="+filename
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)
diff --git a/script.xbmc.subtitles/resources/settings.xml
b/script.xbmc.subtitles/resources/settings.xml
index 206184b..dba9e21 100644
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -42,6 +42,7 @@
<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="Sratim" type="bool" label="Sratim.co.il" 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 | 7 +
.../lib/services/Podnapisi/pn_utilities.py | 5 +-
.../lib/services/{Argenteam => Sratim}/__init__.py | 0
.../resources/lib/services/Sratim/logo.png | Bin 0 -> 9553 bytes
.../lib/services/{Subscenter => Sratim}/service.py | 173 +++++++++++---------
.../resources/lib/services/Subscenter/service.py | 7 +-
script.xbmc.subtitles/resources/settings.xml | 1 +
8 files changed, 107 insertions(+), 88 deletions(-)
copy script.xbmc.subtitles/resources/lib/services/{Argenteam =>
Sratim}/__init__.py (100%)
create mode 100644 script.xbmc.subtitles/resources/lib/services/Sratim/logo.png
copy script.xbmc.subtitles/resources/lib/services/{Subscenter =>
Sratim}/service.py (56%)
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
