1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 18:37:39 +03:00

3868 Commits

Author SHA1 Message Date
A_D
df200d2c22
quoting fixes 2021-08-19 20:37:32 +02:00
A_D
da8bb27b84
added deep get tests 2021-08-19 20:37:32 +02:00
A_D
5b96b9b118
tests for _apply complete 2021-08-19 20:37:32 +02:00
A_D
1712390732
removed old comment 2021-08-19 20:37:31 +02:00
A_D
e7e210cc87
start on unit tests 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
36d786ef8c
Added more utility methods 2021-08-19 20:35:49 +02:00
A_D
8c0457bf47
updated inara to work with new killswitches 2021-08-19 20:35:49 +02:00
A_D
366da05cba
added utility methods for using the new actions 2021-08-19 20:35:49 +02:00
A_D
feb05c60d0
guard clause Sequence indexing 2021-08-19 20:35:48 +02:00
A_D
39eaf608a2
Scratch that, lets do this in an extensible manner
Keys now exist directly on Kills entries, those keys are only additive,
if EDMC doesnt understand something it just drops the entire event etc.
2021-08-19 20:35:48 +02:00
A_D
6c56b9851a
made redact_fields into delete_fields
otherwise there are type issues
2021-08-19 20:35:48 +02:00
A_D
4c9896569b
added inara support for new delete_fields directive 2021-08-19 20:35:48 +02:00
A_D
2583d07baf
Added additional data fields to killswitches
These fields will be used for various things moving forward. The
currently intended use is to redact fields when sending data to
inara/edsm/eddn in case Frontier accidentally includes something that is
unwanted
2021-08-19 20:35:47 +02:00
Athanasius
57cf4ab78a
Merge pull request #1254 from EDCD/dependabot/pip/develop/watchdog-2.1.4
build(deps): bump watchdog from 2.1.3 to 2.1.4
2021-08-19 18:09:21 +01:00
dependabot[bot]
11b1799d09
build(deps): bump watchdog from 2.1.3 to 2.1.4
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases)
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst)
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.3...v2.1.4)

---
updated-dependencies:
- dependency-name: watchdog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-19 17:02:57 +00:00
Athanasius
76e08e52d7
Merge pull request #1253 from norohind/fix/744/file-location-should-always-be-available
Output > 'File Location' should always be available
2021-08-19 12:50:44 +01:00
3e38965ef1
Output > 'File Location' should always be available 2021-08-17 18:12:16 +03:00
Athanasius
204d0429cb
Merge pull request #1252 from norohind/fix/1251/edsm-trace_if-exceptions
plugins/edsm.py: fix exception on logger.trace_on
2021-08-17 12:07:20 +01:00
1581a3bdd7
plugins/edsm.py: fix exception on logger.trace_on, wrong datatype to subtitle 2021-08-17 13:54:38 +03:00
Athanasius
b3328bb63c
Merge pull request #1250 from EDCD/dependabot/pip/develop/flake8-comprehensions-3.6.1
build(deps-dev): bump flake8-comprehensions from 3.6.0 to 3.6.1
2021-08-16 18:20:07 +01:00
dependabot[bot]
1f7dad024d
build(deps-dev): bump flake8-comprehensions from 3.6.0 to 3.6.1
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases)
- [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst)
- [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.6.0...3.6.1)

---
updated-dependencies:
- dependency-name: flake8-comprehensions
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-16 17:05:53 +00:00
Athanasius
be6e54dfef
Merge pull request #1246 from norohind/enhancement/1096/CAPI-pretend-down-CL-arg
Add CL arg `--capi-pretend-down` in order to pretend that CAPI is down
2021-08-16 13:34:57 +01:00
e6c6f7f155
companion.py: Move check for CAPI pretend down 2021-08-16 15:30:14 +03:00
8d6fae6ef6
EDMarketConnector.py: style fix 2021-08-16 15:28:13 +03:00
b30b25216b
companion.py: change raising exception when pretending CAPI down 2021-08-16 15:24:01 +03:00
2e90a1bbe9
Remove raise CAPI pretend down on auth requests, add endpoint for which CAPI pretend down raising 2021-08-16 14:40:46 +03:00
92b131f81a
companion.py: reorder conf_module import for isort 2021-08-13 23:07:18 +03:00
d068dc7620
Merge branch 'develop' into enhancement/1096/CAPI-pretend-down-CL-arg 2021-08-13 23:04:42 +03:00
01bd637730
Add CL arg --capi-pretend-down in order to pretend that CAPI is down 2021-08-13 21:47:47 +03:00
Athanasius
6b94632945
Merge pull request #1245 from EDCD/dependabot/pip/develop/flake8-comprehensions-3.6.0
build(deps-dev): bump flake8-comprehensions from 3.5.0 to 3.6.0
2021-08-13 18:04:39 +01:00
dependabot[bot]
ad49ad531e
build(deps-dev): bump flake8-comprehensions from 3.5.0 to 3.6.0
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases)
- [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst)
- [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.5.0...3.6.0)

---
updated-dependencies:
- dependency-name: flake8-comprehensions
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-13 17:02:58 +00: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
82ab72a655
EDMCLogging: Fix import order 2021-08-13 15:22:35 +01:00
Athanasius
7149f7e792
companion: Change trace_if 'capi-query' to 'capi.query' 2021-08-13 15:20:42 +01:00
Athanasius
021d3a25fa
EDMC: Actually set config.trace_on from CL args
Else they won't work, duh!
2021-08-13 15:20:21 +01:00
Athanasius
4433b67c82
EDMarketConnector: Use logger.trace_if(...)
Yes, leaving that 'truncating plain logfile' as plain trace.
2021-08-13 15:14:03 +01:00
Athanasius
2754385281
monitor: Use trace_if('journal.startup', ...) for game load-in 2021-08-13 15:14:03 +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
Athanasius
305f8ca6b0
protocol.py: Use logger.trace_if(...) 2021-08-13 15:14:02 +01:00
Athanasius
c8081f339a
plug.py: Use logger.trace_if(...) 2021-08-13 15:14:02 +01:00
Athanasius
1378f765cc
monitor: Convert to logger.trace_if() 2021-08-13 15:14:02 +01:00
Athanasius
bb1faa67d4
journal_lock: Convert to logger.trace_if(...) 2021-08-13 15:14:02 +01:00
Athanasius
df84b8aa64
companion: Change logger.trace to logger.trace_if
This adds only 'capi-query' to --trace-on possibilities.
2021-08-13 15:14:01 +01:00