ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-03 00:51:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #567 from Athanasius/fix/566-cli-params

Browse Source 
EDMC.py: import re, fix version compare and report
This commit is contained in:
Athanasius 2020-07-07 19:01:18 +01:00 committed by GitHub
commit cda7d9d3f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
EDMC.py
View File

@ -11,6 +11,7 @@ import os
from os.path import dirname, getmtime, join
from time import time, sleep
from xml.etree import ElementTree
import re
import l10n
l10n.Translations.install_dummy()
@ -36,7 +37,7 @@ EXIT_SUCCESS, EXIT_SERVER, EXIT_CREDENTIALS, EXIT_VERIFICATION, EXIT_LAGGING, EX
# quick and dirty version comparison assuming "strict" numeric only version numbers
def versioncmp(versionstring):
return map(int, versionstring.split('.'))
return list(map(int, versionstring.split('.')))
try:
@ -67,9 +68,10 @@ try:
lastversion = sorted(items, key=versioncmp)[-1]
if versioncmp(lastversion) > versioncmp(appversion):
latest = ' (%s is available)' % items[lastversion]
except:
pass # Quietly suppress timeouts etc.
print('%.2f%s' % (float(''.join(appversion.split('.')[:3])) / 100, latest)) # just first three digits
except Exception as e:
sys.stderr.write('Exception in version check: {}'.format(str(e)))
#pass # Quietly suppress timeouts etc.
print(appversion)
sys.exit(EXIT_SUCCESS)
if args.j:
@ -91,7 +93,7 @@ try:
if __debug__:
print('Invalid journal entry "%s"' % repr(line))
except Exception as e:
sys.stderr.write("Can't read Journal file: %s\n" % str(e).encode('ascii', 'replace'))
sys.stderr.write("Can't read Journal file: {}\n".format(str(e)))
sys.exit(EXIT_SYS_ERR)
if not monitor.cmdr: