Skip to content

Commit

Permalink
updated versioncheck: more reliable source installation version detec…
Browse files Browse the repository at this point in the history 
…tion, master branch will show tagged version in GUI, removed version.py, updated .LAST_RELEASE format
  • Loading branch information
@evilhero
evilhero committed Feb 2, 2020
1 parent 851d14c commit 41e06ef
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 53 deletions.
3 changes: 2 additions & 1 deletion .LAST_RELEASE
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
[$Format:%d][%H]$
$Format:%d
%H$
11 changes: 8 additions & 3 deletions data/interfaces/default/base.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<%
import mylar
from mylar import version
%>
<!doctype html>
<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
Expand Down Expand Up @@ -40,7 +39,7 @@
</div>
% elif mylar.CURRENT_VERSION != mylar.LATEST_VERSION and mylar.INSTALL_TYPE != 'win' and mylar.COMMITS_BEHIND > 0:
<div id="updatebar">
A <a href="https://github.com/evilhero/mylar/compare/${mylar.CURRENT_VERSION}...${mylar.LATEST_VERSION}" target="_blank"> newer version</a> is available. You're ${mylar.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
A <a href="https://github.com/mylar3/mylar3/compare/${mylar.CURRENT_VERSION}...${mylar.LATEST_VERSION}" target="_blank"> newer version</a> is available. You're ${mylar.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
</div>
% endif

Expand Down Expand Up @@ -102,7 +101,13 @@
%endif
</div>
<div id="version">
Version: <em>${mylar.CURRENT_VERSION}</em>
Version: <em>
%if mylar.CURRENT_VERSION_NAME:
${mylar.CURRENT_VERSION_NAME}
%else:
${mylar.CURRENT_VERSION}
%endif
</em>
(${mylar.CONFIG.GIT_BRANCH})
</div>
</footer>
Expand Down
6 changes: 5 additions & 1 deletion data/interfaces/default/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ <h1 class="clearfix"><img src="interfaces/default/images/icon_gear.png" alt="set
<fieldset>
<legend>Configuration Options</legend>
<div>
<label><strong>Mylar Version: </strong> ${config['branch']}</br> -- ${config['br_type']} build ${config['br_version']}.</label></br>
<label><strong>Mylar Version: </strong> ${config['branch']}
%if config['br_version_name']:
[${config['br_version_name']}]
%endif
</br> -- ${config['br_type']} (build ${config['br_version']})</label></br>
<label><strong>Python Version :</strong> ${config['py_version']}</label></br>
<label><strong>Language :</strong> ${config['lang']}</label></br></br>
<legend>MYLAR PROGRAM OPTIONS</legend>
Expand Down
2 changes: 1 addition & 1 deletion mylar/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
'LOG_LEVEL': (int, 'Logs', 1),

'GIT_PATH' : (str, 'Git', None),
'GIT_USER' : (str, 'Git', 'evilhero'),
'GIT_USER' : (str, 'Git', 'mylar3'),
'GIT_BRANCH' : (str, 'Git', None),
'CHECK_GITHUB' : (bool, 'Git', False),
'CHECK_GITHUB_ON_STARTUP' : (bool, 'Git', False),
Expand Down
1 change: 0 additions & 1 deletion mylar/version.py
View file

This file was deleted.

135 changes: 90 additions & 45 deletions mylar/versioncheck.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import platform, subprocess, re, os, urllib.request, urllib.error, urllib.parse, tarfile

import mylar
from mylar import logger, version
from mylar import logger

import requests
import re
Expand Down Expand Up @@ -63,22 +63,26 @@ def runGit(args):
return (output.stdout, output.stderr)

def getVersion():
current_version_name = None

if mylar.CONFIG.GIT_BRANCH is not None and mylar.CONFIG.GIT_BRANCH.startswith('win32build'):

mylar.INSTALL_TYPE = 'win'

# Don't have a way to update exe yet, but don't want to set VERSION to None
return 'Windows Install', 'None'
return {'current_version': 'Windows Install', 'current_version_name': 'None', 'branch': 'None'}

elif os.path.isdir(os.path.join(mylar.PROG_DIR, '.git')):

mylar.INSTALL_TYPE = 'git'
output, err = runGit('rev-parse HEAD --abbrev-ref HEAD')
output, err = runGit('describe --exact-match --tags 2> /dev/null && git rev-parse HEAD --abbrev-ref HEAD')
#output, err = runGit('rev-parse HEAD --abbrev-ref HEAD')

if not output:
logger.error('Couldn\'t find latest installed version.')
cur_commit_hash = None
output, err = runGit('describe --exact-match --tags 2> /dev/null || git rev-parse HEAD --abbrev-ref HEAD')
if not output:
logger.error('Couldn\'t find latest installed version.')
cur_commit_hash = None

#branch_history, err = runGit("log --oneline --pretty=format:'%h - %ar - %s' -n 5")
#bh = []
Expand All @@ -89,19 +93,37 @@ def getVersion():
opp = output.find('\n')
cur_commit_hash = output[:opp]
cur_branch = output[opp:output.find('\n', opp+1)].strip()

if cur_commit_hash.startswith('v'):
url2 = 'https://api.github.com/repos/%s/mylar3/tags' % (mylar.CONFIG.GIT_USER)
try:
response = requests.get(url2, verify=True)
git = response.json()
except Exception as e:
logger.warn('[ERROR] %s' % e)
pass
else:
if git[0]['name'] is not None:
for x in git:
if x['name'] == output[:opp]:
current_version_name = x['name']
cur_commit_hash = x['commit']['sha']
break

logger.info('cur_commit_hash: %s' % cur_commit_hash)
logger.info('cur_branch: %s' % cur_branch)

if not re.match('^[a-z0-9]+$', cur_commit_hash):
if not re.match('^[a-z0-9]+$', cur_commit_hash) and current_version_name is None:
logger.error('Output does not look like a hash, not using it')
cur_commit_hash = None

if mylar.CONFIG.GIT_BRANCH == cur_branch:
branch = mylar.CONFIG.GIT_BRANCH

if cur_commit_hash is None:
branch = None
else:
branch = None

branch_name, err = runGit('branch --contains %s' % cur_commit_hash)
if not branch_name:
logger.warn('Could not retrieve branch name [%s] from git. Defaulting to Master.' % branch)
Expand All @@ -112,46 +134,74 @@ def getVersion():
branch = re.sub('[\*\n]','',line).strip()
break

if not branch and mylar.CONFIG.GIT_BRANCH:
logger.warn('Unable to retrieve branch name [%s] from git. Setting branch to configuration value of : %s' % (branch, mylar.CONFIG.GIT_BRANCH))
branch = mylar.CONFIG.GIT_BRANCH
if not branch:
logger.warn('Could not retrieve branch name [%s] from git. Defaulting to Master.' % branch)
branch = 'master'
else:
logger.info('Branch detected & set to : %s' % branch)
if not branch and mylar.CONFIG.GIT_BRANCH:
logger.warn('Unable to retrieve branch name [%s] from git. Setting branch to configuration value of : %s' % (branch, mylar.CONFIG.GIT_BRANCH))
branch = mylar.CONFIG.GIT_BRANCH
if not branch:
logger.warn('Could not retrieve branch name [%s] from git. Defaulting to Master.' % branch)
branch = 'master'
else:
logger.info('Branch detected & set to : %s' % branch)

return cur_commit_hash, branch
return {'current_version': cur_commit_hash, 'current_version_name': current_version_name, 'branch': branch}

else:

mylar.INSTALL_TYPE = 'source'
current_version = None
branch = None

version_file = os.path.join(mylar.PROG_DIR, 'version.txt')
url2 = 'https://api.github.com/repos/%s/mylar3/tags' % (mylar.CONFIG.GIT_USER)
try:
response = requests.get(url2, verify=True)
git = response.json()
except Exception as e:
pass

if not os.path.isfile(version_file):
current_version = None
else:
with open(version_file, 'r') as f:
current_version = f.read().strip(' \n\r')
if current_version is None:
try:
version_file = os.path.join(mylar.PROG_DIR, '.LAST_RELEASE')

if not os.path.isfile(version_file):
current_version = None
else:
cnt = 0
with open('.LAST_RELEASE', 'r') as f:
for i in f.readlines():
tmp = i.split()
if cnt == 0:
if i.find('>') != -1:
i_clean = tmp[len(tmp)-1]
mrclean = re.sub('[\)\(\>]', '', i_clean).strip()
branch = mrclean
logger.info('[LAST_RELEASE] Branch: %s' % branch)
if 'tag' in i:
i_clean = i.find('tag')
mrclean = re.sub('tag: ', '', re.sub('[\(\)]', '', i[i_clean:])).strip()
current_version_name = mrclean
logger.info('[LAST_RELEASE] Version: %s' % current_version_name)
elif cnt == 1:
current_version = i.strip()
logger.info('[LAST_RELEASE] Commit: %s' % ''.join(current_version))
cnt+=1
except Exception as e:
logger.error('error: %s' % e)

if current_version:
if mylar.CONFIG.GIT_BRANCH:
logger.info('Branch detected & set to : ' + mylar.CONFIG.GIT_BRANCH)
return current_version, mylar.CONFIG.GIT_BRANCH
return {'current_version': current_version, 'current_version_name': current_version_name, 'branch': mylar.CONFIG.GIT_BRANCH}
else:
logger.warn('No branch specified within config - will attempt to poll version from mylar')
try:
branch = version.MYLAR_VERSION
if branch:
logger.info('Branch detected & set to : ' + branch)
except:
else:
branch = 'master'
logger.info('Unable to detect branch properly - set branch in config.ini, currently defaulting to : ' + branch)
return current_version, branch
logger.warn('No branch specified within config - could not poll version from mylar. Defaulting to %s' % branch)
return {'current_version': current_version, 'current_version_name': current_version_name, 'branch': branch}
else:
if mylar.CONFIG.GIT_BRANCH:
logger.info('Branch detected & set to : ' + mylar.CONFIG.GIT_BRANCH)
return current_version, mylar.CONFIG.GIT_BRANCH
return {'current_version': current_version, 'current_version_name': current_version_name, 'branch': mylar.CONFIG.GIT_BRANCH}
else:
logger.warn('No branch specified within config - will attempt to poll version from mylar')
try:
Expand All @@ -160,7 +210,7 @@ def getVersion():
except:
branch = 'master'
logger.info('Unable to detect branch properly - set branch in config.ini, currently defaulting to : ' + branch)
return current_version, branch
return {'current_version': current_version, 'current_version_name': current_version_name, 'branch': branch}

logger.warn('Unable to determine which commit is currently being run. Defaulting to Master branch.')

Expand All @@ -175,9 +225,9 @@ def checkGithub(current_version=None):
git = response.json()
mylar.LATEST_VERSION = git['sha']
except Exception as e:
logger.warn('[ERROR] Could not get the latest commit from github: %s' % e)
mylar.COMMITS_BEHIND = 0
return mylar.CURRENT_VERSION
logger.warn('[ERROR] Could not get the latest commit from github: %s' % e)
mylar.COMMITS_BEHIND = 0
return mylar.CURRENT_VERSION

# See how many commits behind we are
if current_version is not None:
Expand Down Expand Up @@ -237,7 +287,6 @@ def update():

tar_download_url = 'https://github.com/%s/mylar/tarball/%s' % (mylar.CONFIG.GIT_USER, mylar.CONFIG.GIT_BRANCH)
update_dir = os.path.join(mylar.PROG_DIR, 'update')
version_path = os.path.join(mylar.PROG_DIR, 'version.txt')

try:
logger.info('Downloading update from: ' + tar_download_url)
Expand Down Expand Up @@ -285,17 +334,13 @@ def update():
os.remove(new_path)
os.renames(old_path, new_path)

# Update version.txt
try:
with open(version_path, 'w') as f:
f.write(str(mylar.LATEST_VERSION))
except IOError as e:
logger.error("Unable to write current version to version.txt, update not complete: %s" % ex(e))
return

def versionload():

mylar.CURRENT_VERSION, mylar.CONFIG.GIT_BRANCH = getVersion()
version_info = getVersion()
logger.info('version_info: %s' % (version_info,))
mylar.CURRENT_VERSION = version_info['current_version']
mylar.CURRENT_VERSION_NAME = version_info['current_version_name']
mylar.CONFIG.GIT_BRANCH = version_info['branch']

if mylar.CURRENT_VERSION is not None:
hash = mylar.CURRENT_VERSION[:7]
Expand All @@ -304,7 +349,7 @@ def versionload():

if mylar.CONFIG.GIT_BRANCH == 'master':
vers = 'M'
elif mylar.CONFIG.GIT_BRANCH == 'development':
elif mylar.CONFIG.GIT_BRANCH == 'python3-dev':
vers = 'D'
else:
vers = 'NONE'
Expand Down
3 changes: 2 additions & 1 deletion mylar/webserve.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5126,7 +5126,8 @@ def config(self):
"failed_auto": helpers.checked(mylar.CONFIG.FAILED_AUTO),
"branch": mylar.CONFIG.GIT_BRANCH,
"br_type": mylar.INSTALL_TYPE,
"br_version": mylar.versioncheck.getVersion()[0],
"br_version": mylar.CURRENT_VERSION,
"br_version_name": mylar.CURRENT_VERSION_NAME,
"py_version": platform.python_version(),
"data_dir": mylar.DATA_DIR,
"prog_dir": mylar.PROG_DIR,
Expand Down

0 comments on commit 41e06ef

Please sign in to comment.