mirror of
https://github.com/morpheus65535/bazarr
synced 2025-01-03 05:25:28 +00:00
Integrating version number
This commit is contained in:
parent
3eb17ee1ad
commit
71983f0d1e
3 changed files with 5 additions and 3 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
bazarr_version = '0.1.1'
|
||||||
|
|
||||||
from bottle import route, run, template, static_file, request, redirect
|
from bottle import route, run, template, static_file, request, redirect
|
||||||
import bottle
|
import bottle
|
||||||
bottle.debug(True)
|
bottle.debug(True)
|
||||||
|
@ -306,7 +308,7 @@ def system():
|
||||||
elif job.trigger.__str__().startswith('cron'):
|
elif job.trigger.__str__().startswith('cron'):
|
||||||
task_list.append([job.name, job.trigger.__str__(), pretty.date(job.next_run_time.replace(tzinfo=None)), job.id])
|
task_list.append([job.name, job.trigger.__str__(), pretty.date(job.next_run_time.replace(tzinfo=None)), job.id])
|
||||||
|
|
||||||
return template('system', tasks=tasks, logs=logs, base_url=base_url, task_list=task_list)
|
return template('system', tasks=tasks, logs=logs, base_url=base_url, task_list=task_list, bazarr_version=bazarr_version)
|
||||||
|
|
||||||
@route(base_url + 'execute/<taskid>')
|
@route(base_url + 'execute/<taskid>')
|
||||||
def execute_task(taskid):
|
def execute_task(taskid):
|
||||||
|
|
|
@ -20,7 +20,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
|
||||||
# We can just fastforward
|
# We can just fastforward
|
||||||
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
|
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
|
||||||
repo.checkout_tree(repo.get(remote_id))
|
repo.checkout_tree(repo.get(remote_id))
|
||||||
master_ref = repo.lookup_reference('refs/heads/master')
|
master_ref = repo.lookup_reference('refs/heads/' + branch)
|
||||||
master_ref.set_target(remote_id)
|
master_ref.set_target(remote_id)
|
||||||
repo.head.set_target(remote_id)
|
repo.head.set_target(remote_id)
|
||||||
result = 'Bazarr updated to latest version and restarting.'
|
result = 'Bazarr updated to latest version and restarting.'
|
||||||
|
|
|
@ -141,7 +141,7 @@ icon"></i></td>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached tab segment" data-tab="about">
|
<div class="ui bottom attached tab segment" data-tab="about">
|
||||||
About
|
Bazarr version: {{bazarr_version}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue