mirror of
https://github.com/morpheus65535/bazarr
synced 2024-12-25 01:02:19 +00:00
Merge branch 'development' into python3
# Conflicts: # views/movie.tpl
This commit is contained in:
commit
47f7944d64
3 changed files with 9 additions and 4 deletions
|
@ -204,9 +204,14 @@ def throttled_count(name):
|
|||
def update_throttled_provider():
|
||||
changed = False
|
||||
if settings.general.enabled_providers:
|
||||
for provider in settings.general.enabled_providers.lower().split(','):
|
||||
for provider in list(tp):
|
||||
if provider not in settings.general.enabled_providers:
|
||||
del tp[provider]
|
||||
settings.general.throtteled_providers = str(tp)
|
||||
changed = True
|
||||
|
||||
reason, until, throttle_desc = tp.get(provider, (None, None, None))
|
||||
|
||||
|
||||
if reason:
|
||||
now = datetime.datetime.now()
|
||||
if now < until:
|
||||
|
|
|
@ -222,7 +222,7 @@
|
|||
<td>
|
||||
%if episode['subtitles'] is not None:
|
||||
% actual_languages = ast.literal_eval(episode['subtitles'])
|
||||
% actual_languages.sort()
|
||||
% actual_languages = sorted(actual_languages, key=lambda x: (x is None, x))
|
||||
%else:
|
||||
% actual_languages = '[]'
|
||||
%end
|
||||
|
|
|
@ -171,7 +171,7 @@
|
|||
<tbody>
|
||||
<%
|
||||
subtitles_files = ast.literal_eval(str(details['subtitles']))
|
||||
subtitles_files.sort(key = lambda x: x[0])
|
||||
subtitles_files = sorted(subtitles_files, key=lambda x: (x is None, x))
|
||||
if subtitles_files is not None:
|
||||
for subtitles_file in subtitles_files:
|
||||
if subtitles_file[0].endswith(':forced'):
|
||||
|
|
Loading…
Reference in a new issue