mirror of
https://github.com/EDCD/EDMarketConnector.git
synced 2025-04-22 20:00:29 +03:00
EDMC.py: import re, fix version compare and report
* I neglected to `import re` when I changed the Journal file name check. * `map` isn't comparable in Python 3.7, need to `list()` it as well. * Just print the full `appversion`. The old code was assuming that none of A, B, C, D in A.B.C.D would be two or more digits. close #566
This commit is contained in:
parent
2f9b564f90
commit
41984e86a2
12
EDMC.py
12
EDMC.py
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user