Commit Graph
439 Commits
Author SHA1 Message Date
Athanasius 7a71fc8e14 plugins/edsm: Protect discarded_events loop against shutdown 2021-08-05 16:40:11 +01:00
Athanasius 64f97accc0 plugins/edsm: Only try to send if pending isn't empty
This prevents literally sending an empty data to EDSM if we trigger
sending due to Shutdown.
2021-08-05 16:22:46 +01:00
Athanasius f2d7f6a5df plugins/edsm: Change discarded_events setup, check latest event in should_send()
* Ensure we have the discarded_events list *before* starting to consume
  events.  There's the *same* risk as before with EDSM just being down
  and us queueing up more and more, just now it will be in the worker
  queue rather than pending.

* We need to test for some events in should_send() that are in the
  discard list, and thus will never be in the `entries` (pending) passwd
  in, so pass in the name of the latest event as well.
2021-08-05 16:13:41 +01:00
Athanasius a794d6088f plugins/edsm: cmdr & entry declared & set early, so types now OK 2021-08-05 15:23:15 +01:00
Athanasius ddc9286903 plugins/edsm: Queue *all* events to worker
We need to trigger off ShutDown and Commander/LoadGame to empty pending,
so need to *see* them in the worker.
2021-08-05 15:20:03 +01:00
Athanasius 53da204ffd plugins/edsm: Empty pending on Shutdown & 2021-08-05 15:19:43 +01:00
Athanasius 26115a14f0 plugins/edsm: should_send() == True for any Shutdown event
We MUST attempt flushing pending events in case of commander change.
2021-08-05 15:01:33 +01:00
Athanasius ba7c2de593 plugins/edsm: 'class This' the file & flake8/mypy cleanup 2021-08-05 14:40:41 +01:00
Athanasius 56d7ee64be plugins/edsm: Add trace-on support & cleanup some mypy changes
* trace-on 'edsm-cmdr-events' for how Commanders, their API keys and
  using them are handled.  See #1134
* trace-on 'edsm-locations' for what was commented-out logging to do
  with ensuring code reacted correctly to any change of system.
* mypy/types-* seem to have had changes causing extra carping, so
  addressing that.
2021-08-05 14:06:42 +01:00
A_D 6a296d4920 fixed inara per-event killswitch doing nothing 2021-07-03 15:48:25 +02:00
A_D 2e5e55af9a Applied requested changes 2021-06-20 17:44:29 +02:00
A_D 6c140abe97 Fixed import ordering 2021-06-18 23:36:45 +02:00
A_D fe0e752c9b Added support for arbitrary plugins for POST debug
This works by replacing --eddn-local with --debug-sender, and making the
webserver more generic. support has been added to EDSM, EDDN, and INARA.
2021-06-18 23:36:42 +02:00
A_D 57d7889da9 Sorted imports 2021-06-18 23:34:26 +02:00
A_D 4ef153b1b2 Added fake EDDN Listener
A simple HTTP handler has been added that will dump any and all POST
data it gets to EDMC's log.

Additionally, a new command line argument to switch EDMC to using this
as its EDDN target has been added.
2021-06-18 23:34:20 +02:00
Athanasius a0b310f72e Translations: Amalgamate some LANG comments & en.template updated 2021-06-13 15:49:09 +01:00
Athanasius 28ceb72a27 plugins/edsm: LANG comments added 2021-06-13 13:37:21 +01:00
Athanasius 5ad3ec8d8f plugins/coriolis: LANG comments added 2021-06-13 13:10:14 +01:00
A_D 8d77cc039b Added LANG comments for EDDN localisation 2021-06-10 20:29:11 +01:00
A_D 40e9e0e268 added missing entries to inara 2021-06-10 20:29:11 +01:00
A_D 9b542386fe added missing entry to eddb 2021-06-10 20:29:11 +01:00
Athanasius 107c44a2a9 Inara: Fix the all() generator for ShipLocker check 2021-06-10 14:36:50 +01:00
Athanasius a7722f70fe No need for [] if it's a generator inside all() anyway. 2021-06-10 14:04:38 +01:00
Athanasius 9fa02b51c3 Inara: Update to use ShipLocker, possibly from file. 2021-06-10 12:52:15 +01:00
A_D 17980ac6ad Added localisation 2021-06-07 18:10:25 +02:00
A_D e6c8183bfc made EDDN errors more verbose 2021-06-07 18:09:18 +02:00
Athanasius 4fa0521438 other core plugins: LANG comment pass 2021-06-07 15:43:32 +01:00
Athanasius a412ec1382 plugins/coriolis.py: LANG comment pass 2021-06-07 15:35:24 +01:00
Athanasius 09da4576bf plugins/coriolis: Correct case of translated string 2021-06-05 08:54:55 +01:00
Athanasius 1d3ee4d6a9 Inara: Fix case on Inara 'marketID' key 2021-06-04 18:58:41 +01:00
Athanasius 7a69ca5e6b Inara: Remove useless/wrong setCommanderTravelLocation from SupercruiseEntry
This is old code, pre-dating the move to EDCD.  We could only possibly
set the system name and address from this, and would always have already
set this from login Location event, or any jump-in event.
2021-06-04 18:57:05 +01:00
Athanasius f6777f0237 Inara: Only ApproachSettlement if we have system & fix key case
* If you're near a settlement on login you get an ApproachSettlement
  before `monitor` has system set to pass into `journal_entry()`.
* We had a case-type of an Inara API key, so it wasn't setting the
  BodyName.
* TRACE level logging of what we actually send to Inara.
2021-06-04 18:45:43 +01:00
Athanasius fa0a7c48a2 Inara: setCommanderTravelLocation for SupercruiseExit and ApproachSettlement 2021-06-04 17:47:32 +01:00
Athanasius 07065b0bf3 inara: Comment out generic setCommanderTravelLocation event
This interferes with more specific such events, i.e. from Journal
`Location` event, if sent in the same batch.
2021-06-04 17:35:37 +01:00
A_D 88193cb30f be sure to include body with lat/long 2021-06-04 17:56:31 +02:00
Athanasius 4273e2b551 Merge pull request #1130 from EDCD/enhancement/1127-inara-odyssey-support
Update INARA plugin to support new odyssey API endpoints
2021-06-04 12:14:23 +01:00
Athanasius d5bb0cce5d EDSM: credentials() should just return None if no apikey 2021-06-04 10:21:56 +01:00
Athanasius 7bae9afe02 EDSM: Don't blindly assume we *already* have EDSM cmdr name and apikey 2021-06-04 10:16:52 +01:00
A_D 607729b77b added setCommanderTravelLocation from Location event 2021-06-04 00:15:57 +02:00
A_D 8a94a57e78 Removed debug warnings and bool 2021-06-02 21:46:52 +02:00
A_D 86de3769d2 Fixed nonplural var containing plural names 2021-06-02 13:15:57 +02:00
A_D 2a68b81170 Fixed broken suitMods field 2021-06-02 12:32:32 +02:00
A_D 571db43257 Update Engineering for suits 2021-06-02 12:28:06 +02:00
A_D 2f684a91e3 removed monitor.planet use 2021-06-02 11:57:28 +02:00
A_D c737753a8b Fixed comment 2021-06-01 14:32:17 +02:00
A_D 41c826f536 delCommanderSuitLoadout done, update in-progress 2021-06-01 14:31:34 +02:00
A_D a06095aba0 Start on setCommanderSuitLoadout 2021-06-01 09:42:41 +02:00
A_D d69d0245f2 Implemented ship locker materials 2021-05-31 16:51:38 +02:00
A_D 0322fd37b1 Started updating existing events with taxi info 2021-05-31 12:58:37 +02:00
A_D 11ec6bfe49 Start implementing addCommanderTravelLand 2021-05-31 11:33:05 +02:00