The branch, dharma has been updated
via 86d7fc3abedb38ee32896964388734218cdc044f (commit)
from 8a538289fd08da160dad0f1b1bc2e03f4ecd546b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=86d7fc3abedb38ee32896964388734218cdc044f
commit 86d7fc3abedb38ee32896964388734218cdc044f
Author: amet <[email protected]>
Date: Thu Apr 14 10:57:16 2011 +0400
[script.xbmc.subtitles] -v2.4.5
- fixes in LegendasDivx.com version 0.2.0/0.2.1
- fixed: BetaSeries fetching .ass subtitle in archive cause some issues
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 9151440..c1de4e8 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.4.4"
+ version="2.4.5"
provider-name="Amet, mr_blobby">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt
b/script.xbmc.subtitles/changelog.txt
index db2ec61..12c5fa2 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,7 @@
+2.4.5
+- fixes in LegendasDivx.com version 0.2.0/0.2.1
+- fixed: BetaSeries fetching .ass subtitle in archive cause some issues
+
2.4.4
- added: new service, Argenteam, thx to Esteban
- fixed: various issues in LegendasDivx.com, thx to HiGhLaNdR
diff --git a/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
b/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
index ee6cacf..f7e2cfe 100644
--- a/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/BetaSeries/service.py
@@ -206,7 +206,7 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
max_mtime = 0
# determine the newest file from tmp_sub_dir
for file in files:
- if (string.split(file,'.')[-1] in ['srt','sub','txt']):
+ if (string.split(file,'.')[-1] in ['srt','sub','txt','ass']):
mtime = os.stat(os.path.join(tmp_sub_dir, file)).st_mtime
if mtime > max_mtime:
max_mtime = mtime
@@ -221,7 +221,7 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
filecount = len(files)
# determine if there is a newer file created in tmp_sub_dir
(marks that the extraction had completed)
for file in files:
- if (string.split(file,'.')[-1] in ['srt','sub','txt']):
+ if (string.split(file,'.')[-1] in
['srt','sub','txt','ass']):
mtime = os.stat(os.path.join(tmp_sub_dir,
file)).st_mtime
if (mtime > max_mtime):
max_mtime = mtime
diff --git
a/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
b/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
index e3f59f3..6425407 100644
--- a/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Version 0.1.9
+# Service LegendasDivx.com version 0.2.1
# Code based on Undertext service
# Coded by HiGhLaNdR@OLDSCHOOL
# Help by VaRaTRoN
@@ -8,30 +8,38 @@
# http://www.teknorage.com
# License: GPL v2
#
-# NEW on v0.1.9:
+# NEW on Service LegendasDivx.com v0.2.1:
+# Fixed bug when the file is played from a root path, no parent dir
search\sync when that happens.
+# Fixed pathnames to work with all OS (Win, Unix, etc).
+# Added pattern to search several subtitle extensions.
+#
+# NEW on Service LegendasDivx.com v0.2.0:
+# Better "star" rating, remember that the start rating is calculated using the
number of hits/downloads.
+# Fixed a bug in the SYNC subtitles, it wouldn't assume that any were sync (in
the code), a dialog box would open in multi packs.
+#
+# NEW on Service LegendasDivx.com v0.1.9:
# When no sync subtitle is found and the pack has more then 1 sub, it will
open a dialog box for browsing the substitles inside the multi pack.
#
-# NEW on v0.1.8:
+# NEW on Service LegendasDivx.com v0.1.8:
# Uncompress rar'ed subtitles inside a rar file... yeh weird site...
#
-# NEW on v0.1.7:
+# NEW on Service LegendasDivx.com v0.1.7:
# BUG found in multi packs is now fixed.
# Added more accuracy to the selection of subtitle to load. Now checks the
release dirname against the subtitles downloaded.
# When no sync is found and if the substitle name is not equal to the release
dirname or release filename it will load one random subtitle from the package.
#
-# NEW on v0.1.6:
+# NEW on Service LegendasDivx.com v0.1.6:
# Movies or TV eps with 2cds or more will now work.
# Sync subs is now much more accurate.
#
-# First Release v0.1.5:
+# Initial Release of Service LegendasDivx.com - v0.1.5:
# TV Season packs now downloads and chooses the best one available in the pack
# Movie packs with several releases now works too, tries to choose the sync
sub using filename or dirname
# Search description for SYNC subtitles using filename or dirname
#
# KNOWN BUGS (TODO for next versions):
-# Regex isn't perfect so a few results might have html tags still, not many
but...
+# Regex isn't perfect so a few results might have html tags still, not many
but ...
# Filtering languages, shows only European Portuguese flag.
-# Just using .srt subs for auto sync download. Others will come in further
versions.
# LegendasDivx.com subtitles, based on a mod of Undertext subtitles
import os, sys, re, xbmc, xbmcgui, string, time, urllib, urllib2, cookielib,
shutil, fnmatch
@@ -42,6 +50,8 @@ __settings__ = sys.modules[ "__main__" ].__settings__
main_url = "http://www.legendasdivx.com/";
debug_pretext = "LegendasDivx"
+subext = ['srt', 'aas', 'ssa', 'sub', 'smi']
+packext = ['rar', 'zip']
#====================================================================================================================
# Regular expression patterns
@@ -86,7 +96,7 @@ Release: The.Dark.Knight.2008.720p.BluRay.DTS.x264-ESiR</td>
#subtitle_pattern =
"<div\sclass=\"sub_box\">[\r\n\t]{2}<div\sclass=\"sub_header\">[\r\n\t]{2}<b>(.+?)</b>\s\((\d\d\d\d)\)\s.+?[\r\n\t
]+?[\r\n\t]</div>[\r\n\t]{2}<table\sclass=\"sub_main\scolor1\"\scellspacing=\"0\">[\r\n\t]{2}<tr>[\r\n\t]{2}.+?[\r\n\t]{2}.+?img/(.+?)gif\".+?[\r\n\t]{2}<th>CDs:</th>[\r\n\t
]{2}<td>(.+?) </td>[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<a\shref=\"\?name=Downloads&d_op=ratedownload&lid=(.+?)\">[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<th\sclass=\"color2\">Hits:</th>[\r\n\t]{2}<td>(.+?)</td>[\r\n\t
]{2}.+?[\r\n\t]{2}<td>(.+?)</td>[\r\n\t ]{2}.+?[\r\n\t ]{2}.+?[\r\n\t
]{2}.+?[\r\n\t ]{2}.+?.{2,5}[\r\n\t ]{2}.+?[\r\n\t
]{2}<td\scolspan=\"5\"\sclass=\"td_desc\sbrd_up\">((\n|.)*)</td>"
# group(1) = Name, group(2) = Year, group(3) = Language, group(4)= Number
Files, group(5) = ID, group(6) = Hits, group(7) = Requests, group(8) =
Description
-subtitle_pattern =
"<div\sclass=\"sub_box\">[\r\n\t]{2}<div\sclass=\"sub_header\">[\r\n\t]{2}<b>(.+?)</b>\s\((\d\d\d\d)\)\s.+?[\r\n\t
]+?[\r\n\t]</div>[\r\n\t]{2}<table\sclass=\"sub_main\scolor1\"\scellspacing=\"0\">[\r\n\t]{2}<tr>[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<th>CDs:</th>[\r\n\t
]{2}<td>(.+?) </td>[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<a\shref=\"\?name=Downloads&d_op=ratedownload&lid=(.+?)\">[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<th\sclass=\"color2\">Hits:</th>[\r\n\t]{2}<td>(.+?)</td>[\r\n\t
]{2}.+?[\r\n\t]{2}<td>(.+?)</td>[\r\n\t ]{2}.+?[\r\n\t ]{2}.+?[\r\n\t
]{2}.+?[\r\n\t ]{2}.+?.{2,5}[\r\n\t ]{2}.+?[\r\n\t
]{2}<td\scolspan=\"5\"\sclass=\"td_desc\sbrd_up\">((\n|.)*)</td>"
+subtitle_pattern =
"<div\sclass=\"sub_box\">[\r\n\t]{2}<div\sclass=\"sub_header\">[\r\n\t]{2}<b>(.+?)</b>\s\((\d\d\d\d)\)\s.+?[\r\n\t
]+?[\r\n\t]</div>[\r\n\t]{2}<table\sclass=\"sub_main\scolor1\"\scellspacing=\"0\">[\r\n\t]{2}<tr>[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<th>CDs:</th>[\r\n\t
]{2}<td>(.+?)</td>[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<a\shref=\"\?name=Downloads&d_op=ratedownload&lid=(.+?)\">[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}.+?[\r\n\t]{2}<th\sclass=\"color2\">Hits:</th>[\r\n\t]{2}<td>(.+?)</td>[\r\n\t
]{2}.+?[\r\n\t]{2}<td>(.+?)</td>[\r\n\t ]{2}.+?[\r\n\t ]{2}.+?[\r\n\t
]{2}.+?[\r\n\t ]{2}.+?.{2,5}[\r\n\t ]{2}.+?[\r\n\t
]{2}<td\scolspan=\"5\"\sclass=\"td_desc\sbrd_up\">((\n|.)*)</td>"
# group(1) = Name, group(2) = Year, group(3) = Number Files, group(4) = ID,
group(5) = Hits, group(6) = Requests, group(7) = Description
#====================================================================================================================
# Functions
@@ -100,13 +110,13 @@ def getallsubs(searchstring, languageshort, languagelong,
file_original_path, su
content = geturl(url)
log( __name__ ,"%s Getting '%s' subs ..." % (debug_pretext,
languageshort))
- while re.search(subtitle_pattern, content, re.IGNORECASE | re.DOTALL |
re.MULTILINE | re.UNICODE | re.VERBOSE):
+ while re.search(subtitle_pattern, content, re.IGNORECASE | re.DOTALL |
re.MULTILINE | re.UNICODE | re.VERBOSE) and page < 6:
for matches in re.finditer(subtitle_pattern, content,
re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE | re.VERBOSE):
hits = matches.group(5)
id = matches.group(4)
movieyear = matches.group(2)
no_files = matches.group(3)
- downloads = int(matches.group(5)) / 500
+ downloads = int(matches.group(5)) / 300
if (downloads > 10):
downloads=10
filename = string.strip(matches.group(1))
@@ -119,28 +129,31 @@ def getallsubs(searchstring, languageshort, languagelong,
file_original_path, su
desc = re.sub(r'<[^<]+?>|[~]','', desc)
#Find filename on the comentaries to show sync label
using filename or dirname (making it global for further usage)
global filesearch
- filesearch = os.path.split(file_original_path)
- dirsearch = string.split(filesearch[0], '/')
+ filesearch = os.path.abspath(file_original_path)
+ filesearch = os.path.split(filesearch)
+ dirsearch = string.split(filesearch[0], '\\')
dirsearch_check = string.split(dirsearch[-1], '.')
if (searchstring_notclean != ""):
sync = False
if re.search(searchstring_notclean, desc):
sync = True
- #log( __name__ ,"%s dirsearch-2 found: %s" %
(debug_pretext, searchstring_notclean))
else:
if (string.lower(dirsearch_check[-1]) == "rar")
or (string.lower(dirsearch_check[-1]) == "cd1") or
(string.lower(dirsearch_check[-1]) == "cd2"):
sync = False
- if
re.search(filesearch[1][:len(filesearch[1])-4], desc) or
re.search(dirsearch[-2], desc):
- sync = True
- log( __name__ ,"%s Subtitles found: %s
(id = %s)" % (debug_pretext, filename, id))
- #log( __name__ ,"%s dirsearch-2 found:
%s" % (debug_pretext, dirsearch[-2]))
+ if len(dirsearch) > 1 and dirsearch[1]
!= '':
+ if
re.search(filesearch[1][:len(filesearch[1])-4], desc) or
re.search(dirsearch[-2], desc):
+ sync = True
+ else:
+ if
re.search(filesearch[1][:len(filesearch[1])-4], desc):
+ sync = True
else:
sync = False
- if
re.search(filesearch[1][:len(filesearch[1])-4], desc) or
re.search(dirsearch[-1], desc):
- sync = True
- log( __name__ ,"%s Subtitles found: %s
(id = %s)" % (debug_pretext, filename, id))
- #log( __name__ ,"%s dirsearch-2 found:
%s" % (debug_pretext, dirsearch[-1]))
- log( __name__ ,"%s Desc found: %s (id = %s)" %
(debug_pretext, desc, id))
+ if len(dirsearch) > 1 and dirsearch[1]
!= '':
+ if
re.search(filesearch[1][:len(filesearch[1])-4], desc) or
re.search(dirsearch[-1], desc):
+ sync = True
+ else:
+ if
re.search(filesearch[1][:len(filesearch[1])-4], desc):
+ sync = True
filename = filename + " " + "(" + movieyear + ")" + "
" + hits + "Hits" + " - " + desc
subtitles_list.append({'rating': str(downloads),
'no_files': no_files, 'filename': filename, 'desc': desc, 'sync': sync, 'hits'
: hits, 'id': id, 'language_flag': 'flags/' + languageshort + '.gif',
'language_name': languagelong})
page = page + 1
@@ -178,39 +191,44 @@ def search_subtitles( file_original_path, title, tvshow,
year, season, episode,
searchstring_notclean = ""
searchstring = ""
global israr
- israr = os.path.split(file_original_path)
- israr = string.split(israr[0], '/')
+ israr = os.path.abspath(file_original_path)
+ israr = os.path.split(israr)
+ israr = string.split(israr[0], '\\')
israr = string.split(israr[-1], '.')
israr = string.lower(israr[-1])
- #log( __name__ ,"%s string israr = %s" % (debug_pretext, israr))
-
if len(tvshow) == 0:
if 'rar' in israr and searchstring is not None:
- #log( __name__ ,"%s em israr = %s" % (debug_pretext,
israr))
if 'cd1' in string.lower(title) or 'cd2' in
string.lower(title) or 'cd3' in string.lower(title):
- #log( __name__ ,"%s em cd1-2-3 = %s" %
(debug_pretext, israr))
- dirsearch = os.path.split(file_original_path)
- dirsearch = string.split(dirsearch[0], '/')
- searchstring_notclean = dirsearch[-3]
- searchstring =
xbmc.getCleanMovieTitle(dirsearch[-3])
- searchstring = searchstring[0]
- #log( __name__ ,"%s searchstringisrar = %s" %
(debug_pretext, searchstring))
- #log( __name__ ,"%s searchstringnotclean = %s"
% (debug_pretext, searchstring_notclean))
+ dirsearch = os.path.abspath(file_original_path)
+ dirsearch = os.path.split(dirsearch)
+ dirsearch = string.split(dirsearch[0], '\\')
+ if len(dirsearch) > 1:
+ searchstring_notclean = dirsearch[-3]
+ searchstring =
xbmc.getCleanMovieTitle(dirsearch[-3])
+ searchstring = searchstring[0]
+ else:
+ searchstring = title
else:
searchstring = title
- #log( __name__ ,"%s searchstringELSEafterIF =
%s" % (debug_pretext, searchstring))
elif 'cd1' in string.lower(title) or 'cd2' in
string.lower(title) or 'cd3' in string.lower(title):
- dirsearch = os.path.split(file_original_path)
- dirsearch = string.split(dirsearch[0], '/')
- searchstring_notclean = dirsearch[-2]
- searchstring = xbmc.getCleanMovieTitle(dirsearch[-2])
- searchstring = searchstring[0]
- #log( __name__ ,"%s searchstringnotrar = %s" %
(debug_pretext, searchstring))
- #log( __name__ ,"%s searchstringnotclean = %s" %
(debug_pretext, searchstring_notclean))
+ dirsearch = os.path.abspath(file_original_path)
+ dirsearch = os.path.split(dirsearch)
+ dirsearch = string.split(dirsearch[0], '\\')
+ if len(dirsearch) > 1:
+ searchstring_notclean = dirsearch[-2]
+ searchstring =
xbmc.getCleanMovieTitle(dirsearch[-2])
+ searchstring = searchstring[0]
+ else:
+ #We are at the root of the drive!!! so there's
no dir to lookup only file#
+ title = os.path.split(file_original_path)
+ searchstring = title[-1]
else:
- searchstring = title
- #log( __name__ ,"%s searchstringELSE = %s" %
(debug_pretext, searchstring))
+ if title == "":
+ title = os.path.split(file_original_path)
+ searchstring = title[-1]
+ else:
+ searchstring = title
if len(tvshow) > 0:
searchstring = "%s S%#02dE%#02d" % (tvshow, int(season),
int(episode))
@@ -231,13 +249,13 @@ def search_subtitles( file_original_path, title, tvshow,
year, season, episode,
def recursive_glob(treeroot, pattern):
results = []
for base, dirs, files in os.walk(treeroot):
- goodfiles = fnmatch.filter(files, pattern)
- results.extend(os.path.join(base, f) for f in goodfiles)
- return results
+ for extension in pattern:
+ for filename in fnmatch.filter(files, '*.' + extension):
+ results.append(os.path.join(base, filename))
+ return results
def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir,
sub_folder, session_id): #standard input
- log( __name__ ,"%s Fetching subtitles using url %s" % (debug_pretext,
subtitles_list))
id = subtitles_list[pos][ "id" ]
sync = subtitles_list[pos][ "sync" ]
log( __name__ ,"%s Fetching id using url %s" % (debug_pretext, id))
@@ -263,7 +281,6 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
if content is not None:
header =
content.info()['Content-Disposition'].split('filename')[1].split('.')[-1].strip("\"")
- #log( __name__ ,"%s Fetching subtitles using url %s" %
(debug_pretext, content))
if header == 'rar':
log( __name__ ,"%s file: content is RAR" %
(debug_pretext)) #EGO
local_tmp_file = os.path.join(tmp_sub_dir, "ldivx.rar")
@@ -316,35 +333,30 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
log( __name__ ,"%s Failed to unpack subtitles
in '%s'" % (debug_pretext, tmp_sub_dir))
else:
log( __name__ ,"%s Unpacked files in '%s'" %
(debug_pretext, tmp_sub_dir))
- searchrars = recursive_glob(tmp_sub_dir,
'*.rar')
+ searchrars = recursive_glob(tmp_sub_dir,
packext)
searchrarcount = len(searchrars)
- log( __name__ ,"%s DEBUG-rarcount: '%s'" %
(debug_pretext, searchrarcount))
- log( __name__ ,"%s DEBUG-rarcount: '%s'" %
(debug_pretext, searchrars))
if searchrarcount > 1:
for filerar in searchrars:
- log( __name__ ,"%s
DEBUG-nomedorar: '%s'" % (debug_pretext, filerar))
- if filerar !=
os.path.join(tmp_sub_dir,'ldivx.rar'):
- #filerar =
os.path.join(tmp_sub_dir, filerar)
- log( __name__ ,"%s
DEBUG-nomedorarcompleto: '%s'" % (debug_pretext, filerar))
+ if filerar !=
os.path.join(tmp_sub_dir,'ldivx.rar') and filerar !=
os.path.join(tmp_sub_dir,'ldivx.zip'):
xbmc.executebuiltin("XBMC.Extract(" + filerar + "," + tmp_sub_dir +")")
time.sleep(1)
- searchsubs = recursive_glob(tmp_sub_dir,
'*.srt')
- log( __name__ ,"%s DEBUG-searchsubs: '%s'" %
(debug_pretext, searchsubs))
+ searchsubs = recursive_glob(tmp_sub_dir, subext)
searchsubscount = len(searchsubs)
for filesub in searchsubs:
nopath = string.split(filesub,
tmp_sub_dir)[-1]
justfile = string.split(nopath,
'\\')[-1]
#For DEBUG only uncomment next line
- log( __name__ ,"%s DEBUG-nopath: '%s'"
% (debug_pretext, nopath))
- log( __name__ ,"%s DEBUG-justfile:
'%s'" % (debug_pretext, justfile))
+ #log( __name__ ,"%s DEBUG-nopath: '%s'"
% (debug_pretext, nopath))
+ #log( __name__ ,"%s DEBUG-justfile:
'%s'" % (debug_pretext, justfile))
releasefilename =
filesearch[1][:len(filesearch[1])-4]
- releasedirname =
string.split(filesearch[0], '/')
+ releasedirname =
string.split(filesearch[0], '\\')
if 'rar' in israr:
releasedirname =
releasedirname[-2]
else:
releasedirname =
releasedirname[-1]
#For DEBUG only uncomment next line
#log( __name__ ,"%s
DEBUG-releasefilename: '%s'" % (debug_pretext, releasefilename))
+ #log( __name__ ,"%s
DEBUG-releasedirname: '%s'" % (debug_pretext, releasedirname))
subsfilename =
justfile[:len(justfile)-4]
#For DEBUG only uncomment next line
#log( __name__ ,"%s DEBUG-subsfilename:
'%s'" % (debug_pretext, subsfilename))
@@ -353,28 +365,28 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
multicds_pattern = "\+?(cd\d)\+?"
multicdsubs =
re.search(multicds_pattern, subsfilename, re.IGNORECASE | re.DOTALL |
re.MULTILINE | re.UNICODE | re.VERBOSE)
multicdsrls =
re.search(multicds_pattern, releasefilename, re.IGNORECASE | re.DOTALL |
re.MULTILINE | re.UNICODE | re.VERBOSE)
-
- log( __name__ ,"%s DEBUG-sync: '%s'" %
(debug_pretext, sync))
#Start choosing the right subtitle(s)
- if searchsubscount == 1 and sync ==
'True':
+ if searchsubscount == 1 and sync ==
True:
subs_file = filesub
- log( __name__ ,"%s DEBUG-inside
subscount: '%s'" % (debug_pretext, searchsubscount))
+ #For DEBUG only uncomment next
line
+ #log( __name__ ,"%s
DEBUG-inside subscount: '%s'" % (debug_pretext, searchsubscount))
break
- elif string.lower(subsfilename) ==
string.lower(releasefilename) and sync == 'True':
+ elif string.lower(subsfilename) ==
string.lower(releasefilename) and sync == True:
subs_file = filesub
#For DEBUG only uncomment next
line
- log( __name__ ,"%s
DEBUG-subsfile-morethen1: '%s'" % (debug_pretext, subs_file))
+ #log( __name__ ,"%s
DEBUG-subsfile-morethen1: '%s'" % (debug_pretext, subs_file))
break
- elif string.lower(subsfilename) ==
string.lower(releasedirname) and sync == 'True':
+ elif string.lower(subsfilename) ==
string.lower(releasedirname) and sync == True:
subs_file = filesub
#For DEBUG only uncomment next
line
- log( __name__ ,"%s
DEBUG-subsfile-morethen1-dirname: '%s'" % (debug_pretext, subs_file))
+ #log( __name__ ,"%s
DEBUG-subsfile-morethen1-dirname: '%s'" % (debug_pretext, subs_file))
break
- elif (multicdsubs != None) and
(multicdsrls != None) and sync == 'True':
+ elif (multicdsubs != None) and
(multicdsrls != None) and sync == True:
multicdsubs =
string.lower(multicdsubs.group(1))
multicdsrls =
string.lower(multicdsrls.group(1))
- log( __name__ ,"%s
DEBUG-multicdsubs: '%s'" % (debug_pretext, multicdsubs))
- log( __name__ ,"%s
DEBUG-multicdsrls: '%s'" % (debug_pretext, multicdsrls))
+ #For DEBUG only uncomment next
line
+ #log( __name__ ,"%s
DEBUG-multicdsubs: '%s'" % (debug_pretext, multicdsubs))
+ #log( __name__ ,"%s
DEBUG-multicdsrls: '%s'" % (debug_pretext, multicdsrls))
if multicdsrls == multicdsubs:
subs_file = filesub
break
diff --git a/script.xbmc.subtitles/resources/settings.xml
b/script.xbmc.subtitles/resources/settings.xml
index 197beb6..312e648 100644
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -31,7 +31,7 @@
<setting id="SubDB" type="bool" label="theSubDB.com" default="false"/>
<setting id="Sratim" type="bool" label="Sratim.co.il" default="false"/>
<setting id="BetaSeries" type="bool" label="betaseries.com"
default="false"/>
- <setting id="LegendasDivx" type="bool" label="LegendasDivx.com.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"/>
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 4 +
.../resources/lib/services/BetaSeries/service.py | 4 +-
.../resources/lib/services/LegendasDivx/service.py | 160 +++++++++++---------
script.xbmc.subtitles/resources/settings.xml | 2 +-
5 files changed, 94 insertions(+), 78 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
