mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-01-31 03:12:12 +00:00
Code Issues Releases Wiki Activity

Test

Browse source
This commit is contained in:
Louis Vézina 2017-11-22 06:37:17 -05:00
parent 47d152b457
commit 41a1e0ea5a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
check_update.py
View file

@ -28,6 +28,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
repo.head.set_target(remote_id)
result = 'Bazarr updated to latest version and restarting.'
os.execlp('python', 'python', os.path.join(os.path.dirname(__file__), 'bazarr.py'))
# We can just do it normally
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
repo.merge(remote_id)
print repo.index.conflicts
@ -43,7 +44,9 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
[repo.head.target, remote_id])
repo.state_cleanup()
result = 'Conflict detected when trying to update.'
os.execlp('python', 'python', os.path.join(os.path.dirname(__file__), 'bazarr.py'))
# We can't do it
else:
raise AssertionError('Unknown merge analysis result')
result = 'Bazarr cannot be updated: Unknown merge analysis result'
return result

2
list_subtitles.py
View file

@ -118,7 +118,7 @@ def series_scan_subtitles(no):
c_db.close()
for episode in episodes:
store_subtitles(path_replace(episode[0].encode('utf-8')))
store_subtitles(path_replace(episode[0]))
list_missing_subtitles(no)