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

4874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
6070f82c6b
OUT_EDDN_DO_NOT_DELAY should be OUT_EDDN_DELAY 
* The old name was OUT_SYS_DELAY.
* Yes, this is the inverse of what we want, which is "should we not delay
  messages", but this is the legacy.
 2022-11-22 16:47:17 +00:00
Athanasius
59f046ee67
eddn: First cut of periodic retry of sending messages 2022-11-22 15:51:10 +00:00
Athanasius
be1ef32238
config: Minor ordering change to ensure OUT_STATION_ANY set correctly 
* This depends on `OUT_EDDN_SEND_STATION_DATA` which is defined below where
  this originally was.
 2022-11-22 15:30:30 +00:00
Athanasius
a2d2723f49
monitor: Add an 'IsDocked' flag to monitor.state. 
* This is cleaner than starting to track it in `plugins/eddn.py` specifically.
* This is literally only about if we're piloting a ship that is docked, so
  not even trying to resolve "on-foot, in a station, 'Location' said not
  docked though".
 2022-11-22 15:29:05 +00:00
Athanasius
876c34ecfd
eddn: Remove two 'noqa: CCR001' that are no longer applicable 2022-11-22 14:09:08 +00:00
Athanasius
871f50288e
prefs.py: Fix overly long line (config constants renames) 2022-11-22 14:02:22 +00:00
Athanasius
06edcf3ea9
EDDN: Remove EDDN.send() in favour of renamed .export_journal_entry() 
* Now that we're not trying to do "did we just/are we know docked?" in this
  code it turns out that both CAPI and Journal messages can use the same
  function for this.
* And as it's no longer journal-specific `EDDN.export_journal_entry()` has
  been renamed to `EDDN.send_message()`.

This whole branch now needs to actually implement sending queued messages
when docked, and periodically in the case of initial failures.
 2022-11-22 14:02:21 +00:00
Athanasius
fe24cf7e95
EDDN: Remove legacy sendreplay() 
* `EDDN.sendreplay()` is no longer used.
* In `prefsvarschanged()` there was a reference to `eddn.replayfile`, so as
  to grey out the "Delay sending..." option if the file wasn't available.
  So that's moot and also removed, but also...
* Comment the purpose of that line in `prefsvarchanged()` because it's not
  immediately obvious.
 2022-11-22 14:02:20 +00:00
Athanasius
db7bb735d2
EDDN: Put "should we send (now?)" checks into EDDN.export_journal_entry() 
In some cases the check might already have been done, but if not then this
is the last easy place to perform it.

NB: Unlike the old code this does *not* attempt to check "are we docked
  *now* ?" for triggering sending of previously queue messages.  That's
  going to need a thread worker.
 2022-11-22 14:02:19 +00:00
Athanasius
03b36cbe39
EDDN: Improve export_journal_fcmaterials "don't send" comment 2022-11-22 14:02:18 +00:00
Athanasius
5eb4296ec6
EDDN: First steps to ensure new code respects user configuration 
It's easier to check "should we send this message at all?" earlier. Currently
all of the following ('station data') do so:

* CAPI commodity, outfitting (also fcmaterials) and shipyard.
* Journal commodity, fcmaterials, outfitting,  and shipyard.
 2022-11-22 14:02:17 +00:00
Athanasius
7d0ae88757
EDDN: EDDNSender.send_message() doesn't care about do/don't send options 
By this point other code will have made that decision.
 2022-11-22 14:02:16 +00:00
Athanasius
0d35f8874a
config/EDDN: Rename OUT_MKT_EDDN to OUT_EDDN_SEND_STATION_DATA 
This flag controls whether commodity, outfitting or shipyard schema messages
are sent.  Thus 'MKT' ('market') is misleading.  Rename it so the intent when
used is clear.
 2022-11-22 14:02:15 +00:00
Athanasius
9f02f18408
config/EDDN: Rename OUT_SYS_EDDN to OUT_EDDN_SEND_NON_STATION 
* This was perhaps originally meant for what the UI option says, i.e. "send
  system and scan data", but is actually being used for anything that is
  **NOT** 'station data' (even though *that* option has 'MKT' it includes
  outfitting and shipyard as well).

  So, just name this more sanely such that code using it is more obvious as
  to the actual intent.
 2022-11-22 14:02:14 +00:00
Athanasius
3a57b53bbd
config/EDDN: Rename OUT_SYS_DELAY to OUT_EDDN_DO_NOT_DELAY 
The sense of this `output` flag has been inverted (always?) for a long time.

1. I have the option "Delay sending until docked" showing as *off* in the UI.
2. My config.output value is `100000000001`.
3. The value of this flag is `4096`, which means 12th bit (starting from 1, not
  zero).
4. So I have the bit set, but the option visibly off.

So, rename this both to be more pertinent to its use *and* to be correct as to
what `True` for it means.
 2022-11-22 14:02:13 +00:00
Athanasius
598e54eaa4
EDDNSender: Now properly sends messages to Gateway 
Including removing from the queue if it succeeded, or didn't and should be
dropped.
 2022-11-22 14:02:12 +00:00
Athanasius
f66a98464e
EDDNSender: Closer to actually sending messages now 2022-11-22 14:02:11 +00:00
Athanasius
2b957d140c
EDDNSender: convert_legacy_file() belongs with "open the database" 2022-11-22 14:02:10 +00:00
Athanasius
0e20f4bc00
EDDNSender: Remove legacy file after migration 2022-11-22 14:02:09 +00:00
Athanasius
f3017d40ec
EDDNSender: Fill out type hints 2022-11-22 14:02:08 +00:00
Athanasius
51fb90b999
EDDN: Change EDDN.close() to call into EDDNSender.close() 2022-11-22 14:02:07 +00:00
Athanasius
c1793ad839
EDDN: Remove EDDN->flush() 2022-11-22 14:02:06 +00:00
Athanasius
09f646a249
EDDNSender: Add delete_message() method 
This was tested by temporary code in `convert_legacy_file()` to delete
the last added row once all done.
 2022-11-22 14:02:06 +00:00
Athanasius
86ff787aed
EDDNSender: Convert all of a legacy file 
* I had a `break` in there to only convert the first message.
* Also collapsed the assignment to `cmdr, msg` to not go via `j`.
 2022-11-22 14:02:05 +00:00
Athanasius
089c33002c
EDDNSender->add_message() returns ID of INSERTed row 2022-11-22 14:02:04 +00:00
Athanasius
80129361fe
EDDN: Refactor queue db open/creation to own function 2022-11-22 14:02:03 +00:00
Athanasius
9a660b3b49
EDDN: New class as EDDNSender now, and version the queue database file 
* It makes more sense for this new class to be concerned with all the 'send it'
  functionality, not just 'replay', so rename it.
* Athough we're trying to get the schema right *first* time, let's plan ahead
  and version the filename in case of needing to migrations in the future.
 2022-11-22 14:02:02 +00:00
Athanasius
424d5f023c
EDDNReplay.add_message() is now functional 
And that includes the code to handle legacy `replay.json` messages.
 2022-11-22 14:02:01 +00:00
Athanasius
03e432034f
EDDN: Moving replay functionality into its own class 2022-11-22 14:02:00 +00:00
Athanasius
072eadd893
EDDN: messages.id AUTOINCREMENT, and index created & cmdr 
We'll definitely want to query against `cmdr`, and possibly `created`.

We shouldn't need to against other fields, they'll just be checked during
processing of an already selected message.
 2022-11-22 14:01:59 +00:00
Athanasius
9faae8b9bc
EDDN: Open & create sqlite3 db for replay 
* sqlite3 open, and creation of table.
* Change `load_journal_replay()` to `load_journal_replay_file()` and change
  the semantics to just return the `list[str]` loaded from it.  It also now
  catches no exceptions.
* Remove the "lock the journal cache" on init as it's not necessary.

There's still a lot more changes to come on this.
 2022-11-22 14:01:58 +00:00
Athanasius
4c3ea5fd27
Merge pull request #1706 from EDCD/dependabot/pip/develop/setuptools-65.6.0 
build(deps-dev): bump setuptools from 65.5.1 to 65.6.0
 2022-11-22 12:17:44 +00:00
Athanasius
c9edfe358b
Merge pull request #1707 from EDCD/dependabot/pip/develop/flake8-isort-5.0.3 
build(deps-dev): bump flake8-isort from 5.0.0 to 5.0.3
 2022-11-22 12:17:34 +00:00
Athanasius
c3e3e6a0d0
Merge pull request #1702 from EDCD/dependabot/pip/develop/types-requests-2.28.11.5 
build(deps-dev): bump types-requests from 2.28.11.2 to 2.28.11.5
 2022-11-22 12:17:20 +00:00
dependabot[bot]
3ce5418bc2
build(deps-dev): bump flake8-isort from 5.0.0 to 5.0.3 
Bumps [flake8-isort](https://github.com/gforcada/flake8-isort) from 5.0.0 to 5.0.3.
- [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/5.0.0...5.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-21 17:04:33 +00:00
dependabot[bot]
4f0a6ee12d
build(deps-dev): bump setuptools from 65.5.1 to 65.6.0 
Bumps [setuptools](https://github.com/pypa/setuptools) from 65.5.1 to 65.6.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v65.5.1...v65.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-21 17:04:28 +00:00
dependabot[bot]
8e7724d7ca
build(deps-dev): bump types-requests from 2.28.11.2 to 2.28.11.5 
Bumps [types-requests](https://github.com/python/typeshed) from 2.28.11.2 to 2.28.11.5.
- [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>
 2022-11-17 17:02:56 +00:00
Athanasius
b15d90e844
Merge pull request #1700 from EDCD/dependabot/pip/develop/py2exe-0.13.0.0 
build(deps-dev): bump py2exe from 0.12.0.2 to 0.13.0.0
 2022-11-17 15:15:18 +00:00
Athanasius
6042a989ef
Merge pull request #1697 from EDCD/dependabot/pip/develop/setuptools-65.5.1 
build(deps-dev): bump setuptools from 65.5.0 to 65.5.1
 2022-11-17 15:13:17 +00:00
Athanasius
b45fb9c91f
Merge pull request #1698 from EDCD/dependabot/pip/develop/pywin32-305 
build(deps-dev): bump pywin32 from 304 to 305
 2022-11-17 15:11:24 +00:00
Athanasius
2c438b4105
Merge pull request #1701 from EDCD/dependabot/pip/develop/mypy-0.991 
build(deps-dev): bump mypy from 0.982 to 0.991
 2022-11-17 15:09:42 +00:00
Athanasius
84813a799e
Merge pull request #1695 from EDCD/dependabot/pip/develop/flake8-comprehensions-3.10.1 
build(deps-dev): bump flake8-comprehensions from 3.10.0 to 3.10.1
 2022-11-17 15:09:28 +00:00
Athanasius
04f49dad4f
pre-commit: Update flake8 repo URL 
We're using our local version *anyway*, but update this in case we decide
to switch.
 2022-11-15 10:22:36 +00:00
dependabot[bot]
c5a1ee648f
build(deps-dev): bump mypy from 0.982 to 0.991 
Bumps [mypy](https://github.com/python/mypy) from 0.982 to 0.991.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.982...v0.991)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-14 17:01:23 +00:00
dependabot[bot]
6d298ae626
build(deps-dev): bump py2exe from 0.12.0.2 to 0.13.0.0 
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.12.0.2 to 0.13.0.0.
- [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.12.0.2...v0.13.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-08 17:01:02 +00:00
dependabot[bot]
11316c8647
build(deps-dev): bump pywin32 from 304 to 305 
Bumps [pywin32](https://github.com/mhammond/pywin32) from 304 to 305.
- [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>
 2022-11-08 17:00:49 +00:00
dependabot[bot]
e177e73f67
build(deps-dev): bump setuptools from 65.5.0 to 65.5.1 
Bumps [setuptools](https://github.com/pypa/setuptools) from 65.5.0 to 65.5.1.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v65.5.0...v65.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-08 17:00:46 +00:00
dependabot[bot]
a607d45fa3
build(deps-dev): bump flake8-comprehensions from 3.10.0 to 3.10.1 
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.10.0 to 3.10.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.10.0...3.10.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>
 2022-10-31 17:05:11 +00:00
Athanasius
c15eaaeb71
Merge pull request #1692 from EDCD/dependabot/pip/develop/py2exe-0.12.0.2 
build(deps-dev): bump py2exe from 0.12.0.1 to 0.12.0.2
 2022-10-29 16:13:29 +01:00
Athanasius
e3620dd88e
Merge pull request #1694 from EDCD/dependabot/pip/develop/autopep8-2.0.0 
build(deps-dev): bump autopep8 from 1.7.0 to 2.0.0
 2022-10-29 16:08:07 +01:00