1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-21 03:17:49 +03:00

1503 Commits

Author SHA1 Message Date
Athanasius
3ff77c3c54 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
2020-07-07 19:02:06 +01:00
Athanasius
98227b7af0
Merge pull request #562 from A-UNDERSCORE-D/enhancement/cleanup
Cleanup commodity.py (PEP8, code simplification)
2020-07-07 14:26:41 +01:00
Athanasius
273e121736 PLUGINS.md: Installation instructions on wiki 2020-07-06 18:22:02 +01:00
Athanasius
d50d141a8e README.md: Missing ) on disclaimer 2020-07-06 18:13:56 +01:00
Athanasius
2426d9381f README.md: Update forum URLs for disclaimer.
* The old-forum format URL didn't work, managed to find the post and
   get the current URL.
 * Added link to when Journal files were announced.
2020-07-06 18:09:34 +01:00
Athanasius
4d96a062da README.md: Fix 'documenation' typo 2020-07-06 17:36:12 +01:00
Athanasius
344351b1fa README.md: Minor formatting edits
* Move 'Running from source' to just after installation.
 * Consistently use '---' headings.
 * Shorten heading markdown to --- or ===
2020-07-06 17:32:11 +01:00
A_D
76e561d231
Cleanup commodity.py (PEP8, code simplification)
I removed most of the overly complex oneliners for equivalent multi-line
constructs. The code behaviour should remain the same.

Otherwise mostly reformatting happened here, spaces after commas, that
sort of thing.
2020-07-06 18:30:23 +02:00
Athanasius
38bddd9bd9 README.md: Config files and different drive -> wiki 2020-07-06 17:17:33 +01:00
Athanasius
c02cd8d9cb README.md: 'Update Error' is in the wiki Troubleshooting 2020-07-06 17:16:34 +01:00
Athanasius
032614304a README.md: Plugins? Wiki! 2020-07-06 17:14:30 +01:00
Athanasius
295087946f README.md: Main blurb is in Wiki, direct there 2020-07-06 17:12:01 +01:00
Athanasius
bff215d92e README.md: Uninstall also on Wiki now 2020-07-06 16:57:41 +01:00
Athanasius
19d043a66a README.md: Remove the "new maintainer" blurb
It's been a few weeks, anyone who was going to see it in the critical
time frame either has or hasn't now.

Leave the pointer to Discord at the top though.
2020-07-06 16:48:08 +01:00
Athanasius
ea631949ca README.md: Running from source -> wiki, Packaging -> Releasing.md 2020-07-06 16:36:49 +01:00
Athanasius
a955612e28 PRIVACY.md: This is all on the wiki 2020-07-06 16:31:04 +01:00
Athanasius
6c598ad77f README.md: Reference Wiki for "Installation" 2020-07-06 16:25:51 +01:00
Athanasius
f3401dcdea README.md: Reference wiki for Acknowledgements 2020-07-06 16:20:32 +01:00
Athanasius
f1cb5b98fa README.md: Reference Wiki for Troubleshooting
There's no point keeping this up to date in two places.

Part of reducing the 'wall of text' nature of this file.
2020-07-06 16:16:34 +01:00
Athanasius
65793bce24 Contributing.md: develop is default branch, XXX- issue number optional 2020-07-06 16:05:09 +01:00
Athanasius
733047c11b Releasing.md: Release tags are Release/A.B.C.D 2020-07-06 16:04:27 +01:00
Athanasius
2f9b564f90 Merge branch 'develop' into python3 2020-07-05 20:50:29 +01:00
Athanasius
e020c24f12 Merge branch 'release-3.99.2.0' into develop Release/3.99.2.0 2020-07-05 20:12:04 +01:00
Athanasius
1a22b88d8a README.md: Thank Gurra for Swedish translation 2020-07-05 20:11:37 +01:00
Athanasius
a21809d98f Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-05 20:10:51 +01:00
Athanasius
a64671015b Merge branch 'beta' into develop 2020-07-05 20:10:36 +01:00
Athanasius
87c4139bbb Merge branch 'beta' into develop 2020-07-05 20:08:52 +01:00
Athanasius
252b1a648d
Merge pull request #558 from EDCD/release-3.99.2.0
Release 3.99.2.0
2020-07-05 20:07:49 +01:00
Athanasius
c4c2a84143 Merge branch 'beta' into release-3.99.2.0 2020-07-05 20:05:50 +01:00
Athanasius
719fa082a9 Changelog for 3.99.2.0 2020-07-05 20:04:41 +01:00
Athanasius
7e838953c9 Increase version to 3.99.2.0 2020-07-05 20:01:05 +01:00
Athanasius
1a8410e9a2 Update translations ready for 3.99.2.0 2020-07-05 19:58:36 +01:00
Athanasius
26da1be135 Merge branch 'issue/549-helper-scripts' into develop 2020-07-05 19:50:32 +01:00
Athanasius
085333c80b Update issue templates 2020-07-05 19:46:02 +01:00
Athanasius
1a18c2be9b Merge branch 'develop' into python3 2020-07-05 19:41:07 +01:00
Athanasius
80cf6975a8
Merge pull request #557 from EDCD/l10n/Add-Swedish
Add Swedish Translation
2020-07-05 19:34:56 +01:00
Athanasius
72bed8fc17 Add Swedish, sv-SE, to .wxs file for installation 2020-07-05 19:30:22 +01:00
Athanasius
58078546ac Add Swedish Translationo
TODO: Add to installer setup so it will be in the next release.
2020-07-05 16:21:45 +01:00
Athanasius
e21fc8f4c5 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-05 16:16:44 +01:00
Athanasius
2de8b9b94f docs/Translations: Finalize "don't translate" phrases immediately. 2020-07-05 16:16:18 +01:00
Athanasius
d6d2ef3450
Merge pull request #554 from Athanasius/fix/Registry-Marginal-Winsparkle
Fix WinSparkle options to be under EDCD key
2020-07-04 11:52:42 +01:00
Athanasius
dbc177a02c Fix WinSparkle options to be under EDCD key
* When I changed 'company_name' in setup.py to 'EDCD' this caused WinSparkle to
   store, and look for, its keys there.
 * There's code in config.py that attempts to set some WinSparkle options, only
   if they weren't already there.  This is hardcoded to use the old 'Marginal'
   Registry Key.

So, explicitly do this WinSparkle setup under 'EDCD', and *always* set the
update_interval value to match what we expect.  Leave the 'CheckForUpdates'
under the 'is it already here?' check so that we respect the user's choice.
2020-07-04 11:51:01 +01:00
Athanasius
c1f1d19953
Merge pull request #553 from Athanasius/fix/500-No_DISPLAY_set
theme.py: Check if we can actually get an Xorg/X11 display

closes #500
2020-07-04 10:10:36 +01:00
Athanasius
af9c44640f theme.py: Check if we can actually get an Xorg/X11 display
The added exception at least means we don't then segmentation fault in
the next line, but it also means we then hit another exception later
in the main loop as we try to create the main Tk window.

Hopefully the exception messages will be clear enough to the user.

closes #500
2020-07-04 09:37:50 +01:00
Athanasius
87d7c823a7 Changelog for 3.99.1.0 Release/3.99.1.0 2020-07-02 18:19:09 +01:00
Athanasius
46812e83e9 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-02 18:07:19 +01:00
Athanasius
bbb5c52de3 Increase version to 3.99.1.0 2020-07-02 18:06:29 +01:00
Athanasius
eecd64c8ef You need 'npm' installed to update coriolis-data
And that's where some other files come from: modules.p, ships.p
2020-07-02 18:02:45 +01:00
Athanasius
5074c0e5f1
Merge pull request #550 from EDCD/fix/546-strict_journal_file_names
Use a strict regex for matching Journal*.log files
2020-07-02 17:56:11 +01:00
Athanasius
942cbbfcfc Use a strict regex for matching Journal*.log files
A user accidentally copied a Journal file into the same directory, resulting in
a "Journal.<datetime>.<serial> - Copy.log" file.  EDMC 3.99.0.0 then picked this
up and re-sent events to EDDN, EDSM, Inara.

So, let's be strict about the filenames we consider to be valid, live, Journal
files.

 * Journal files have one basic form: Journal.YYMMDDHHMMSS.XX.log
 * In addition the word 'Beta' can be inserted just after 'Journal'

So regex '^Journal(Beta)?\.[0-9]{12}\.[0-9]{2}\.log$' matches both and nothing
else.

Test: The "copy to same directory" that originally triggered this.  EDMC no
      longer 'sees' the copy.
Test: Copied a Journal file out, renamed it to later date/time, copied that
      back in.  EDMC saw it correctly as a new file.

NB: Didn't test the "no emitter" version at monitor.py:251, but no reason to
    think it won't also work.

closes #546
2020-07-02 17:54:04 +01:00