ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-22 03:40:46 +03:00
Code Issues Projects Releases Wiki Activity
4,041 Commits 16 Branches 276 Tags
Commit Graph

4041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Athanasius
1dda61907b
EDDN: TODO on refactoring & return result of fssdiscoveryscan export 2021-10-10 14:23:22 +01:00
Athanasius
c4ba8acb17
EDDN: Add support for EDDN FSSDiscoveryScan schema from that event 
* As we're now not sending *all* journal events on the journal schema
  this refactors only the actual sending in export_journal_entry(), with
  the other functionality in export_journal_generic(), so that the new
  export_journal_fssdiscoveryscan() can use export_journal_entry() as
  well.

In the future EDDN will move to a schema per event type, so we'll lose
_generic().  Factoring out some things like augmentations into their own
functions will come next.
 2021-10-10 14:23:09 +01:00
Athanasius
b88805b3a2
Merge pull request #1292 from EDCD/dependabot/pip/develop/coverage-toml--6.0.1 
build(deps-dev): bump coverage[toml] from 5.5 to 6.0.1
 2021-10-10 13:54:58 +01:00
dependabot[bot]
3f5c77f7c3
build(deps-dev): bump coverage[toml] from 5.5 to 6.0.1 
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 5.5 to 6.0.1.
- [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/5.5...6.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-10 12:54:17 +00:00
Athanasius
2472314349
Merge pull request #1291 from EDCD/dependabot/pip/develop/pytest-cov-3.0.0 
build(deps-dev): bump pytest-cov from 2.12.1 to 3.0.0
 2021-10-10 13:53:42 +01:00
Athanasius
b5f8bd9587
Merge pull request #1290 from EDCD/dependabot/pip/develop/watchdog-2.1.6 
build(deps): bump watchdog from 2.1.5 to 2.1.6
 2021-10-10 13:53:33 +01:00
Athanasius
0a2e281a20
Merge pull request #1286 from EDCD/dependabot/pip/develop/types-requests-2.25.9 
build(deps-dev): bump types-requests from 2.25.8 to 2.25.9
 2021-10-10 13:53:19 +01:00
dependabot[bot]
69e8a81e6c
build(deps-dev): bump pytest-cov from 2.12.1 to 3.0.0 
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.12.1 to 3.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-cov/releases)
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.12.1...v3.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 17:03:47 +00:00
dependabot[bot]
de44b0d9d6
build(deps): bump watchdog from 2.1.5 to 2.1.6 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.5 to 2.1.6.
- [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.5...v2.1.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 17:03:45 +00:00
Athanasius
e11b357502
EDDN: DEFAULT URL requires / on the end 
The EDDN server config does NOT redirect from /upload to /upload/
 2021-10-01 08:34:50 +01:00
dependabot[bot]
0e42358394
build(deps-dev): bump types-requests from 2.25.8 to 2.25.9 
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.8 to 2.25.9.
- [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-09-27 17:03:27 +00:00
Athanasius
4c36f287a3
Merge pull request #1284 from A-UNDERSCORE-D/fix/hack-fix-localwebserver 
hack to fix --force-localserver-auth
 2021-09-24 19:14:47 +01:00
A_D
f6e4bcfcba
importing things before you use them is helpful. 2021-09-24 17:13:00 +02:00
A_D
c0351fec9b
missed an import 2021-09-24 17:06:51 +02:00
A_D
30b2d481c4
hack to fix --force-localserver-auth 2021-09-24 17:01:57 +02:00
Athanasius
e07affe905
Merge pull request #1282 from EDCD/enhancement/1281/CL-eddn-target 
Add support for --eddn-url CL arg
 2021-09-24 11:28:45 +01:00
Athanasius
f9875b5b9a
EDDN: Make use of new CL arg to use custom upload URL 
This also entailed slightly reworking the way the EDDN code uses this
URL.  It was very generalised, so as to allow for the debug "just send
and log locally" code, but as the only URL is the 'upload' one much of
that seemed un-necessary.

So that code has been simplified.
 2021-09-24 10:59:15 +01:00
Athanasius
e6e1cbd221
CL args: Group them in-code 2021-09-24 10:34:42 +01:00
Athanasius
14ca94c600
Merge pull request #1279 from EDCD/dependabot/pip/develop/types-requests-2.25.8 
build(deps-dev): bump types-requests from 2.25.6 to 2.25.8
 2021-09-23 19:45:25 +01:00
Athanasius
b83ad3e429
Merge pull request #1273 from EDCD/dependabot/pip/develop/py2exe-0.10.4.1 
build(deps-dev): bump py2exe from 0.10.4.0 to 0.10.4.1
 2021-09-23 19:45:13 +01:00
dependabot[bot]
8c0ea89058
build(deps-dev): bump types-requests from 2.25.6 to 2.25.8 
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.6 to 2.25.8.
- [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-09-22 17:03:29 +00:00
Forest
cbcf5f6d44
Log git's absence at the INFO level, not ERROR 
The ERROR log level is needlessly high for complaining about git not being installed, especially when we're running from an extracted source archive rather than a repo. Let's keep things calm and avoid polluting desktop session logs. The INFO log level is plenty.
 2021-09-18 09:14:11 +01:00
dependabot[bot]
8180b34798
build(deps-dev): bump py2exe from 0.10.4.0 to 0.10.4.1 
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.10.4.0 to 0.10.4.1.
- [Release notes](https://github.com/py2exe/py2exe/releases)
- [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog)
- [Commits](https://github.com/py2exe/py2exe/compare/v0.10.4.0...v0.10.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-08 17:03:19 +00:00
Athanasius
0e4e31d733
EDMarketConnector: Correct back to dashboard.start() 
Bad PyCharm refactor/rename in 81b5d015fdeecfcf2236a61c433d4c2dac929668
 2021-09-02 19:41:37 +01:00
Athanasius
ce35b529f4
Merge pull request #1270 from EDCD/dependabot/pip/develop/pytest-6.2.5 
build(deps-dev): bump pytest from 6.2.4 to 6.2.5
 2021-08-31 18:09:21 +01:00
dependabot[bot]
5898959228
build(deps-dev): bump pytest from 6.2.4 to 6.2.5 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.4 to 6.2.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.4...6.2.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-31 17:03:50 +00:00
Athanasius
018ee49a0d
Fix logic for 'Update' button visual state wrt CQC 
This was wrong since 291fbf2908e0f7419769a7727ee0a79cf58a9342 due to the
check saying "only active if in CQC", when it needed to be "only active
NOT in CQC, along with these other conditions".
 2021-08-31 15:03:41 +01:00
Athanasius
4482da007f
Merge pull request #1261 from EDCD/enhancement/945/CAPI-threaded-queries 
Change all CAPI queries over to a queue/thread model
 2021-08-31 14:27:48 +01:00
Athanasius
796bb1f863
CAPI: Remove unuses Session.query/profile() 
* Session.profile() was unused (used to be called from stats.py, but
  that uses cached data now).
* Session.query() was unused, other than by itself.  Normal calls will
  currently be via companion.Session.station().  Future CAPI queries
  like `/fleetcarrier` might add their own companion.Session function.
* And in doing so get --capi-pretend-down working again.
* Small tweak to EDMarketConnector to not throw extra exception if there
  was a CAPI query exception.
 2021-08-31 14:08:15 +01:00
Athanasius
60379892ee
companion: DRY try/except of CAPI queries 2021-08-31 13:07:00 +01:00
Athanasius
af50a9f59d
companion: Make raw_data.__str__() a little less verbose 
NB: We can't use a generator here to make a python object of the data,
to then use json.dumps() on because the raw_data is a *string* (decoded
from what we received from the CAPI service), and thus it will get
encoded as such, i.e.

  "raw_data": "{\"id\":322...

when we want:

  "raw_data": {"id":322...

We do not want to json.loads() that string only to then json.dumps() it
because the whole point is that this is the **raw** data to help
diagnose any issues with the CAPI service/data.  Such a conversion and
back could either throw an exception we don't want here (because we want
the raw data) or possibly distort things from what was actually
received.
 2021-08-31 12:44:46 +01:00
Athanasius
bf33f88260
companion: Rename to capi_default_requests_timeout 
So it doesn't even need a comment.
 2021-08-31 12:10:59 +01:00
Athanasius
613a992ae9
companion: Change comments on CAPI cooldown/timeouts 2021-08-31 12:09:40 +01:00
Athanasius
092b10447c
EDMarketConnector.py: Early return from AppWindow.save_raw() 2021-08-31 12:09:02 +01:00
Athanasius
fd3ebc9c21
Python version: 3.9.7 2021-08-31 10:49:04 +01:00