From 6e2dbb7cd6a817a52ffa763434858b80f0e92d1e Mon Sep 17 00:00:00 2001 From: Virgil Grigoras Date: Sun, 9 Sep 2018 13:00:46 +0200 Subject: [PATCH] move current commit hash to its own file --- cps/helper.py | 8 ++++++++ cps/web.py | 17 +++++++++++++---- version | 1 + 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 version diff --git a/cps/helper.py b/cps/helper.py index d13496bc..1fcbbc9c 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -547,3 +547,11 @@ def check_unrar(unrarLocation): error=True return (error, version) +def is_sha1(sha1): + if len(sha1) != 40: + return False + try: + temp = int(sha1, 16) + except ValueError: + return False + return True diff --git a/cps/web.py b/cps/web.py index 05fd8835..07791daf 100644 --- a/cps/web.py +++ b/cps/web.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from builtins import OSError + try: from googleapiclient.errors import HttpError except ImportError: @@ -1083,14 +1085,21 @@ def get_matching_tags(): @login_required_if_no_ano def get_update_status(): status = { - 'status': False + 'status': False, + 'current_commit_hash': '' } repository_url = 'https://api.github.com/repos/janeczku/calibre-web' tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone) if request.method == "GET": - # should be automatically replaced by git with current commit hash - current_commit_id = '$Format:%H$' + # get current commit hash from file + try: + with open('version', 'r') as f: + data = f.read().replace('\n', '') + if helper.is_sha1(data): + status['current_commit_hash'] = data + except FileNotFoundError: + pass try: r = requests.get(repository_url + '/git/refs/heads/master') @@ -1108,7 +1117,7 @@ def get_update_status(): if 'error' in status: return json.dumps(status) - if 'object' in commit and commit['object']['sha'] != current_commit_id: + if 'object' in commit and commit['object']['sha'] != status['current_commit_hash']: # a new update is available try: r = requests.get(repository_url + '/git/commits/' + commit['object']['sha']) diff --git a/version b/version new file mode 100644 index 00000000..313ee7cd --- /dev/null +++ b/version @@ -0,0 +1 @@ +$Format:%H$ \ No newline at end of file