The branch, gotham has been updated
via fdf95a113148b6d6bb2b2344d815b37da6c11183 (commit)
from c5baca4a180fda3b022459d5324f3ac9bada306d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=fdf95a113148b6d6bb2b2344d815b37da6c11183
commit fdf95a113148b6d6bb2b2344d815b37da6c11183
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date: Fri May 2 19:07:48 2014 +0200
[service.subtitles.subdivx] 0.0.2
diff --git a/service.subtitles.subdivx/addon.xml
b/service.subtitles.subdivx/addon.xml
index f020a74..84f656b 100644
--- a/service.subtitles.subdivx/addon.xml
+++ b/service.subtitles.subdivx/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.subdivx"
name="Subdivx.com"
- version="0.0.1"
+ version="0.0.2"
provider-name="cramm">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.subdivx/changelog.txt
b/service.subtitles.subdivx/changelog.txt
index 3949da9..77561b9 100644
--- a/service.subtitles.subdivx/changelog.txt
+++ b/service.subtitles.subdivx/changelog.txt
@@ -1,2 +1,7 @@
+0.0.2
+- Fixed accented characters mojibake.
+- Removed or replaced code of dubious utility/robustness.
+- More idiomatic Python code.
+
0.0.1
- Initial port to new Gotham structure.
diff --git a/service.subtitles.subdivx/service.py
b/service.subtitles.subdivx/service.py
index bcfae3c..533a6c7 100644
--- a/service.subtitles.subdivx/service.py
+++ b/service.subtitles.subdivx/service.py
@@ -1,8 +1,10 @@
# -*- coding: utf-8 -*-
# Subdivx.com subtitles, based on a mod of Undertext subtitles
-# Adaptation: enric_go...@hotmail.com | Please use email address for your
comments
+# Adaptation: enric_go...@hotmail.com | Please use email address for your
+# comments
# Port to XBMC 13 Gotham subtitles infrastructure: cramm, Mar 2014
+from __future__ import print_function
import os
from os.path import join as pjoin
import re
@@ -11,11 +13,23 @@ import sys
import time
import unicodedata
import urllib
-import xbmc
-import xbmcaddon
-import xbmcgui
-import xbmcplugin
-import xbmcvfs
+
+try:
+ import xbmc
+except ImportError:
+ if len(sys.argv) > 1 and sys.argv[1] == 'test':
+ import unittest # NOQA
+ try:
+ import mock # NOQA
+ except ImportError:
+ print("You need to install the mock Python library to run "
+ "unit tests.\n")
+ sys.exit(1)
+else:
+ import xbmcaddon
+ import xbmcgui
+ import xbmcplugin
+ import xbmcvfs
__addon__ = xbmcaddon.Addon()
__author__ = __addon__.getAddonInfo('author')
@@ -29,7 +43,7 @@ __profile__ =
xbmc.translatePath(__addon__.getAddonInfo('profile')).decode("u
__resource__ = xbmc.translatePath(pjoin(__cwd__, 'resources', 'lib' )
).decode("utf-8")
__temp__ = xbmc.translatePath(pjoin(__profile__, 'temp')).decode("utf-8")
-sys.path.append (__resource__)
+sys.path.append(__resource__)
MAIN_SUBDIVX_URL = "http://www.subdivx.com/";
@@ -39,141 +53,147 @@ INTERNAL_LINK_URL =
"plugin://%(scriptid)s/?action=download&id=%(id)s&filename=%
SUB_EXTS = ['srt', 'sub', 'txt']
HTTP_USER_AGENT = "User-Agent=Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US;
rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
-#============================
+# ============================
# Regular expression patterns
-#============================
-
-#Subtitle pattern example:
-#<div id="menu_titulo_buscador"><a class="titulo_menu_izq"
href="http://www.subdivx.com/X6XMjEzMzIyX-iron-man-2-2010.html";>Iron Man 2
(2010)</a></div>
-#<img src="img/calif5.gif" class="detalle_calif">
-#</div><div id="buscador_detalle">
-#<div id="buscador_detalle_sub">Para la versión
Iron.Man.2.2010.480p.BRRip.XviD.AC3-EVO, sacados de acá.
¡Disfruten!</div><div id="buscador_detalle_sub_datos"><b>Downloads:</b> 4673
<b>Cds:</b> 1 <b>Comentarios:</b> <a rel="nofollow"
href="popcoment.php?idsub=MjEzMzIy" onclick="return hs.htmlExpand(this, {
objectType: 'iframe' } )">14</a> <b>Formato:</b> SubRip <b>Subido por:</b> <a
class="link1" href="http://www.subdivx.com/X9X303157";>TrueSword</a> <img
src="http://www.subdivx.com/pais/2.gif"; width="16" height="12"> <b>el</b>
06/09/2010 </a></div></div>
-#<div id="menu_detalle_buscador">
-
-SUBTITLE_RE =
re.compile(r'<a\s+class="titulo_menu_izq"\s+href="http://www.subdivx.com/(.+?)\.html">.+?<div\s+id="buscador_detalle_sub">(.*?)</div>.+?<b>Downloads:</b>(.+?)<b>Cds:</b>.+?</div></div>',
- re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE)
-# group(1) = id to fetch the subs files
-# group(2) = user comments, may content filename
-# group(3) = downloads used for ratings
-
-DOWNLOAD_LINK_RE = re.compile(r'bajar.php\?id=(.*?)&u=(.*?)\"', re.IGNORECASE
| re.DOTALL | re.MULTILINE | re.UNICODE)
-
-#==========
+# ============================
+
+# Subtitle pattern example:
+# <div id="menu_titulo_buscador"><a class="titulo_menu_izq"
href="http://www.subdivx.com/X6XMjEzMzIyX-iron-man-2-2010.html";>Iron Man 2
(2010)</a></div>
+# <img src="img/calif5.gif" class="detalle_calif">
+# </div><div id="buscador_detalle">
+# <div id="buscador_detalle_sub">Para la versión
Iron.Man.2.2010.480p.BRRip.XviD.AC3-EVO, sacados de acá.
¡Disfruten!</div><div id="buscador_detalle_sub_datos"><b>Downloads:</b> 4673
<b>Cds:</b> 1 <b>Comentarios:</b> <a rel="nofollow"
href="popcoment.php?idsub=MjEzMzIy" onclick="return hs.htmlExpand(this, {
objectType: 'iframe' } )">14</a> <b>Formato:</b> SubRip <b>Subido por:</b> <a
class="link1" href="http://www.subdivx.com/X9X303157";>TrueSword</a> <img
src="http://www.subdivx.com/pais/2.gif"; width="16" height="12"> <b>el</b>
06/09/2010 </a></div></div>
+# <div id="menu_detalle_buscador">
+
+SUBTITLE_RE = re.compile(r'''<a\s+class="titulo_menu_izq"\s+
+ href="http://www.subdivx.com/(?P<id>.+?)\.html">
+
.+?<div\s+id="buscador_detalle_sub">(?P<comment>.*?)</div>
+ .+?<b>Downloads:</b>(?P<downloads>.+?)
+ <b>Cds:</b>.+?</div></div>''',
+ re.IGNORECASE | re.DOTALL | re.VERBOSE | re.UNICODE |
+ re.MULTILINE)
+# 'id' named group: ID to fetch the subs files
+# 'comment' named group: Translation author comment, may contain filename
+# 'downloads' named group: Downloads, used for ratings
+
+DOWNLOAD_LINK_RE = re.compile(r'bajar.php\?id=(.*?)&u=(.*?)\"', re.IGNORECASE |
+ re.DOTALL | re.MULTILINE | re.UNICODE)
+
+# ==========
# Functions
-#==========
+# ==========
+
def _log(module, msg):
s = u"### [%s] - %s" % (module, msg)
xbmc.log(s.encode('utf-8'), level=xbmc.LOGDEBUG)
+
def log(msg):
_log(__name__, msg)
+
def geturl(url):
class MyOpener(urllib.FancyURLopener):
- #version = HTTP_USER_AGENT
+ # version = HTTP_USER_AGENT
version = ''
my_urlopener = MyOpener()
log(u"Getting url: %s" % (url,))
try:
response = my_urlopener.open(url)
content = response.read()
- except:
+ except Exception:
log(u"Failed to get url:%s" % (url,))
content = None
return content
+
def getallsubs(searchstring, languageshort, languagelong, file_original_path):
- subtitles_list = []
+ subs_list = []
if languageshort == "es":
- page = 1
- url = SEARCH_PAGE_URL % {'page': page, 'query':
urllib.quote_plus(searchstring)}
- content = geturl(url)
log(u"Getting '%s' subs ..." % languageshort)
-
- while SUBTITLE_RE.search(content):
- for matches in SUBTITLE_RE.finditer(content):
- id = matches.group(1)
- downloads = int(re.sub(r'[,.]', '', matches.group(3)))
+ page = 1
+ while True:
+ url = SEARCH_PAGE_URL % {'page': page,
+ 'query': urllib.quote_plus(searchstring)}
+ content = geturl(url)
+ if content is None or not SUBTITLE_RE.search(content):
+ break
+ for match in SUBTITLE_RE.finditer(content):
+ id = match.groupdict()['id']
+ dls = re.sub(r'[,.]', '', match.groupdict()['downloads'])
+ downloads = int(dls)
rating = downloads / 1000
if rating > 10:
rating = 10
- comment = matches.group(2)
- filename = comment.strip()
- # Remove new lines on the comments
- filename = re.sub('\n', ' ', filename)
- # Remove Google Ads on the comments
- filename = re.sub(r'<script.+?script>', '', filename,
re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE)
- # Remove HTML tags on the commentaries
- filename = re.sub(r'<[^<]+?>', '', filename)
- # Find filename on the comments to show sync label
- filesearch = os.path.split(file_original_path)
- sync = False
- if re.search(filesearch[1][:len(filesearch[1])-4], filename):
- sync = True
+ description = match.groupdict()['comment']
+ text = description.strip()
+ # Remove new lines
+ text = re.sub('\n', ' ', text)
+ # Remove Google Ads
+ text = re.sub(r'<script.+?script>', '', text,
+ re.IGNORECASE | re.DOTALL | re.MULTILINE |
+ re.UNICODE)
+ # Remove HTML tags
+ text = re.sub(r'<[^<]+?>', '', text)
+ # If our actual video file's name appears in the description
+ # then set sync to True because it has better chances if its
+ # synchronization to match it
+ _, fn = os.path.split(file_original_path)
+ name, _ = os.path.splitext(fn)
+ sync = re.search(re.escape(name), text, re.I) is not None
try:
- log(u"Subtitles found: %s (id = %s)" % (filename, id))
- except:
+ log(u"Subtitles found: %s (id = %s)" % (text, id))
+ except Exception:
pass
- # Find filename on the commentaries and put it in front
- title_first_word = re.split('[\W]+', searchstring)
- comments_list = re.split('\s', filename)
- n = 0
- version = None
- while n < len(comments_list) and version is None:
- version = re.search(title_first_word[0], comments_list[n],
re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE)
- n += 1
- if version:
- filename = comments_list[n-1] + " | " + filename
- # End of filename search
item = {
'rating': str(rating),
- 'filename': filename,
+ 'filename': text.decode('latin1'),
'sync': sync,
- 'id' : id,
- #'language_flag': 'flags/' + languageshort + '.gif',
+ 'id': id,
+ # 'language_flag': 'flags/' + languageshort + '.gif',
'language_name': languagelong,
}
- subtitles_list.append(item)
+ subs_list.append(item)
page += 1
- url = SEARCH_PAGE_URL % {'page': page, 'query':
urllib.quote_plus(searchstring)}
- content = geturl(url)
- # Bubble sort, to put syncs on top
- for n in range(len(subtitles_list)):
- for i in range(1, len(subtitles_list)):
- temp = subtitles_list[i]
- if subtitles_list[i]["sync"] > subtitles_list[i - 1]["sync"]:
- subtitles_list[i] = subtitles_list[i - 1]
- subtitles_list[i - 1] = temp
+ # Put subs with sync=True at the top
+ subs_list = sorted(subs_list, key=lambda s: s['sync'], reverse=True)
+
+ return subs_list
- return subtitles_list
def append_subtitle(item):
listitem = xbmcgui.ListItem(
- label=item['language_name'],
- label2=item['filename'],
- iconImage=item['rating'],
- thumbnailImage='es'
- )
+ label=item['language_name'],
+ label2=item['filename'],
+ iconImage=item['rating'],
+ thumbnailImage='es'
+ )
listitem.setProperty("sync", 'true' if item["sync"] else 'false')
listitem.setProperty("hearing_imp", 'true' if item.get("hearing_imp",
False) else 'false')
- ## below arguments are optional, it can be used to pass any info needed in
download function
- ## anything after "action=download&" will be sent to addon once user
clicks listed subtitle to downlaod
+ # Below arguments are optional, it can be used to pass any info needed in
+ # download function anything after "action=download&" will be sent to addon
+ # once user clicks listed subtitle to download
args = dict(item)
args['scriptid'] = __scriptid__
url = INTERNAL_LINK_URL % args
- ## add it to list, this can be done as many times as needed for all
subtitles found
- xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=url,
listitem=listitem, isFolder=False)
+ # Add it to list, this can be done as many times as needed for all
+ # subtitles found
+ xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
+ url=url,
+ listitem=listitem,
+ isFolder=False)
+
def Search(item):
"""Called when searching for subtitles from XBMC."""
- #### Do what's needed to get the list of subtitles from service site
- #### use item["some_property"] that was set earlier
- #### once done, set xbmcgui.ListItem() below and pass it to
xbmcplugin.addDirectoryItem()
+ # Do what's needed to get the list of subtitles from service site
+ # use item["some_property"] that was set earlier.
+ # Once done, set xbmcgui.ListItem() below and pass it to
+ # xbmcplugin.addDirectoryItem()
file_original_path = item['file_original_path']
title = item['title']
tvshow = item['tvshow']
@@ -192,10 +212,11 @@ def Search(item):
for sub in subtitles_list:
append_subtitle(sub)
+
def Download(id, filename):
"""Called when subtitle download request from XBMC."""
- # Cleanup temp dir, we recomend you download/unzip your subs in temp
folder and
- # pass that to XBMC to copy and activate
+ # Cleanup temp dir, we recomend you download/unzip your subs in temp folder
+ # and pass that to XBMC to copy and activate
if xbmcvfs.exists(__temp__):
shutil.rmtree(__temp__)
xbmcvfs.mkdirs(__temp__)
@@ -214,12 +235,13 @@ def Download(id, filename):
if header == 'Rar!':
local_tmp_file = pjoin(__temp__, "subdivx.rar")
packed = True
- elif header == 'PK':
+ elif header == 'PK\x03\x04':
local_tmp_file = pjoin(__temp__, "subdivx.zip")
packed = True
else:
- # never found/downloaded an unpacked subtitles file, but just to
be sure ...
- # assume unpacked sub file is an '.srt'
+ # Never found/downloaded an unpacked subtitles file, but just to be
+ # sure ...
+ # Assume unpacked sub file is a '.srt'
local_tmp_file = pjoin(__temp__, "subdivx.srt")
subs_file = local_tmp_file
packed = False
@@ -228,12 +250,12 @@ def Download(id, filename):
local_file_handle = open(local_tmp_file, "wb")
local_file_handle.write(content)
local_file_handle.close()
- except:
+ except Exception:
log(u"Failed to save subtitles to '%s'" % (local_tmp_file,))
if packed:
files = os.listdir(__temp__)
init_filecount = len(files)
- log(u"subdivx: número de init_filecount %s" % (init_filecount,))
#EGO
+ log(u"subdivx: número de init_filecount %s" % (init_filecount,))
# EGO
filecount = init_filecount
max_mtime = 0
# Determine the newest file from __temp__
@@ -243,15 +265,18 @@ def Download(id, filename):
if mtime > max_mtime:
max_mtime = mtime
init_max_mtime = max_mtime
- # Wait 2 seconds so that the unpacked files are at least 1 second
newer
+ # Wait 2 seconds so that the unpacked files are at least 1 second
+ # newer
time.sleep(2)
xbmc.executebuiltin("XBMC.Extract(" +
local_tmp_file.encode("utf-8") + ", " + __temp__.encode("utf-8") +")")
waittime = 0
- while filecount == init_filecount and waittime < 20 and
init_max_mtime == max_mtime: # nothing yet extracted
+ while filecount == init_filecount and waittime < 20 and
init_max_mtime == max_mtime:
+ # Nothing yet extracted
time.sleep(1) # wait 1 second to let the builtin function
'XBMC.extract' unpack
files = os.listdir(__temp__)
filecount = len(files)
- # determine if there is a newer file created in __temp__
(marks that the extraction had completed)
+ # Determine if there is a newer file created in __temp__ (marks
+ # that the extraction had completed)
for file in files:
if file.split('.')[-1] in SUB_EXTS:
mtime = os.stat(pjoin(__temp__,
file.decode("utf-8"))).st_mtime
@@ -275,9 +300,11 @@ def Download(id, filename):
subtitles_list.append(subs_file)
return subtitles_list
+
def normalizeString(str):
return unicodedata.normalize('NFKD', unicode(unicode(str,
'utf-8'))).encode('ascii', 'ignore')
+
def get_params():
param = []
paramstring = sys.argv[2]
@@ -285,7 +312,7 @@ def get_params():
params = paramstring
cleanedparams = params.replace('?', '')
if params.endswith('/'):
- params = params[:-2] # XXX: Should be [:-1] ?
+ params = params[:-2] # XXX: Should be [:-1] ?
pairsofparams = cleanedparams.split('&')
param = {}
for pair in pairsofparams:
@@ -296,56 +323,66 @@ def get_params():
return param
-# Get parameters from XBMC and launch actions
-params = get_params()
-
-if params['action'] == 'search':
- item = {}
- item['temp'] = False
- item['rar'] = False
- item['year'] = xbmc.getInfoLabel("VideoPlayer.Year")
# Year
- item['season'] = str(xbmc.getInfoLabel("VideoPlayer.Season"))
# Season
- item['episode'] = str(xbmc.getInfoLabel("VideoPlayer.Episode"))
# Episode
- item['tvshow'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.TVshowtitle")) # Show
- item['title'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle")) # try to get
original title
- item['file_original_path'] =
urllib.unquote(xbmc.Player().getPlayingFile().decode('utf-8')) # Full path of
a playing file
- item['3let_language'] = []
- item['2let_language'] = []
-
- for lang in urllib.unquote(params['languages']).decode('utf-8').split(","):
- item['3let_language'].append(xbmc.convertLanguage(lang,
xbmc.ISO_639_2))
- item['2let_language'].append(xbmc.convertLanguage(lang,
xbmc.ISO_639_1))
-
- if not item['title']:
- # no original title, get just Title
- item['title'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.Title"))
-
- if "s" in item['episode'].lower():
- # Check if season is "Special"
- item['season'] = "0"
- item['episode'] = item['episode'][-1:]
-
- if "http" in item['file_original_path']:
- item['temp'] = True
-
- elif "rar://" in item['file_original_path']:
- item['rar'] = True
- item['file_original_path'] =
os.path.dirname(item['file_original_path'][6:])
-
- elif "stack://" in item['file_original_path']:
- stackPath = item['file_original_path'].split(" , ")
- item['file_original_path'] = stackPath[0][8:]
-
- Search(item)
-
-elif params['action'] == 'download':
- # we pickup all our arguments sent from def Search()
- subs = Download(params["id"], params["filename"])
- # we can return more than one subtitle for multi CD versions, for now we
- # are still working out how to handle that in XBMC core
- for sub in subs:
- listitem = xbmcgui.ListItem(label=sub)
- xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=sub,
listitem=listitem, isFolder=False)
-
-# Send end of directory to XBMC
-xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+def main():
+ """Main entry point of the scritp when it is invoked by XBMC."""
+
+ # Get parameters from XBMC and launch actions
+ params = get_params()
+
+ if params['action'] == 'search':
+ item = {}
+ item['temp'] = False
+ item['rar'] = False
+ item['year'] = xbmc.getInfoLabel("VideoPlayer.Year")
+ item['season'] =
str(xbmc.getInfoLabel("VideoPlayer.Season"))
+ item['episode'] =
str(xbmc.getInfoLabel("VideoPlayer.Episode"))
+ item['tvshow'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.TVshowtitle"))
+ # Try to get original title
+ item['title'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle"))
+ # Full path of a playing file
+ item['file_original_path'] =
urllib.unquote(xbmc.Player().getPlayingFile().decode('utf-8'))
+ item['3let_language'] = []
+ item['2let_language'] = []
+
+ for lang in
urllib.unquote(params['languages']).decode('utf-8').split(","):
+ item['3let_language'].append(xbmc.convertLanguage(lang,
xbmc.ISO_639_2))
+ item['2let_language'].append(xbmc.convertLanguage(lang,
xbmc.ISO_639_1))
+
+ if not item['title']:
+ # No original title, get just Title
+ item['title'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.Title"))
+
+ if "s" in item['episode'].lower():
+ # Check if season is "Special"
+ item['season'] = "0"
+ item['episode'] = item['episode'][-1:]
+
+ if "http" in item['file_original_path']:
+ item['temp'] = True
+
+ elif "rar://" in item['file_original_path']:
+ item['rar'] = True
+ item['file_original_path'] =
os.path.dirname(item['file_original_path'][6:])
+
+ elif "stack://" in item['file_original_path']:
+ stackPath = item['file_original_path'].split(" , ")
+ item['file_original_path'] = stackPath[0][8:]
+
+ Search(item)
+
+ elif params['action'] == 'download':
+ # We pickup all our arguments sent from def Search()
+ subs = Download(params["id"], params["filename"])
+ # We can return more than one subtitle for multi CD versions, for now
+ # we are still working out how to handle that in XBMC core
+ for sub in subs:
+ listitem = xbmcgui.ListItem(label=sub)
+ xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=sub,
listitem=listitem, isFolder=False)
+
+ # Send end of directory to XBMC
+ xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+
+if __name__ == '__main__':
+ main()
-----------------------------------------------------------------------
Summary of changes:
service.subtitles.subdivx/addon.xml | 2 +-
service.subtitles.subdivx/changelog.txt | 5 +
service.subtitles.subdivx/service.py | 345 +++++++++++++++++--------------
3 files changed, 197 insertions(+), 155 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos. Get
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://www.subdivx.com/pais/2.gif"](http://www.subdivx.com/pais/2.gif"){kind=link}