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

1535 Commits

Author SHA1 Message Date
Athanasius
ec9533d092 Updated translations: pl, pt-BR 2020-07-10 12:50:12 +01:00
Athanasius
1fd35bb119 Change URL branch 'develop' to 'main' in docs 2020-07-10 11:15:26 +01:00
Athanasius
d4706a053e We now use 'main' instead of 'master' in place of 'develop'
After 4.0.0.0 we need to not have 'develop' as default branch, so change it
now, and migrate to 'main' instead of 'master' whilst we're at it.
2020-07-10 11:07:45 +01:00
Athanasius
fb6e4b1d38
Merge pull request #578 from EDCD/issue/576-Remove-all-BPC-code
Remove last traces of 'BPC' output code
2020-07-10 10:26:08 +01:00
Athanasius
65086be1cd Remove last traces of 'BPC' output code
close #576
2020-07-10 10:25:08 +01:00
Athanasius
accc361d54
Merge pull request #577 from EDCD/fix/575-Remove-old-anonymous
Remove all use of defunct 'anonymous' option
2020-07-10 08:40:29 +01:00
Athanasius
ef3306e3f5 Remove all use of defunct 'anonymous' option
The UI for setting the 'anonymous' option was removed in
f17f5d3f257e2359d4728ce8c296d70dc5e7609f ("PKCE OAuth2 access to cAPI").
Since then there's been no way for a user to set, or unset, this option
(and the associated custom uploaderID).  However anyone with the registry keys
still set would have had them take effect.

This commit removes the last bits of code that were making use of it.

Note that the EDDN Relay anonymises all uploaderID values, so no listener
has been seeing the 'raw' values for a long time now.

close #575
2020-07-10 08:36:13 +01:00
Athanasius
cd0352d506
Merge pull request #565 from A-UNDERSCORE-D/enhancement/cleanup-companion
Cleanup companion.py
2020-07-09 16:58:22 +01:00
Athanasius
0c6f1acd59
Merge pull request #571 from EDCD/fix/display-var-errors
Pull X11 setup back out of function for 'dpy'.
2020-07-09 13:07:31 +01:00
Athanasius
94a9a9b948 Pull X11 setup back out of function for 'dpy'.
'dpy' needs to be global, and there might be other side effects.  So
just revert to this code being global.
2020-07-09 08:32:35 +01:00
A_D
1481c3d13e
Added todo, removed import
Added a TODO on the incase plugins need it line, and removed the unused
sys import
2020-07-08 21:24:15 +02:00
A_D
09f5dfff23
Replaced assert False with a clearer raise
previously this would assert False, which always raises an
AssertionError, now we raise a saner ValueError
2020-07-08 18:12:15 +02:00
Athanasius
758b726878
Merge pull request #570 from A-UNDERSCORE-D/fix/display-var-errors
Fix #568 with ENV var workaround
2020-07-08 17:07:54 +01:00
A_D
2890d33d03
Address review comments
Added a missing comma to the category_map literal
Added parens around an index that does math beforehand
Clarified HTTP/JSON error CredentialsError
2020-07-08 18:05:43 +02:00
A_D
be98365fb3
Fix #568 with ENV var workaround
EDMC.py would break due to an import chain that ends up in theme. Theme
does a whole bunch of work to setup our GUI for EDMarketConnector.py,
but it does this on any import, which will fail spectacularly if there
is either no DISPLAY var set or no X11 libs available on our machine at
all (as a sidenote this means it probably also breaks on a wholly
wayland install).

This fixes the issue by adding a check for an environment variable on
import of theme. This can and WILL break if the env var is set and
EDMarketConnector.py is used, but if you do that its your own fault.
2020-07-08 17:55:54 +02:00
A_D
dcb9853b68
Removed python2 specific code
This entire branch is py3 only, and even with this code the actual file
isn't py2 compatible syntax wise
2020-07-07 21:52:30 +02:00
Athanasius
3476956d85 Merge branch 'beta' into develop
This brings in the 3.99.3.0 changes.
2020-07-07 20:02:04 +01:00
Athanasius
c71e7b7286 Changelog.md: 3.99.3.0 Release/3.99.3.0 2020-07-07 19:48:55 +01:00
Athanasius
dc13a143a3 Update Swedish translation 2020-07-07 19:47:53 +01:00
Athanasius
de55ff7ce0 Increase appversion to 3.99.3.0 2020-07-07 19:43:02 +01:00
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
cda7d9d3f4
Merge pull request #567 from Athanasius/fix/566-cli-params
EDMC.py: import re, fix version compare and report
2020-07-07 19:01:18 +01:00
Athanasius
41984e86a2 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:00:06 +01:00
A_D
0b6ef97f41
Made dict copy clearer
While `dict(somedict)` does the same thing as `somedict.copy()`, the
.copy is clearer as to intent
2020-07-07 18:46:23 +02:00
A_D
4aa8e2ca0e
Added variable for re-used accesses
The last starport ID and name was repeatedly accessed out of a dict,
making lines longer and harder to parse
2020-07-07 18:42:16 +02:00
A_D
e739923083
Moved User Agent to constant
This is one of those things that really should be a constant anyway
2020-07-07 18:37:05 +02:00
A_D
5c4c9fd3a7
Added error messages to exceptions where possible
Adds messages to exceptions where they may be useful and I could figure
out what they should be
2020-07-07 18:30:29 +02:00
A_D
34b963620a
Removed bare except clauses
Bare except clauses are a fantastic way to find your HTTP requests
eating your ^C. I replaced all bare excepts with Exception if I could
not find a list of exceptions that could be thrown.
2020-07-07 18:21:48 +02:00
A_D
9363b1457d
Simplified if ladder
Removed a large if ladder with a simpler construct that does the same
thing
2020-07-07 16:59:03 +02:00
A_D
31e0758ee4
Replaced x in $list construct with x in $tuple
Tuples are smaller and immutable, therefore using a tuple is cleaner.
2020-07-07 15:52:45 +02:00
A_D
7260dff9a2
Replaced modulo formatting with .format calls
Modulo formatting is py2 (and C printf) style, its arcane and incredibly
hard to read for large formats.

I used keyed .formats where there were more than a few format specifiers
2020-07-07 15:52:44 +02:00
A_D
765dc0bcf3
Replaced oneline ifs with multiline ifs
Oneline ifs are in general a bad idea in whitespace significant
languages, this replaces them with their multi-line equivalents
2020-07-07 15:52:44 +02:00
A_D
56d4d13d4d
Fixed line spacing and comment length
This adds newlines after blocks and in other logical places to assist
with reading the code. Additionally, comments that were too long to
remain inline within a 120 character limit have been moved above the
line they reference.
2020-07-07 15:52:43 +02: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