Merge remote-tracking branch 'origin/development' into subliminal_patch

# Conflicts:
#	bazarr/get_subtitle.py
This commit is contained in:
panni 2018-11-29 11:29:29 +01:00
commit d126da710c
2 changed files with 4 additions and 3 deletions

View File

@ -112,8 +112,9 @@ def sync_episodes():
# Close database connection # Close database connection
c.close() c.close()
for updated_episode in episodes_to_update: # TODO: Commented until I find a way to make it store only episodes really updated.
store_subtitles(path_replace(updated_episode[1])) #for updated_episode in episodes_to_update:
# store_subtitles(path_replace(updated_episode[1]))
for added_episode in episodes_to_add: for added_episode in episodes_to_add:
store_subtitles(path_replace(added_episode[3])) store_subtitles(path_replace(added_episode[3]))

View File

@ -164,4 +164,4 @@ class PublicIPFilter(ArgsFilteringFilter):
def empty_log(): def empty_log():
fh.doRollover() fh.doRollover()