From 41984e86a2d76a262995496aa57ba73cfcc3e6e8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Jul 2020 19:00:06 +0100 Subject: [PATCH 1/4] 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 --- EDMC.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/EDMC.py b/EDMC.py index 60687e90..2aaeee8c 100755 --- a/EDMC.py +++ b/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: From de55ff7ce088a608823c0c41fee3f0d545e6a4f0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Jul 2020 19:43:02 +0100 Subject: [PATCH 2/4] Increase appversion to 3.99.3.0 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 48e0a376..56a80925 100644 --- a/config.py +++ b/config.py @@ -8,7 +8,7 @@ from sys import platform appname = 'EDMarketConnector' applongname = 'E:D Market Connector' appcmdname = 'EDMC' -appversion = '3.99.2.0' +appversion = '3.99.3.0' copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD' update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml' From dc13a143a33723903a9b75d0aa16127a8d86390c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Jul 2020 19:47:53 +0100 Subject: [PATCH 3/4] Update Swedish translation --- L10n/sv-SE.strings | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/L10n/sv-SE.strings b/L10n/sv-SE.strings index e539ca99..d707eedd 100644 --- a/L10n/sv-SE.strings +++ b/L10n/sv-SE.strings @@ -98,7 +98,7 @@ "Default" = "Standard"; /* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */ -"Delay sending until docked" = "Sänd bara uppdatering när du är dockad"; +"Delay sending until docked" = "Skicka bara uppdateringar till EDDN när du är dockad"; /* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */ "Disable Automatic Application Updates Check when in-game" = "Leta inte efter programuppdateringar när spelet körs"; @@ -257,7 +257,7 @@ "Market data in CSV format file" = "Marknadsdata i CSV-formaterad fil"; /* [prefs.py] */ -"Market data in Trade Dangerous format file" = "Marknadsdata i Trade Dangerous-formatterad fil"; +"Market data in Trade Dangerous format file" = "Marknadsdata i Trade Dangerous-formaterad fil"; /* Empire rank. [stats.py] */ "Marquis" = "Marquis"; @@ -305,7 +305,7 @@ "Open System Preferences" = "Öppna systeminställningar"; /* Tab heading in settings. [prefs.py] */ -"Output" = "Output"; +"Output" = "Exportdata"; /* Empire rank. [stats.py] */ "Outsider" = "Outsider"; @@ -368,7 +368,7 @@ "Prince" = "Prince"; /* Help menu item. [EDMarketConnector.py] */ -"Privacy Policy" = "Privacy Policy"; +"Privacy Policy" = "Integritetspolicy"; /* CQC rank. [stats.py] */ "Professional" = "Professional"; @@ -401,7 +401,7 @@ "Recruit" = "Recruit"; /* Help menu item. [EDMarketConnector.py] */ -"Release Notes" = "Release Notes"; +"Release Notes" = "Versionsinformation"; /* Multicrew role label in main window. [EDMarketConnector.py] */ "Role" = "Roll"; @@ -416,19 +416,19 @@ "Semi Professional" = "Semi Professional"; /* [edsm.py] */ -"Send flight log and Cmdr status to EDSM" = "Sänd flight log-data och Cmdr-status till EDSM"; +"Send flight log and Cmdr status to EDSM" = "Skicka flight log-data och Cmdr-status till EDSM"; /* [inara.py] */ -"Send flight log and Cmdr status to Inara" = "Sänd flight log-data och Cmdr-status till Inara"; +"Send flight log and Cmdr status to Inara" = "Skicka flight log-data och Cmdr-status till Inara"; /* Output setting. [eddn.py] */ -"Send station data to the Elite Dangerous Data Network" = "Sänd stationsdata till Elite Dangerous Data Network"; +"Send station data to the Elite Dangerous Data Network" = "Skicka stationsdata till Elite Dangerous Data Network"; /* Output setting new in E:D 2.2. [eddn.py] */ -"Send system and scan data to the Elite Dangerous Data Network" = "Sänd system och scan-data till Elite Dangerous Data Network"; +"Send system and scan data to the Elite Dangerous Data Network" = "Skicka system och scan-data till Elite Dangerous Data Network"; /* [eddn.py] */ -"Sending data to EDDN..." = "Sänder data till EDDN..."; +"Sending data to EDDN..." = "Skickar data till EDDN..."; /* Empire rank. [stats.py] */ "Serf" = "Serf"; From c71e7b7286292c0bc209c31718a9b61d8f136b1e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Jul 2020 19:48:55 +0100 Subject: [PATCH 4/4] Changelog.md: 3.99.3.0 --- ChangeLog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index e62117ef..9ed00419 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,15 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). --- +Pre-Release 3.99.3.0 +=== +Consider this as 'beta3' for the following full '4.0.0.0' release. + +* Fix up EDMC.exe (command line tool)t d: + * Correctly report the version with `-v`. + * Don't error out on checking Journal filenames. +* Updated Swedish translation. + Pre-Release 3.99.2.0 === Consider this as 'beta2' for the following full '4.0.0.0' release.