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

2257 Commits

Author SHA1 Message Date
Athanasius
8ee20039f8 Comments out py2exe in requirements-dev.txt as it trips up GitHub Actions
docs/Releasing.md has fuller instructions on getting that specific
pyexe version installed anyway.
2020-08-27 12:11:49 +01:00
Athanasius
a55537e272 Remove pytest and comment out flake8 for now.
Narrowing down what's working and what isn't in this.
2020-08-27 12:11:49 +01:00
Athanasius
79b86e5d27 Add greet-example to github workflows 2020-08-27 12:11:49 +01:00
Athanasius
2546efff91 Update python-app.yml
Change to ubuntu-18.04
2020-08-27 12:11:49 +01:00
Athanasius
742d133519 Update python-app.yml
Change name to be more obvious when viewing in Actions.
2020-08-27 12:11:49 +01:00
Athanasius
a344c53b67 Create python-app.yml
Add a GitHub Action to check requirements-dev.txt, flake8, and pytest.
2020-08-27 12:11:49 +01:00
A_D
5b736cab36 Create Enhancement issue template
closes #599
2020-08-27 12:10:10 +01:00
A_D
dbcb4bb4fc clarified docs 2020-08-27 12:10:10 +01:00
A_D
1733aeae5a Replaced write out checks with guard clauses
Guard clauses reduce indentation and help when reading code as they
remove a variable and indentation level that the reader would otherwise
need to keep track of
2020-08-27 12:10:09 +01:00
A_D
8268bfe5da Removed repeated int(key)
With the previous formatting changes there is no reason to leave key as
possibly a string anywhere, as it was already being converted to an int
everywhere anyway
2020-08-27 12:10:09 +01:00
A_D
6a917acde0 Move file backup code to a method
It was repeated in various places and increased noise
2020-08-27 12:10:09 +01:00
A_D
3a2e159b1e Refactor __main__ logic
Most of this is just de-pyramiding the code, removing else clauses that
are unneeded (or making the if such that the else is not needed).
Rationale is simple, every level of indentation adds more that the
reader needs to keep track of.
2020-08-27 12:10:09 +01:00
A_D
fe3a6c11f4 replace list literals with tuples
Tuples ensure that this isnt changed at runtime
2020-08-27 12:10:09 +01:00
A_D
ed9c1c6774 Replace AssertionErrors with ValueError
AssertionError comes from `assert`s, using it for this doesn't make sense as we're complaining about values
2020-08-27 12:10:09 +01:00
A_D
fd3a4852f2 replace modulo formatting with .format 2020-08-27 12:10:09 +01:00
A_D
02d205fbee removed oneline statements 2020-08-27 12:10:09 +01:00
A_D
a7cf83d1e5 shortened line 2020-08-27 12:10:09 +01:00
A_D
8c0ab2dc75 added missing whitespace where needed 2020-08-27 12:10:09 +01:00
A_D
474c8d144f removed unused import 2020-08-27 12:10:09 +01:00
A_D
a546ecb735 Add newlines to separate scopes
Newlines between scope changes help you to not get lost when reading
source
2020-08-27 12:10:09 +01:00
A_D
7e422c73c4 Fixed code blocks 2020-08-27 12:10:09 +01:00
Athanasius
af3e8f29c7 Updated docs
Added linting, testing, and new requirements-dev.txt instructions
2020-08-27 12:10:06 +01:00
Athanasius
6ab6b23d7a Create requirements-dev.txt 2020-08-27 12:08:53 +01:00
Athanasius
80b7f03f25 Removed dev deps from requirements.txt 2020-08-27 12:08:32 +01:00
A_D
ff7d297167 Add flake8 and autopep8 to requirements.txt 2020-08-27 12:07:44 +01:00
Athanasius
253c6988ca appcast 4.0.6 2020-08-27 11:32:54 +01:00
Athanasius
a4e1a42783 Version 4.0.6 2020-08-27 11:32:50 +01:00
A_D
d31b0fdbf6 Fixed system link updating on FSDTarget
FSDTarget contains the target system under `SystemAddress`, meaning that
any time you selected a star other than the current one, plugins'
`this.system_address` was updated to that target, rather than the
current system. Said updating causes the links provided from system_url
to reflect that update (for providers that support ID64s).

This changes the journal_entry behaviour to only update
`this.system_address` when the event is any of Location, Docked,
or FSDJump, all of which contain only the current system.
2020-08-27 11:32:39 +01:00
Athanasius
a00d5df92b Update version in BOTH places on that URL line 2020-08-27 11:32:08 +01:00
Athanasius
935c852605 appcast: Update size for 4.0.5 2020-08-27 11:31:52 +01:00
Athanasius
af12816efb Release 4.0.5: version, changelog, appcast 2020-08-27 11:31:45 +01:00
Athanasius
cea26ad0cd Releasing.md: Now using Python 3.7.9 2020-08-27 11:30:25 +01:00
Athanasius
c7cdb6ad66 translations: pt-PT: "Use alternate URL method" now translated 2020-08-27 11:30:18 +01:00
Athanasius
c126251246 "Not Python 3.x" popup message sub-substitutions fixed.
string.format() doesn't assign to string, so actually need to do that.
2020-08-27 11:30:13 +01:00
Athanasius
98b6d4db38 Plugins "Not Python 3.x": Hacky escaping fix so translations work 2020-08-27 11:30:05 +01:00
Athanasius
bd7a3eca04 plugins/inara: return '' if can't otherwise make system_url 2020-08-27 11:28:41 +01:00
Athanasius
113b6c427c station providers: Ensure the 'early station' functionality for all
* If you request docking successfully then show the station namd and
  have the link work.
* This is then only undone if you:
	1) Dock and undock
	2) Supercruise away
	3) Jump away
  It is *not* undone if you simply cancel the docking request.

Tested only with same provider for system and station for each of the
three, not the other 6 combinations.
2020-08-27 11:28:36 +01:00
Athanasius
daed08d206 system/station providers: Sanitise {system,station}_url logic
* Make all plugins use `requests.utils.requote_uri()`
* Make all plugins use roughly the same logic, without if/else trees
 (as the bodies do a `return ...`), ending with `return ''` if input
 parameters are None.

 This throws away the inara fallback to `this.station or this.system` as
 it's unlikely the in-plugin tracking did a better job than the
 monitor.py code.
2020-08-27 11:28:27 +01:00
Athanasius
7617ce7e9c system/station plugin providers: Don't override 'url'
By default the ttkHyperlinkLabels for 'system' and 'station' names have
their 'url' members set to the functions in EDMarketConnector.App.

The EDDB one used to override the function as it had to do that special
name -> EDDB ID lookup from systems.p.  When I changed the code to not
need that any more I didn't fully understand what these overrides were.

After updating the EDDB code I then made sure the same logic was also in
the other plugins which meant they *also* set static strings, overriding
the call to the EDMarketConnector.App functions (which chain through to
the current plugin providers).

Unfortunately I didn't quite update the EDSM code enough causing
journal_entry() code to *not* set a new system 'url' despite changing
the 'text'.  This meant that only CAPI updates (so docking and login)
caused the URL to change, despite updating the 'text' to the correct
system name.

Rather than have everything setting static strings just do away with the
overrides as they're not needed!
2020-08-27 11:25:30 +01:00
Athanasius
f75d8c9c9c plugins/edsm: Set system_link based on system_provider, not station_provider 2020-08-27 11:23:53 +01:00
Athanasius
6e7f934a74 Translations: Change to %H:%M:%S version of 'Last updated at'
This puts this branch in sync with OneSkyApp again, the same as develop.
2020-08-27 11:11:37 +01:00
Athanasius
2a09874554 Merge branch 'releases' into stable 2020-08-26 22:49:28 +01:00
Athanasius
62ff042416 Releasing.md: Releases now tested with Python 3.7.9 2020-08-26 22:35:24 +01:00
Athanasius
4d85648e9d appcast 4.0.6 2020-08-26 18:15:44 +01:00
Athanasius
60a90e4b30 Version 4.0.6 Release/4.0.6 2020-08-26 18:12:31 +01:00
Athanasius
09351c9e17
Merge pull request #675 from A-UNDERSCORE-D/fix/early-link-update
Fixed system link updating on FSDTarget
2020-08-26 18:04:53 +01:00
A_D
d635bd8469
Fixed system link updating on FSDTarget
FSDTarget contains the target system under `SystemAddress`, meaning that
any time you selected a star other than the current one, plugins'
`this.system_address` was updated to that target, rather than the
current system. Said updating causes the links provided from system_url
to reflect that update (for providers that support ID64s).

This changes the journal_entry behaviour to only update
`this.system_address` when the event is any of Location, Docked,
or FSDJump, all of which contain only the current system.
2020-08-26 18:59:14 +02:00
Athanasius
e618f7c4b0 Update version in BOTH places on that URL line 2020-08-26 15:13:07 +01:00
Athanasius
b34faba96a Merge branch 'release-4.0.5' into releases 2020-08-26 14:45:08 +01:00
Athanasius
a862fc0860 appcast: Update size for 4.0.5 Release/4.0.5 2020-08-26 14:38:14 +01:00