1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-25 05:00:53 +03:00

463 Commits

Author SHA1 Message Date
Athanasius
c9d478222a
EDMC: Provide EDDN Odyssey flag from monitor state
This should have been set from the latest Journal file, and the
key/value is in LoadGame in Odyssey.  It's only documented as:

	"Whether the sending Cmdr has an Odyssey expansion."

in the current EDDN Journal schema.  Thus sending this as False if the
Cmdr last logged into Horizons/base game should be OK.
2021-08-24 13:52:48 +01:00
A_D
dac13216a0
remove uneeded cast and fix bug in passed data 2021-08-19 20:51:23 +02:00
A_D
c86b9790ca
updated eddb to new killswitches 2021-08-19 20:37:40 +02:00
A_D
6c7245ee3d
updated eddn to new killswitches 2021-08-19 20:37:39 +02:00
A_D
f62f1ee97b
made types consistent and generic 2021-08-19 20:37:39 +02:00
A_D
a37b1882db
fixed import order 2021-08-19 20:37:35 +02:00
A_D
1712390732
removed old comment 2021-08-19 20:37:31 +02:00
A_D
78fa629fbe
updated edsm 2021-08-19 20:37:26 +02:00
A_D
98e8179c3e
Dont ignore first killswitch checks changes 2021-08-19 20:35:50 +02:00
A_D
e79975bea8
Cleaned up import 2021-08-19 20:35:50 +02:00
A_D
8c0457bf47
updated inara to work with new killswitches 2021-08-19 20:35:49 +02:00
A_D
4c9896569b
added inara support for new delete_fields directive 2021-08-19 20:35:48 +02:00
1581a3bdd7
plugins/edsm.py: fix exception on logger.trace_on, wrong datatype to subtitle 2021-08-17 13:54:38 +03:00
Athanasius
bcadc079cc
Merge pull request #1243 from EDCD/enhancement/trace-logging-should-use-trace_if
Convert all/most `logger.trace(...)` to `logger.trace_if(...)`
2021-08-13 16:30:47 +01:00
Athanasius
ef468d4c23
Merge pull request #1241 from norohind/enhancement/1239/inara-trace-under-on_trace
inara.py: put events trace logging under `inara-events` trace_on option
2021-08-13 16:14:10 +01:00
a8a4abfe90
inara.py: trace with logger.trace_if only 2021-08-13 18:06:38 +03:00
Athanasius
1480c2d67a
plugins/edsm: Change trace_if string to plugin.edsm.cmdr-events 2021-08-13 15:29:57 +01:00
Athanasius
bc9f2cda4b
plugins/edsm: Use logger.trace_if(...)
This also re-introduces commented-out Locations tracking, using
'journal.locations' as it's related to that.
2021-08-13 15:14:03 +01:00
Athanasius
79a2003b53
plugins/eddn: Use logger.trace_if(...) 2021-08-13 15:14:02 +01:00
e82abc8f03
inara.py: move conf_module import to satisfy isort 2021-08-12 19:36:27 +03:00
A_D
05e6838637
removed trace_on imports 2021-08-12 16:49:27 +02:00
A_D
fefa3d351d
replaced if x in trace_on with trace_if 2021-08-12 16:46:55 +02:00
043fd4d826
inara.py: put inara events trace logging under inara-events trace_on option 2021-08-12 16:01:31 +03:00
Athanasius
505692052e
edsm: Update should_send() docstring for extra param 2021-08-11 14:05:40 +01:00
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