ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-11-06 01:52:29 +03:00
Code Issues Projects Releases Wiki Activity
4,101 Commits 17 Branches 299 Tags
3e046c1f65bc367e607c4b1fb77bd00a31e65394
Commit Graph
4101 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius 3e046c1f65 Pre-Release 5.2.0-beta1: appversion and changelog Release/5.2.0-beta2 2021-10-20 13:14:16 +01:00
Athanasius 832316517e requirements-dev: Bump flake8-use-fstring and flake8 itself 2021-10-20 09:14:43 +01:00
Athanasius 6a0325bb76 Merge pull request #1313 from EDCD/enhancement/eddn-do-not-replaylog-unknown-schema 
EDDN: Drop any 'unknown schema' messages so they're not retried
 2021-10-20 09:10:00 +01:00
Athanasius 3ec9c81e19 EDDN: Drop any 'unknown schema' messages so they're not retried 2021-10-19 16:01:54 +01:00
Athanasius 9a58da57cd Pre-Release 5.2.0-beta1: appversion & changelog Release/5.2.0-beta1 2021-10-18 15:39:18 +01:00
Athanasius 1e65b60836 Merge pull request #1308 from EDCD/enhancement/eddn-CAPIdata-always-use-journal-horizons 
EDDN: Ensure we always send `horizons` flag where schema allows
 2021-10-18 14:33:16 +01:00
Athanasius 7dcb275e9b EDDN: Document HORIZONS_SKU, and to NOT use the others 2021-10-18 14:18:11 +01:00
Athanasius cf5806021e PLUGINS.md: capi_is_horizons() now 2021-10-18 12:33:11 +01:00
Athanasius c97b539ac3 EDDN: Revert to using capi_is_horizons() in export_commodities() 2021-10-18 12:25:35 +01:00
Athanasius 694321064d EDDN: Rename is_horizons() and document that it's for CAPI data only 
OK, it has `data` passed in, so this should be obvious, but let's make
it explicit both by name and in the docstring.

The docstring now also emphasies that *this* check **MUST** be used for
CAPI data, as it's dependent only on the availability of Horizons on the
account, and not on the `LoadGame` flags.
 2021-10-18 12:20:06 +01:00
Athanasius d8689e5b9b Revert "EDDN: If this.horizons is true, use that in is_horizons() check" 
This reverts commit ca80edd34d.
 2021-10-18 12:10:09 +01:00
Athanasius 90aa2698cd Revert "EDDN: Just use this.horizons for CAPI data sending" 
This reverts commit bd183efbd4.
 2021-10-18 12:09:55 +01:00
Athanasius e148197971 Revert "EDDN: use this.odyssey for Journal outfitting and shipyard" 
This reverts commit 4fef4257bd.
 2021-10-18 12:08:32 +01:00
Athanasius 98f215e6ad EDDN: Remove horizons flag from navroute messages 
As with `odyssey` this isn't currently in the not-yet-live schema.
 2021-10-17 16:46:11 +01:00
Athanasius 29b69745f3 EDDN: document that some EDDN messages aren't retried 2021-10-17 16:32:38 +01:00
Athanasius 4fef4257bd EDDN: use this.odyssey for Journal outfitting and shipyard 
For consistency with the horizons flag.  They *are* placed *from* the
`this` versions into `entry`, but we might as well go the direct route.
They have to be set explicitly here as we process the `entry` to make a
wholly new `message` rather than the `message` just being `entry` with
some changes.
 2021-10-17 16:20:46 +01:00
Athanasius b3419ec548 EDDN: Also set commodity/3->horizons for journal-sourced data 2021-10-17 16:17:58 +01:00
Athanasius a32546b001 EDDN: Set horizons on commodity/3 messages as per schema 2021-10-17 16:14:35 +01:00
Athanasius 556ace5306 EDDN: Use this.odyssey rather than passing to functions 2021-10-17 15:47:12 +01:00
Athanasius bd183efbd4 EDDN: Just use this.horizons for CAPI data sending 2021-10-17 15:41:15 +01:00
Athanasius 488fdf4976 Merge pull request #1306 from EDCD/fix/eddn-quieten-unknown-schema-errors 
EDDN: Quieten "unknown schema" errors
 2021-10-17 15:35:25 +01:00
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 7fa0576c85 EDDN: Keep 'unknown schema' messages in replaylog 
This still logs them, at DEBUG, which will get spammy as such messages
accumulate.

Uncommenting the:

`#  return  # Pretend it went OK so this message isn't retried`

at line 291 in EDDN.sendreplay(), in the:

`except requests.exceptions.HTTPError as e:`

block would cause them to not stay in the replaylog.
 2021-10-17 14:41:25 +01:00
Athanasius 5ae953bf45 EDDN: Drop messages if EDDN says it doesn't know the schema 
Currently Live EDDN doesn't yet have the new schemas such as navroute,
so will complain.  Rather than leaving such messages in our EDDN replay
queue and getting an error every time that is run, detect this error
case and drop the messages.
 2021-10-17 14:24:23 +01:00
Athanasius fc34d023b6 EDDN: tracking_ui_update(): check if this UI bit actually active 2021-10-17 14:10:30 +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