Commit Graph
6677 Commits
Author SHA1 Message Date
Athanasius 2246278286 Odyssey Suits: Store available data from CAPI.
I've gone with 'None' for when there's no data, rather than {}.  That
makes for simpler checks on if there is data (a dict.get('foo') only
checks for that, not the dict structure otherwise).

If no 'suit' in the data we assume no Odyssey, but otherwise plough on
with dict.get() statements as they'll default to None if it's not
present.

*Users* of this monitor.state[] extra data get to choose what to do if
some data is present but not other.
2021-04-13 12:12:51 +01:00
Athanasius a70da4a522 Merge pull request #1003 from A-UNDERSCORE-D/fix/1002-linux-config-flush
Make sure that config is flushed to disk on set on linux
2021-04-13 11:20:41 +01:00
A_D f99b0445ca Also save on delete 2021-04-13 00:35:01 +02:00
A_D 3341800f71 Added missing save to test 2021-04-13 00:32:03 +02:00
A_D d4e7395a44 Ensured all sets are flushed to disk on linux
Fixes 1002
2021-04-13 00:31:58 +02:00
Athanasius c2dec59e78 Merge pull request #1001 from A-UNDERSCORE-D/fix/unicode-error-error
Fixed edge case with reading old ship loadout
2021-04-12 19:04:32 +01:00
A_D 1a9983f331 Fixed edge case with reading old ship loadout 2021-04-12 19:58:23 +02:00
Athanasius 2da92c1f39 Merge pull request #1000 from EDCD/enhancement/CL-force-edmc-protocol
EDMarketConnector: Add CL arg to force use of edmc:// protocol
2021-04-12 18:05:41 +01:00
Athanasius 4b456b402b EDMarketConnector: Mutually exclude --force-localserver-for-auth --force-edmc-protocol 2021-04-12 16:35:39 +01:00
Athanasius cf1655894b protocol: Pay attention to config.auth_force_edmc_protocol 2021-04-12 16:32:58 +01:00
Athanasius ae2bbc8929 Set config flag for --force-edmc-protocol so protocol.py can test it 2021-04-12 16:25:53 +01:00
Athanasius c466d17553 EDMarketConnector: Add CL arg to force use of edmc:// protocol
This will be useful when running from source, i.e. in debugger, and
wanting to work on the protocol code.
2021-04-12 16:20:12 +01:00
Athanasius c18ffe4f3b Merge pull request #999 from EDCD/enhancement/additional-translations
translations: Re-order as per l10n.py output & some added
2021-04-12 15:19:35 +01:00
Athanasius 99d90b52b1 translations: Re-order as per l10n.py output & some added
* Generic 'Error'.
* Strings for Access Token customer_id != FID.
* Other strings in companion.py now translating.
* Missing colon on Plugins string.
2021-04-12 14:58:03 +01:00
Athanasius 6532a0f0ed Release 5.0.0-beta5: appversion and changelog Release/5.0.0-beta5 2021-04-12 13:51:26 +01:00
Athanasius b4a95b85fd Merge pull request #998 from EDCD/enhancement/companion-check-FID-versus-response
companion: /decode access token and check customer_id matches FID
2021-04-12 12:53:25 +01:00
Athanasius ffc8d2fcb8 Add comment about assuming FID always starts 'F'. 2021-04-12 12:52:05 +01:00
Athanasius 671db91547 Merge pull request #997 from EDCD/fix/996-init-all-monitor-self
monitor.py: Initialise EDLogs self.systempopulation
2021-04-12 12:40:33 +01:00
Athanasius 0575c3ff43 companion: Don't over-write all CredentialsError with generic one 2021-04-12 12:38:23 +01:00
Athanasius ca08339dfe companion: /decode access token and check customer_id matches FID 2021-04-12 12:37:17 +01:00
Athanasius 5c7aa4dfa9 companion: commented-out example of requests/http debug logging 2021-04-12 12:03:11 +01:00
Athanasius 2686500d65 companion: Split Frontier Auth URL string over lines
This way a change to one part is an easier to read diff.
2021-04-12 11:05:11 +01:00
Athanasius 9a6b59fbd3 monitor.py: Initialise EDLogs self.systempopulation
This is the *one* field that wasn't always initialised.
2021-04-12 09:10:25 +01:00
Athanasius 79729d683e CQC game mode LoadGame has fewer fields, no Ship 2021-04-12 08:45:10 +01:00
Athanasius dc7f4bdd1c Update bug report template for GitHub no longer having that button
You just drag & drop files into the input area now.
2021-04-12 08:37:16 +01:00
Athanasius 13824c53bc monitor: Only forget station on Disembark if not from own ship 2021-04-12 08:31:48 +01:00
Athanasius 06568aeb2e pr-checks: No 'with:' if the body is empty 2021-04-12 08:31:48 +01:00
Athanasius 51f5cc3a31 pr-checks: Try without setting checkout ref
Going to test this with new PR from Athanasius account, with a 'behind'
develop.
2021-04-12 08:31:48 +01:00
Athanasius ed8b573090 pr-checks: Use github.head.sha for checkout ref 2021-04-12 08:31:48 +01:00
Athanasius c599a486d6 Restore showing the github context 2021-04-12 08:31:48 +01:00
Athanasius c2fdd0a319 pr-checks: Try not changing options to actions/checkout@v2 2021-04-12 08:31:48 +01:00
A_D 1a7bfc8a60 Updated gitignore 2021-04-12 08:31:48 +01:00
A_D efebdfdfed Ensured that emitter is always bound, even if None 2021-04-12 08:31:48 +01:00
Athanasius 22dbd4e048 EDDN: Fix building of "ships this station sells" list.
This likely hadn't been tested since a rewrite due to pre-Odyssey alpha
having broken CAPI without shipyard_list on normal stations.
2021-04-12 08:31:48 +01:00
Athanasius 74656f45c9 Ensure ship type/name is only clickable when we have the data for it.
This is keyed off monitor.state['Modules'] because that's what
monitor.py EDLogs.ship() uses.
2021-04-12 08:31:48 +01:00
Athanasius a9c4c191e9 Don't try to generate a shipyard link if we have no known loadout.
This is currently the case on Odyssey Alpha Phase 1 when logging in
on-foot.  There's no Journal 'Loadout' event, but the CAPI update does
let us know we have a Sidewinder active.  But `monitor.state['Modules']`
is None.
2021-04-12 08:31:48 +01:00
Athanasius de9e8e944e edshipyard: cast mod_guidance instead of type ignore 2021-04-12 08:31:48 +01:00
Athanasius dbdf42bb38 edshipyard: Use pathlib.Path.open() 2021-04-12 08:31:48 +01:00
Athanasius 11fa46163a edshipyard.py: mypy lints
That __Module type might be causing more trouble than its worth.
Changing the Union to 'Any' didn't help though.
2021-04-12 08:31:48 +01:00
Athanasius 35e13defb2 edshipyard.py: Fix erroneous trailing comma
Also, although we should perhaps make some attempt to ensure the decimal
separator is always a full-stop... it turns out edsy.org doesn't
currently support importing this style anyway, so it's moot.
2021-04-12 08:31:48 +01:00
Athanasius da31886b34 edshipyard.py: flake8 lints 2021-04-12 08:31:48 +01:00
Athanasius ce920a170f commodity.py: Make the structure passed to a join() easier to read 2021-04-12 08:31:48 +01:00
Athanasius f3383858c3 commodity.py: Use 'with' for output file. 2021-04-12 08:31:48 +01:00
Athanasius 5cc80174d2 commodity.py: Fix flake8 lints 2021-04-12 08:31:48 +01:00
Athanasius 4d9e8e3f30 dashboard: Convert open(pathlib) to pathlib.open() 2021-04-12 08:31:48 +01:00
Athanasius 04506899cc dashboard.py: mypy lints
Despite it being unused I restored the `logfile` argument to
`Dashboard.process()`.  It's set in a call to it.  Further investigation
if/when we do a proper code cleanup.
2021-04-12 08:31:48 +01:00
Athanasius e67e0a03fa dashboard.py: Fix flake8 lints 2021-04-12 08:31:48 +01:00
Athanasius 6a403a5482 hotkey: Final mypy lints
* Ignore types on the darwin stuff in-class if from platform specific
  imports.
* None of the HotkeyMgr __init__ methods take any args, so don't try to
  pass any through.  Stops mypy complaints.
2021-04-12 08:31:48 +01:00
Athanasius 9f1ae40775 hotkey: Make LinuxHotkeyMgr 'pass' implementations.
We do need to 'implement' them, but it's a all a no-op on Linux.
2021-04-12 08:31:48 +01:00
Athanasius 9c8714177e hotkey: Now runs on win32, despite MacHotkeyMgr class. 2021-04-12 08:31:48 +01:00