From e98008338ace7a7295bbc5d2a1d0de25e3e48c6f Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Tue, 12 Mar 2013 20:50:08 +0100 Subject: [PATCH] [suboob] language hashtable moved from opensubtitles backend to application --- modules/opensubtitles/backend.py | 2 +- modules/opensubtitles/browser.py | 3 ++- modules/opensubtitles/pages.py | 19 +------------------ weboob/applications/qcineoob/movie.py | 5 +++++ .../applications/qcineoob/ui/main_window.ui | 12 ++++++------ weboob/applications/suboob/suboob.py | 18 ++++++++++++++++++ 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/modules/opensubtitles/backend.py b/modules/opensubtitles/backend.py index ba5a20e3..80539938 100644 --- a/modules/opensubtitles/backend.py +++ b/modules/opensubtitles/backend.py @@ -18,10 +18,10 @@ # along with weboob. If not, see . from weboob.capabilities.subtitle import ICapSubtitle,LanguageNotSupported +from weboob.applications.suboob.suboob import LANGUAGE_CONV from weboob.tools.backend import BaseBackend from .browser import OpensubtitlesBrowser -from .pages import LANGUAGE_CONV from urllib import quote_plus diff --git a/modules/opensubtitles/browser.py b/modules/opensubtitles/browser.py index 727080b1..fefed5af 100644 --- a/modules/opensubtitles/browser.py +++ b/modules/opensubtitles/browser.py @@ -19,8 +19,9 @@ from weboob.tools.browser import BaseBrowser +from weboob.applications.suboob.suboob import LANGUAGE_CONV -from .pages import SubtitlesPage, SearchPage, SubtitlePage, LANGUAGE_CONV +from .pages import SubtitlesPage, SearchPage, SubtitlePage __all__ = ['OpensubtitlesBrowser'] diff --git a/modules/opensubtitles/pages.py b/modules/opensubtitles/pages.py index 5576e91a..23f7f3cc 100644 --- a/modules/opensubtitles/pages.py +++ b/modules/opensubtitles/pages.py @@ -21,29 +21,12 @@ from weboob.capabilities.subtitle import Subtitle from weboob.capabilities.base import NotAvailable from weboob.tools.browser import BasePage +from weboob.applications.suboob.suboob import LANGUAGE_CONV __all__ = ['SubtitlesPage','SubtitlePage','SearchPage'] -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 SearchPage(BasePage): """ Page which contains results as a list of movies """ diff --git a/weboob/applications/qcineoob/movie.py b/weboob/applications/qcineoob/movie.py index bcdb8802..0208fc6f 100644 --- a/weboob/applications/qcineoob/movie.py +++ b/weboob/applications/qcineoob/movie.py @@ -24,6 +24,7 @@ from PyQt4.QtGui import QFrame, QImage, QPixmap from weboob.applications.qcineoob.ui.movie_ui import Ui_Movie from weboob.capabilities.base import NotAvailable, NotLoaded +from weboob.applications.suboob.suboob import LANGUAGE_CONV class Movie(QFrame): def __init__(self, movie, parent=None): @@ -31,6 +32,10 @@ class Movie(QFrame): self.parent = parent self.ui = Ui_Movie() self.ui.setupUi(self) + langs = LANGUAGE_CONV.keys() + langs.sort() + for lang in langs: + self.ui.langCombo.addItem(lang) self.connect(self.ui.castingButton, SIGNAL("clicked()"), self.casting) self.connect(self.ui.torrentButton, SIGNAL("clicked()"), self.searchTorrent) diff --git a/weboob/applications/qcineoob/ui/main_window.ui b/weboob/applications/qcineoob/ui/main_window.ui index 7d579eb7..2b132e18 100644 --- a/weboob/applications/qcineoob/ui/main_window.ui +++ b/weboob/applications/qcineoob/ui/main_window.ui @@ -6,7 +6,7 @@ 0 0 - 700 + 748 463 @@ -108,8 +108,8 @@ 0 0 - 660 - 292 + 708 + 293 @@ -130,8 +130,8 @@ 0 0 - 660 - 292 + 78 + 18 @@ -149,7 +149,7 @@ 0 0 - 700 + 748 23 diff --git a/weboob/applications/suboob/suboob.py b/weboob/applications/suboob/suboob.py index 35842995..8e73a562 100644 --- a/weboob/applications/suboob/suboob.py +++ b/weboob/applications/suboob/suboob.py @@ -29,6 +29,24 @@ from weboob.core import CallErrors __all__ = ['Suboob'] +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':''} + def sizeof_fmt(num): for x in ['bytes', 'KB', 'MB', 'GB', 'TB']: