From 8e0a2453708049c8ae574af5739c216baefa5c18 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Mon, 25 Feb 2013 20:53:47 +0100 Subject: [PATCH] opensub languages --- modules/opensubtitles/backend.py | 5 ++--- modules/opensubtitles/browser.py | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/opensubtitles/backend.py b/modules/opensubtitles/backend.py index 52f6fa6e..e1b8acac 100644 --- a/modules/opensubtitles/backend.py +++ b/modules/opensubtitles/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.subtitle import ICapSubtitle from weboob.tools.backend import BaseBackend -from .browser import OpensubtitlesBrowser +from .browser import OpensubtitlesBrowser,LANGUAGE_CONV from urllib import quote_plus @@ -34,7 +34,6 @@ class OpensubtitlesBackend(BaseBackend, ICapSubtitle): VERSION = '0.f' DESCRIPTION = 'Opensubtitles subtitle website' LICENSE = 'AGPLv3+' - LANGUAGE_CONV = {'fr':'fre','en':'eng'} BROWSER = OpensubtitlesBrowser def create_default_browser(self): @@ -51,6 +50,6 @@ class OpensubtitlesBackend(BaseBackend, ICapSubtitle): return self.browser.openurl(subtitle.url.encode('utf-8')).read() def iter_subtitles(self, language, pattern): - if language not in self.LANGUAGE_CONV.keys(): + if language not in LANGUAGE_CONV.keys(): return [] return self.browser.iter_subtitles(language,quote_plus(pattern.encode('utf-8'))) diff --git a/modules/opensubtitles/browser.py b/modules/opensubtitles/browser.py index 283f5c2f..596e43b7 100644 --- a/modules/opensubtitles/browser.py +++ b/modules/opensubtitles/browser.py @@ -25,6 +25,23 @@ from .pages import SubtitlesPage, SearchPage, SubtitlePage __all__ = ['OpensubtitlesBrowser'] +LANGUAGE_CONV = { +'ar':'ara', 'eo':'epo', 'ga':'', 'ru':'rus', +'af':'' , 'et':'est', 'it':'ita', 'sr':'scc', +'sq':'alb', 'tl':'' , 'ja':'jpn', 'sk':'slo', +'hy':'arm', 'fi':'fin', 'kn':'', 'sl':'slv', +'az':'' , 'fr':'fre', 'ko':'kor', 'es':'spa', +'eu':'baq', 'gl':'glg', 'la':'', 'sw':'swa', +'be':'' , 'ka':'geo', 'lv':'lav', 'sv':'swe', +'bn':'ben', 'de':'ger', 'lt':'lit', 'ta':'', +'bg':'bul', 'gr':'ell', 'mk':'mac', 'te':'tel', +'ca':'cat', 'gu':'' , 'ms':'may', 'th':'tha', +'zh':'chi', 'ht':'' , 'mt':'', 'tr':'tur', +'hr':'hrv', 'iw':'heb', 'no':'nor', 'uk':'ukr', +'cz':'cze', 'hi':'hin', 'fa':'per', 'ur':'urd', +'da':'dan', 'hu':'hun', 'pl':'pol', 'vi':'vie', +'nl':'dut', 'is':'ice', 'pt':'por', 'cy':'', +'en':'eng', 'id':'ind', 'ro':'rum', 'yi':''} class OpensubtitlesBrowser(BaseBrowser): DOMAIN = 'www.opensubtitles.org' @@ -37,10 +54,9 @@ class OpensubtitlesBrowser(BaseBrowser): 'http://www.opensubtitles.org.*search/imdbid.*/sublanguageid.*/moviename.*' : SubtitlesPage, 'http://www.opensubtitles.org.*subtitles/[0-9]*/.*' : SubtitlePage } - LANGUAGE_CONV = {'fr':'fre','en':'eng'} def iter_subtitles(self, language, pattern): - lang = self.LANGUAGE_CONV[language] + lang = LANGUAGE_CONV[language] self.location('http://www.opensubtitles.org/search2/sublanguageid-%s/moviename-%s' % (lang,pattern.encode('utf-8'))) assert self.is_on_page(SearchPage) or self.is_on_page(SubtitlesPage) or self.is_on_page(SubtitlePage) return self.page.iter_subtitles()