Commit Graph
4077 Commits
Author SHA1 Message Date
Athanasius ee272fdeba Merge pull request #1307 from EDCD/fix/1259/eddn-horizons-flag
EDDN: Fix `horizons` flag for CAPI-sourced data
2021-10-17 15:35:12 +01:00
Athanasius ca80edd34d EDDN: If this.horizons is true, use that in is_horizons() check 2021-10-17 15:01:51 +01:00
Athanasius aecf375138 EDDN: Record horizons flag in journal_entry()
So that we can then first check *this* in `is_horizons()`.
2021-10-17 14:55:43 +01:00
Athanasius 62b5e4e7eb EDMarketConnector.py: Fix isort order complaint 2021-10-17 14:03:07 +01:00
Athanasius 1f7b0b7c0d companion.py: Fix isort order complaint 2021-10-17 14:02:10 +01:00
Athanasius 60e0386b04 Merge pull request #1283 from A-UNDERSCORE-D/fix/force-localwebserver-does-nothing
Remove protocol.protocolhandler singleton auto-init
2021-10-17 14:00:17 +01:00
Athanasius a9ffdf82c9 Merge pull request #1285 from EDCD/enhancement/1280/eddn-update7-new-schemas
EDDN: Add support for new EDDN schemas
2021-10-17 13:58:49 +01:00
Athanasius 8d8a79fa2f Merge pull request #1305 from EDCD/dependabot/pip/develop/types-requests-2.25.11
build(deps-dev): bump types-requests from 2.25.10 to 2.25.11
2021-10-15 18:13:29 +01:00
Athanasius 75ad25961f Merge pull request #1304 from EDCD/dependabot/github_actions/develop/actions/checkout-2.3.5
build(deps): bump actions/checkout from 2.3.4 to 2.3.5
2021-10-15 18:13:18 +01:00
dependabot[bot] 65122ea3e7 build(deps-dev): bump types-requests from 2.25.10 to 2.25.11
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.10 to 2.25.11.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-requests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-15 17:03:20 +00:00
dependabot[bot] 92054f4e15 build(deps): bump actions/checkout from 2.3.4 to 2.3.5
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-15 17:03:12 +00:00
Athanasius 42594c9366 EDDN: Abbreviate tracking_ui_update() code 2021-10-15 11:57:09 +01:00
Athanasius 8ecb01c5ae Revert "build(deps-dev): bump flake8 from 3.9.2 to 4.0.1"
This reverts commit 214032e8e7.

flake8-use-fstring has `flake8==3.*`
2021-10-14 18:13:21 +01:00
Athanasius 8cbacee741 Merge pull request #1302 from EDCD/dependabot/pip/develop/flake8-4.0.1
build(deps-dev): bump flake8 from 3.9.2 to 4.0.1
2021-10-14 18:07:33 +01:00
dependabot[bot] 214032e8e7 build(deps-dev): bump flake8 from 3.9.2 to 4.0.1
Bumps [flake8](https://github.com/pycqa/flake8) from 3.9.2 to 4.0.1.
- [Release notes](https://github.com/pycqa/flake8/releases)
- [Commits](https://github.com/pycqa/flake8/compare/3.9.2...4.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-14 17:07:24 +00:00
Athanasius ef73f6354a Merge pull request #1303 from EDCD/dependabot/pip/develop/flake8-isort-4.1.1
build(deps-dev): bump flake8-isort from 4.0.0 to 4.1.1
2021-10-14 18:06:54 +01:00
dependabot[bot] 86d4369e0f build(deps-dev): bump flake8-isort from 4.0.0 to 4.1.1
Bumps [flake8-isort](https://github.com/gforcada/flake8-isort) from 4.0.0 to 4.1.1.
- [Release notes](https://github.com/gforcada/flake8-isort/releases)
- [Changelog](https://github.com/gforcada/flake8-isort/blob/master/CHANGES.rst)
- [Commits](https://github.com/gforcada/flake8-isort/compare/4.0.0...4.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-14 17:03:09 +00:00
Athanasius 60f3b524e2 EDDN: codexentry: Always set BodyName from Status.json, ID if Journal matches
Partial data is better than no data, or bad data.  So if Status.json
BodyName is available, always use it.  *Then* see if Journal BodyName
matches that, and if so set BodyID.

Close-orbiting bodies might therefore cause BodyName to be set without
BodyID, but then it's up to EDDN listeners to make a decision, rather
than making it for them.
2021-10-14 13:04:52 +01:00
Athanasius 7ca5318b7b Merge pull request #1301 from EDCD/dependabot/pip/develop/flake8-noqa-1.2.0
build(deps-dev): bump flake8-noqa from 1.1.0 to 1.2.0
2021-10-12 18:07:08 +01:00
Athanasius 4507e7cd4d Merge pull request #1300 from EDCD/dependabot/pip/develop/coverage-toml--6.0.2
build(deps-dev): bump coverage[toml] from 6.0.1 to 6.0.2
2021-10-12 18:07:02 +01:00
Athanasius ec76837c28 Merge pull request #1299 from EDCD/dependabot/pip/develop/types-requests-2.25.10
build(deps-dev): bump types-requests from 2.25.9 to 2.25.10
2021-10-12 18:06:06 +01:00
dependabot[bot] b551af45b8 build(deps-dev): bump flake8-noqa from 1.1.0 to 1.2.0
Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/plinss/flake8-noqa/releases)
- [Commits](https://github.com/plinss/flake8-noqa/compare/v1.1.0...v1.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-12 17:04:56 +00:00
dependabot[bot] 24597e78e9 build(deps-dev): bump coverage[toml] from 6.0.1 to 6.0.2
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/6.0.1...6.0.2)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-12 17:04:54 +00:00
dependabot[bot] a949b408a3 build(deps-dev): bump types-requests from 2.25.9 to 2.25.10
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.9 to 2.25.10.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-requests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-12 17:04:45 +00:00
Athanasius 9a79c084a8 requirements-dev: Step flake8 back down to 3.9.2 for now
flake8-isort needs to publish a release that allows for >= 4
2021-10-12 13:12:21 +01:00
Athanasius 2ef9d9e3c3 EDDN: BodyName/ID tracking tested for simple body
* The Tracking UI is now up and running.
* Some of the tracking corrected:
 - Set BodyID from ApproachBody.
 - Do not clear values on SupercruiseEntry, allow either FSDJump or
   LeaveBody to do this.
 - Clear the values if we detect the Main Menu music track (when you
   exit to the menu, not just when you look at the menu whilst
   in-game).
* Various comments added to help with documenting the tracking for EDDN
  uploaders.
2021-10-12 13:06:38 +01:00
Athanasius cdb49eacc5 Merge pull request #1297 from EDCD/dependabot/pip/develop/flake8-4.0.1
build(deps-dev): bump flake8 from 3.9.2 to 4.0.1
2021-10-11 18:05:29 +01:00
dependabot[bot] c36cc62039 build(deps-dev): bump flake8 from 3.9.2 to 4.0.1
Bumps [flake8](https://github.com/pycqa/flake8) from 3.9.2 to 4.0.1.
- [Release notes](https://github.com/pycqa/flake8/releases)
- [Commits](https://github.com/pycqa/flake8/compare/3.9.2...4.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-11 17:05:23 +00:00
Athanasius 3d88df2225 Merge pull request #1298 from EDCD/dependabot/pip/develop/certifi-2021.10.8
build(deps): bump certifi from 2021.5.30 to 2021.10.8
2021-10-11 18:04:42 +01:00
Athanasius 4499b21c61 Merge pull request #1296 from EDCD/dependabot/pip/develop/flake8-comprehensions-3.7.0
build(deps-dev): bump flake8-comprehensions from 3.6.1 to 3.7.0
2021-10-11 18:04:24 +01:00
Athanasius 425eb61741 Merge pull request #1295 from EDCD/dependabot/pip/develop/pywin32-302
build(deps-dev): bump pywin32 from 301 to 302
2021-10-11 18:04:10 +01:00
dependabot[bot] 91ff8a5d3d build(deps): bump certifi from 2021.5.30 to 2021.10.8
Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.5.30 to 2021.10.8.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2021.05.30...2021.10.08)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-11 17:03:32 +00:00
dependabot[bot] 7be9bd1883 build(deps-dev): bump flake8-comprehensions from 3.6.1 to 3.7.0
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.6.1 to 3.7.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.6.1...3.7.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-10-11 17:03:25 +00:00
dependabot[bot] 1637dc0f5f build(deps-dev): bump pywin32 from 301 to 302
Bumps [pywin32](https://github.com/mhammond/pywin32) from 301 to 302.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

---
updated-dependencies:
- dependency-name: pywin32
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-11 17:03:22 +00:00
Athanasius dd8ec061d3 EDDN: Dummy tracking UI to determine layout 2021-10-10 15:40:41 +01:00
Athanasius 72f584481a EDDN: Add --eddn-tracking-ui CL arg
This will only work on startup for now, with it present/active the EDDN
plugin will add a UI frame to show what it's tracking.

Intended for developer use only.
2021-10-10 15:01:16 +01:00
Athanasius 15ea858c6b EDDN: codexentry: Use BodyID if available 2021-10-10 14:55:46 +01:00
Athanasius d7eacd253c EDDN: Track BodyID from Journal events
* Also renames all of the body name/ID 'this' variables to snake case.
2021-10-10 14:43:01 +01:00
Athanasius 50f03ae753 EDDN: codexentry: Set BodyName if available from Status.json 2021-10-10 14:37:20 +01:00
Athanasius 8700868724 EDDN: Rename this.planet to this.bodyname for consistency 2021-10-10 14:32:12 +01:00
Athanasius b82d25ee07 EDDN: Start tracking Status.json BodyName 2021-10-10 14:31:40 +01:00
Athanasius 5546926776 EDDN: Use 'if key (not) in dict:' rather than .get() is (not) None 2021-10-10 14:23:24 +01:00
Athanasius 84ef77197d EDDN: Use MutableMapping when needing to update a Mapping, not Dict 2021-10-10 14:23:24 +01:00
Athanasius e1d547460b EDDN: Add type hints back to new export_journal_entry() 2021-10-10 14:23:24 +01:00
Athanasius ba20599511 EDDN: Make comment about removing odyssey flag a WORKAROUND
This is for the NavRoute handling.
2021-10-10 14:23:23 +01:00
Athanasius 0ffbb4dac9 EDDN: Send 'NavRoute' data on appropriate schema
Yes, there's some lovely mis-match between Mapping and Dict type to work
around.  Mapping complains about lack of __delitem__, so saying it's a
Dict instead and ensuring that matches at the call site.
2021-10-10 14:23:23 +01:00
Athanasius 7081a5a3ab EDDN: Send ScanBaryCentre on correct schema 2021-10-10 14:23:23 +01:00
Athanasius f97cf0897a EDDN: Add CodexEntry on its own schema
This requires a tweak to `entry_augment_system_data()` as we now also
have 'System' as a possible key for a system name.
2021-10-10 14:23:23 +01:00
Athanasius 9c611d73d5 EDDN: TODO for dropping messages if we get a clear HTTP error
i.e. message not matching schema
2021-10-10 14:23:22 +01:00
Athanasius 413f9049f5 EDDN: Add support for NavBeaconScan on its own schema
* Refactors the augmentation code for use by both fssdiscoveryscan and
  navbeaconscan.
2021-10-10 14:23:22 +01:00