|
|
|
@ -3,43 +3,36 @@
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import io
|
|
|
|
import io
|
|
|
|
import logging
|
|
|
|
import logging
|
|
|
|
import math
|
|
|
|
|
|
|
|
import re
|
|
|
|
import re
|
|
|
|
import time
|
|
|
|
from datetime import datetime
|
|
|
|
|
|
|
|
import dateutil.parser
|
|
|
|
|
|
|
|
|
|
|
|
import rarfile
|
|
|
|
import rarfile
|
|
|
|
|
|
|
|
|
|
|
|
from bs4 import BeautifulSoup
|
|
|
|
|
|
|
|
from zipfile import ZipFile, is_zipfile
|
|
|
|
from zipfile import ZipFile, is_zipfile
|
|
|
|
from rarfile import RarFile, is_rarfile
|
|
|
|
from rarfile import RarFile, is_rarfile
|
|
|
|
from babelfish import language_converters, Script
|
|
|
|
from babelfish import language_converters, Script
|
|
|
|
from requests import RequestException
|
|
|
|
from requests import RequestException, codes as request_codes
|
|
|
|
from guessit import guessit
|
|
|
|
from guessit import guessit
|
|
|
|
from subliminal_patch.http import RetryingCFSession
|
|
|
|
from subliminal_patch.http import RetryingCFSession
|
|
|
|
from subliminal_patch.providers import Provider
|
|
|
|
from subliminal_patch.providers import Provider
|
|
|
|
from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin
|
|
|
|
from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin
|
|
|
|
from subliminal_patch.subtitle import Subtitle
|
|
|
|
from subliminal_patch.subtitle import Subtitle
|
|
|
|
from subliminal_patch.utils import sanitize, fix_inconsistent_naming as _fix_inconsistent_naming
|
|
|
|
from subliminal_patch.utils import sanitize, fix_inconsistent_naming as _fix_inconsistent_naming
|
|
|
|
from subliminal.exceptions import ProviderError
|
|
|
|
from subliminal.exceptions import ProviderError, AuthenticationError, ConfigurationError
|
|
|
|
from subliminal.score import get_equivalent_release_groups
|
|
|
|
from subliminal.score import get_equivalent_release_groups
|
|
|
|
from subliminal.utils import sanitize_release_group
|
|
|
|
from subliminal.utils import sanitize_release_group
|
|
|
|
from subliminal.subtitle import guess_matches
|
|
|
|
from subliminal.subtitle import guess_matches
|
|
|
|
from subliminal.video import Episode, Movie
|
|
|
|
from subliminal.video import Episode, Movie
|
|
|
|
from subliminal.subtitle import fix_line_ending
|
|
|
|
from subliminal.subtitle import fix_line_ending
|
|
|
|
from subliminal_patch.pitcher import pitchers, load_verification, store_verification
|
|
|
|
|
|
|
|
from subzero.language import Language
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
from random import randint
|
|
|
|
from subzero.language import Language
|
|
|
|
from .utils import FIRST_THOUSAND_OR_SO_USER_AGENTS as AGENT_LIST
|
|
|
|
from dogpile.cache.api import NO_VALUE
|
|
|
|
|
|
|
|
from subliminal.cache import region
|
|
|
|
from six.moves import map
|
|
|
|
from six.moves import map
|
|
|
|
|
|
|
|
|
|
|
|
# parsing regex definitions
|
|
|
|
# parsing regex definitions
|
|
|
|
title_re = re.compile(r'(?P<title>(?:.+(?= [Aa][Kk][Aa] ))|.+)(?:(?:.+)(?P<altitle>(?<= [Aa][Kk][Aa] ).+))?')
|
|
|
|
title_re = re.compile(r'(?P<title>(?:.+(?= [Aa][Kk][Aa] ))|.+)(?:(?:.+)(?P<altitle>(?<= [Aa][Kk][Aa] ).+))?')
|
|
|
|
lang_re = re.compile(r'(?<=flags/)(?P<lang>.{2})(?:.)(?P<script>c?)(?:.+)')
|
|
|
|
|
|
|
|
season_re = re.compile(r'Sezona (?P<season>\d+)')
|
|
|
|
|
|
|
|
episode_re = re.compile(r'Epizoda (?P<episode>\d+)')
|
|
|
|
|
|
|
|
year_re = re.compile(r'(?P<year>\d+)')
|
|
|
|
|
|
|
|
fps_re = re.compile(r'fps: (?P<fps>.+)')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def fix_inconsistent_naming(title):
|
|
|
|
def fix_inconsistent_naming(title):
|
|
|
|
@ -53,6 +46,7 @@ def fix_inconsistent_naming(title):
|
|
|
|
return _fix_inconsistent_naming(title, {"DC's Legends of Tomorrow": "Legends of Tomorrow",
|
|
|
|
return _fix_inconsistent_naming(title, {"DC's Legends of Tomorrow": "Legends of Tomorrow",
|
|
|
|
"Marvel's Jessica Jones": "Jessica Jones"})
|
|
|
|
"Marvel's Jessica Jones": "Jessica Jones"})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
|
|
|
|
# Configure :mod:`rarfile` to use the same path separator as :mod:`zipfile`
|
|
|
|
# Configure :mod:`rarfile` to use the same path separator as :mod:`zipfile`
|
|
|
|
@ -64,9 +58,9 @@ language_converters.register('titlovi = subliminal_patch.converters.titlovi:Titl
|
|
|
|
class TitloviSubtitle(Subtitle):
|
|
|
|
class TitloviSubtitle(Subtitle):
|
|
|
|
provider_name = 'titlovi'
|
|
|
|
provider_name = 'titlovi'
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, language, page_link, download_link, sid, releases, title, alt_title=None, season=None,
|
|
|
|
def __init__(self, language, download_link, sid, releases, title, alt_title=None, season=None,
|
|
|
|
episode=None, year=None, fps=None, asked_for_release_group=None, asked_for_episode=None):
|
|
|
|
episode=None, year=None, rating=None, download_count=None, asked_for_release_group=None, asked_for_episode=None):
|
|
|
|
super(TitloviSubtitle, self).__init__(language, page_link=page_link)
|
|
|
|
super(TitloviSubtitle, self).__init__(language)
|
|
|
|
self.sid = sid
|
|
|
|
self.sid = sid
|
|
|
|
self.releases = self.release_info = releases
|
|
|
|
self.releases = self.release_info = releases
|
|
|
|
self.title = title
|
|
|
|
self.title = title
|
|
|
|
@ -75,11 +69,21 @@ class TitloviSubtitle(Subtitle):
|
|
|
|
self.episode = episode
|
|
|
|
self.episode = episode
|
|
|
|
self.year = year
|
|
|
|
self.year = year
|
|
|
|
self.download_link = download_link
|
|
|
|
self.download_link = download_link
|
|
|
|
self.fps = fps
|
|
|
|
self.rating = rating
|
|
|
|
|
|
|
|
self.download_count = download_count
|
|
|
|
self.matches = None
|
|
|
|
self.matches = None
|
|
|
|
self.asked_for_release_group = asked_for_release_group
|
|
|
|
self.asked_for_release_group = asked_for_release_group
|
|
|
|
self.asked_for_episode = asked_for_episode
|
|
|
|
self.asked_for_episode = asked_for_episode
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
|
|
|
|
if self.season and self.episode:
|
|
|
|
|
|
|
|
return '<%s "%s (%r)" s%.2de%.2d [%s:%s] ID:%r R:%.2f D:%r>' % (
|
|
|
|
|
|
|
|
self.__class__.__name__, self.title, self.year, self.season, self.episode, self.language, self._guessed_encoding, self.sid,
|
|
|
|
|
|
|
|
self.rating, self.download_count)
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
return '<%s "%s (%r)" [%s:%s] ID:%r R:%.2f D:%r>' % (
|
|
|
|
|
|
|
|
self.__class__.__name__, self.title, self.year, self.language, self._guessed_encoding, self.sid, self.rating, self.download_count)
|
|
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
@property
|
|
|
|
def id(self):
|
|
|
|
def id(self):
|
|
|
|
return self.sid
|
|
|
|
return self.sid
|
|
|
|
@ -136,20 +140,62 @@ class TitloviSubtitle(Subtitle):
|
|
|
|
class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
|
|
|
|
class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
|
|
|
|
subtitle_class = TitloviSubtitle
|
|
|
|
subtitle_class = TitloviSubtitle
|
|
|
|
languages = {Language.fromtitlovi(l) for l in language_converters['titlovi'].codes} | {Language.fromietf('sr-Latn')}
|
|
|
|
languages = {Language.fromtitlovi(l) for l in language_converters['titlovi'].codes} | {Language.fromietf('sr-Latn')}
|
|
|
|
server_url = 'https://titlovi.com'
|
|
|
|
api_url = 'https://kodi.titlovi.com/api/subtitles'
|
|
|
|
search_url = server_url + '/titlovi/?'
|
|
|
|
api_gettoken_url = api_url + '/gettoken'
|
|
|
|
download_url = server_url + '/download/?type=1&mediaid='
|
|
|
|
api_search_url = api_url + '/search'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, username=None, password=None):
|
|
|
|
|
|
|
|
if not all((username, password)):
|
|
|
|
|
|
|
|
raise ConfigurationError('Username and password must be specified')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.username = username
|
|
|
|
|
|
|
|
self.password = password
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.session = None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.user_id = None
|
|
|
|
|
|
|
|
self.login_token = None
|
|
|
|
|
|
|
|
self.token_exp = None
|
|
|
|
|
|
|
|
|
|
|
|
def initialize(self):
|
|
|
|
def initialize(self):
|
|
|
|
self.session = RetryingCFSession()
|
|
|
|
self.session = RetryingCFSession()
|
|
|
|
#load_verification("titlovi", self.session)
|
|
|
|
#load_verification("titlovi", self.session)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
token = region.get("titlovi_token")
|
|
|
|
|
|
|
|
if token is not NO_VALUE:
|
|
|
|
|
|
|
|
self.user_id, self.login_token, self.token_exp = token
|
|
|
|
|
|
|
|
if datetime.now() > self.token_exp:
|
|
|
|
|
|
|
|
logger.debug('Token expired')
|
|
|
|
|
|
|
|
self.log_in()
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
logger.debug('Use cached token')
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
logger.debug('Token not found in cache')
|
|
|
|
|
|
|
|
self.log_in()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def log_in(self):
|
|
|
|
|
|
|
|
login_params = dict(username=self.username, password=self.password, json=True)
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
response = self.session.post(self.api_gettoken_url, params=login_params)
|
|
|
|
|
|
|
|
if response.status_code == request_codes.ok:
|
|
|
|
|
|
|
|
resp_json = response.json()
|
|
|
|
|
|
|
|
self.login_token = resp_json.get('Token')
|
|
|
|
|
|
|
|
self.user_id = resp_json.get('UserId')
|
|
|
|
|
|
|
|
self.token_exp = dateutil.parser.parse(resp_json.get('ExpirationDate'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
region.set("titlovi_token", [self.user_id, self.login_token, self.token_exp])
|
|
|
|
|
|
|
|
logger.debug('New token obtained')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
elif response.status_code == request_codes.unauthorized:
|
|
|
|
|
|
|
|
raise AuthenticationError('Login failed')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
except RequestException as e:
|
|
|
|
|
|
|
|
logger.error(e)
|
|
|
|
def terminate(self):
|
|
|
|
def terminate(self):
|
|
|
|
self.session.close()
|
|
|
|
self.session.close()
|
|
|
|
|
|
|
|
|
|
|
|
def query(self, languages, title, season=None, episode=None, year=None, video=None):
|
|
|
|
def query(self, languages, title, season=None, episode=None, year=None, imdb_id=None, video=None):
|
|
|
|
items_per_page = 10
|
|
|
|
search_params = dict()
|
|
|
|
current_page = 1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
used_languages = languages
|
|
|
|
used_languages = languages
|
|
|
|
lang_strings = [str(lang) for lang in used_languages]
|
|
|
|
lang_strings = [str(lang) for lang in used_languages]
|
|
|
|
@ -164,111 +210,59 @@ class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
|
|
|
|
langs = '|'.join(map(str, [l.titlovi for l in used_languages]))
|
|
|
|
langs = '|'.join(map(str, [l.titlovi for l in used_languages]))
|
|
|
|
|
|
|
|
|
|
|
|
# set query params
|
|
|
|
# set query params
|
|
|
|
params = {'prijevod': title, 'jezik': langs}
|
|
|
|
search_params['query'] = title
|
|
|
|
|
|
|
|
search_params['lang'] = langs
|
|
|
|
is_episode = False
|
|
|
|
is_episode = False
|
|
|
|
if season and episode:
|
|
|
|
if season and episode:
|
|
|
|
is_episode = True
|
|
|
|
is_episode = True
|
|
|
|
params['s'] = season
|
|
|
|
search_params['season'] = season
|
|
|
|
params['e'] = episode
|
|
|
|
search_params['episode'] = episode
|
|
|
|
if year:
|
|
|
|
#if year:
|
|
|
|
params['g'] = year
|
|
|
|
# search_params['year'] = year
|
|
|
|
|
|
|
|
if imdb_id:
|
|
|
|
|
|
|
|
search_params['imdbID'] = imdb_id
|
|
|
|
|
|
|
|
|
|
|
|
# loop through paginated results
|
|
|
|
# loop through paginated results
|
|
|
|
logger.info('Searching subtitles %r', params)
|
|
|
|
logger.info('Searching subtitles %r', search_params)
|
|
|
|
subtitles = []
|
|
|
|
subtitles = []
|
|
|
|
|
|
|
|
query_results = []
|
|
|
|
|
|
|
|
|
|
|
|
while True:
|
|
|
|
|
|
|
|
# query the server
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
r = self.session.get(self.search_url, params=params, timeout=10)
|
|
|
|
|
|
|
|
r.raise_for_status()
|
|
|
|
|
|
|
|
except RequestException as e:
|
|
|
|
|
|
|
|
logger.exception('RequestException %s', e)
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
soup = BeautifulSoup(r.content, 'lxml')
|
|
|
|
search_params['token'] = self.login_token
|
|
|
|
|
|
|
|
search_params['userid'] = self.user_id
|
|
|
|
|
|
|
|
search_params['json'] = True
|
|
|
|
|
|
|
|
|
|
|
|
# number of results
|
|
|
|
response = self.session.get(self.api_search_url, params=search_params)
|
|
|
|
result_count = int(soup.select_one('.results_count b').string)
|
|
|
|
resp_json = response.json()
|
|
|
|
except:
|
|
|
|
if resp_json['SubtitleResults']:
|
|
|
|
result_count = None
|
|
|
|
query_results.extend(resp_json['SubtitleResults'])
|
|
|
|
|
|
|
|
|
|
|
|
# exit if no results
|
|
|
|
|
|
|
|
if not result_count:
|
|
|
|
|
|
|
|
if not subtitles:
|
|
|
|
|
|
|
|
logger.debug('No subtitles found')
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
logger.debug("No more subtitles found")
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# number of pages with results
|
|
|
|
except Exception as e:
|
|
|
|
pages = int(math.ceil(result_count / float(items_per_page)))
|
|
|
|
logger.error(e)
|
|
|
|
|
|
|
|
|
|
|
|
# get current page
|
|
|
|
for sub in query_results:
|
|
|
|
if 'pg' in params:
|
|
|
|
|
|
|
|
current_page = int(params['pg'])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
sublist = soup.select('section.titlovi > ul.titlovi > li.subtitleContainer.canEdit')
|
|
|
|
|
|
|
|
for sub in sublist:
|
|
|
|
|
|
|
|
# subtitle id
|
|
|
|
|
|
|
|
sid = sub.find(attrs={'data-id': True}).attrs['data-id']
|
|
|
|
|
|
|
|
# get download link
|
|
|
|
|
|
|
|
download_link = self.download_url + sid
|
|
|
|
|
|
|
|
# title and alternate title
|
|
|
|
# title and alternate title
|
|
|
|
match = title_re.search(sub.a.string)
|
|
|
|
match = title_re.search(sub.get('Title'))
|
|
|
|
if match:
|
|
|
|
if match:
|
|
|
|
_title = match.group('title')
|
|
|
|
_title = match.group('title')
|
|
|
|
alt_title = match.group('altitle')
|
|
|
|
alt_title = match.group('altitle')
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|
# page link
|
|
|
|
|
|
|
|
page_link = self.server_url + sub.a.attrs['href']
|
|
|
|
|
|
|
|
# subtitle language
|
|
|
|
|
|
|
|
_lang = sub.select_one('.lang')
|
|
|
|
|
|
|
|
match = lang_re.search(_lang.attrs.get('src', _lang.attrs.get('data-cfsrc', '')))
|
|
|
|
|
|
|
|
if match:
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
# decode language
|
|
|
|
|
|
|
|
lang = Language.fromtitlovi(match.group('lang')+match.group('script'))
|
|
|
|
|
|
|
|
except ValueError:
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# relase year or series start year
|
|
|
|
|
|
|
|
match = year_re.search(sub.find(attrs={'data-id': True}).parent.i.string)
|
|
|
|
|
|
|
|
if match:
|
|
|
|
|
|
|
|
r_year = int(match.group('year'))
|
|
|
|
|
|
|
|
# fps
|
|
|
|
|
|
|
|
match = fps_re.search(sub.select_one('.fps').string)
|
|
|
|
|
|
|
|
if match:
|
|
|
|
|
|
|
|
fps = match.group('fps')
|
|
|
|
|
|
|
|
# releases
|
|
|
|
|
|
|
|
releases = str(sub.select_one('.fps').parent.contents[0].string)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# handle movies and series separately
|
|
|
|
# handle movies and series separately
|
|
|
|
if is_episode:
|
|
|
|
if is_episode:
|
|
|
|
# season and episode info
|
|
|
|
subtitle = self.subtitle_class(Language.fromtitlovi(sub.get('Lang')), sub.get('Link'), sub.get('Id'), sub.get('Release'), _title,
|
|
|
|
sxe = sub.select_one('.s0xe0y').string
|
|
|
|
alt_title=alt_title, season=sub.get('Season'), episode=sub.get('Episode'),
|
|
|
|
r_season = None
|
|
|
|
year=sub.get('Year'), rating=sub.get('Rating'),
|
|
|
|
r_episode = None
|
|
|
|
download_count=sub.get('DownloadCount'),
|
|
|
|
if sxe:
|
|
|
|
|
|
|
|
match = season_re.search(sxe)
|
|
|
|
|
|
|
|
if match:
|
|
|
|
|
|
|
|
r_season = int(match.group('season'))
|
|
|
|
|
|
|
|
match = episode_re.search(sxe)
|
|
|
|
|
|
|
|
if match:
|
|
|
|
|
|
|
|
r_episode = int(match.group('episode'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
subtitle = self.subtitle_class(lang, page_link, download_link, sid, releases, _title,
|
|
|
|
|
|
|
|
alt_title=alt_title, season=r_season, episode=r_episode,
|
|
|
|
|
|
|
|
year=r_year, fps=fps,
|
|
|
|
|
|
|
|
asked_for_release_group=video.release_group,
|
|
|
|
asked_for_release_group=video.release_group,
|
|
|
|
asked_for_episode=episode)
|
|
|
|
asked_for_episode=episode)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
subtitle = self.subtitle_class(lang, page_link, download_link, sid, releases, _title,
|
|
|
|
subtitle = self.subtitle_class(Language.fromtitlovi(sub.get('Lang')), sub.get('Link'), sub.get('Id'), sub.get('Release'), _title,
|
|
|
|
alt_title=alt_title, year=r_year, fps=fps,
|
|
|
|
alt_title=alt_title, year=sub.get('Year'), rating=sub.get('Rating'),
|
|
|
|
|
|
|
|
download_count=sub.get('DownloadCount'),
|
|
|
|
asked_for_release_group=video.release_group)
|
|
|
|
asked_for_release_group=video.release_group)
|
|
|
|
logger.debug('Found subtitle %r', subtitle)
|
|
|
|
logger.debug('Found subtitle %r', subtitle)
|
|
|
|
|
|
|
|
|
|
|
|
@ -278,21 +272,11 @@ class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
|
|
|
|
# add found subtitles
|
|
|
|
# add found subtitles
|
|
|
|
subtitles.append(subtitle)
|
|
|
|
subtitles.append(subtitle)
|
|
|
|
|
|
|
|
|
|
|
|
finally:
|
|
|
|
|
|
|
|
soup.decompose()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# stop on last page
|
|
|
|
|
|
|
|
if current_page >= pages:
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# increment current page
|
|
|
|
|
|
|
|
params['pg'] = current_page + 1
|
|
|
|
|
|
|
|
logger.debug('Getting page %d', params['pg'])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return subtitles
|
|
|
|
return subtitles
|
|
|
|
|
|
|
|
|
|
|
|
def list_subtitles(self, video, languages):
|
|
|
|
def list_subtitles(self, video, languages):
|
|
|
|
season = episode = None
|
|
|
|
season = episode = None
|
|
|
|
|
|
|
|
|
|
|
|
if isinstance(video, Episode):
|
|
|
|
if isinstance(video, Episode):
|
|
|
|
title = video.series
|
|
|
|
title = video.series
|
|
|
|
season = video.season
|
|
|
|
season = video.season
|
|
|
|
@ -302,6 +286,7 @@ class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
|
|
|
|
|
|
|
|
|
|
|
|
return [s for s in
|
|
|
|
return [s for s in
|
|
|
|
self.query(languages, fix_inconsistent_naming(title), season=season, episode=episode, year=video.year,
|
|
|
|
self.query(languages, fix_inconsistent_naming(title), season=season, episode=episode, year=video.year,
|
|
|
|
|
|
|
|
imdb_id=video.imdb_id,
|
|
|
|
video=video)]
|
|
|
|
video=video)]
|
|
|
|
|
|
|
|
|
|
|
|
def download_subtitle(self, subtitle):
|
|
|
|
def download_subtitle(self, subtitle):
|
|
|
|
@ -339,10 +324,12 @@ class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
|
|
|
|
sub_to_extract = None
|
|
|
|
sub_to_extract = None
|
|
|
|
|
|
|
|
|
|
|
|
for sub_name in subs_in_archive:
|
|
|
|
for sub_name in subs_in_archive:
|
|
|
|
if not ('.cyr' in sub_name or '.cir' in sub_name):
|
|
|
|
_sub_name = sub_name.lower()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not ('.cyr' in _sub_name or '.cir' in _sub_name or 'cyr)' in _sub_name):
|
|
|
|
sr_lat_subs.append(sub_name)
|
|
|
|
sr_lat_subs.append(sub_name)
|
|
|
|
|
|
|
|
|
|
|
|
if ('.cyr' in sub_name or '.cir' in sub_name) and not '.lat' in sub_name:
|
|
|
|
if ('.cyr' in sub_name or '.cir' in _sub_name) and not '.lat' in _sub_name.lower():
|
|
|
|
sr_cyr_subs.append(sub_name)
|
|
|
|
sr_cyr_subs.append(sub_name)
|
|
|
|
|
|
|
|
|
|
|
|
if subtitle.language == 'sr':
|
|
|
|
if subtitle.language == 'sr':
|
|
|
|
|
Louis Vézina
5 years ago