1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 09:10:35 +03:00

4179 Commits

Author SHA1 Message Date
Athanasius
c3fd74b968
Updated translations 2021-11-22 11:06:57 +00:00
Athanasius
fe55eb11f8
click_counter: Cast value to int() for saving 2021-11-22 10:57:46 +00:00
Athanasius
71ed90fb3a
Fix click_counter example to work & pass linting
* It was returning 'ClickCounter' for the name, mis-matching with the
  folder name of 'click_counter', which caused plain logging to be used.
  That in turn then complained about the lack of %(osthreadid).

* flake8 pass, including adding doc strings, with references to
  PLUGINS.md sections.

* mypy pass.
2021-11-22 10:42:31 +00:00
Athanasius
9f231cc57e
changelog: 5.2.3-beta1: releases -> release 2021-11-21 11:41:39 +00:00
Athanasius
4ee2132589
Pre-Release 5.2.3-beta1: appversion & changelog Release/5.2.3-beta1 2021-11-21 11:33:44 +00:00
Athanasius
ef7e6f81f0
Merge pull request #1355 from EDCD/fix/1354/loadgame-rank-progress-order
monitor: Don't re-init Enginers/Rank/Reputation on LoadGame
2021-11-21 11:29:05 +00:00
Athanasius
8363e8c646
monitor: Don't re-init Enginers/Rank/Reputation on LoadGame
The order of Journal events changed from:

  1. LoadGame
  2. Rank
  3. Progress

to:

  1. Rank
  2. Progress
  3. LoadGame

in Odyssey, and in at least current 'base game' and Horizons clients as
well.  Also 'Reputation' event is before 'LoadGame' now.  So simply
allow those events to have populated the data, don't re-init on
LoadGame.

Yes, I'm preferring to leave the lines in, but commented, so it's clear
why those aren't being init'd, *and* why 'Statistics' still is, and as
of what game version.
2021-11-21 11:24:18 +00:00
Athanasius
5a9c36149e
Merge pull request #1352 from EDCD/dependabot/pip/develop/flake8-noqa-1.2.1
build(deps-dev): bump flake8-noqa from 1.2.0 to 1.2.1
2021-11-18 18:34:59 +00:00
Athanasius
331e0af2ec
Merge pull request #1350 from EDCD/dependabot/github_actions/develop/actions/setup-python-2.3.0
build(deps): bump actions/setup-python from 2.2.2 to 2.3.0
2021-11-18 18:34:53 +00:00
dependabot[bot]
f5a65dd666
build(deps-dev): bump flake8-noqa from 1.2.0 to 1.2.1
Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/plinss/flake8-noqa/releases)
- [Commits](https://github.com/plinss/flake8-noqa/compare/v1.2.0...v1.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-18 17:04:06 +00:00
dependabot[bot]
45437368b9
build(deps): bump actions/setup-python from 2.2.2 to 2.3.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.2.2...v2.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-17 17:02:46 +00:00
Athanasius
8909fc8249
Python: Bump version to 3.9.9
Test build done locally, .exe showed no problems.
2021-11-16 11:42:19 +00:00
Athanasius
785f9a3235
PLUGINS.md: We don't currently include all of Python stdlib 2021-11-16 11:07:32 +00:00
Athanasius
ba69029593
L10n: Re-generated now we have a LANG for "Minimize to systray" 2021-11-13 12:38:49 +00:00
Athanasius
03657092af
systray: Add LANG comment
The original systray work seems to predate the LANG comments, and I
didn't double-check there *was* one.
2021-11-13 12:37:31 +00:00
Athanasius
741b90c528
Set develop version back to 5.3.0-beta0 2021-11-13 11:26:02 +00:00
Athanasius
deec91162d
Release 5.2.2: Update translations Release/5.2.2 2021-11-13 11:01:20 +00:00
Athanasius
63b112975c
Release 5.2.2: appversion & changelog 2021-11-13 10:55:36 +00:00
Athanasius
87f673bc40
Merge pull request #1343 from EDCD/enhancement/126/minimise-systray
Fully implement systray, and minimising to it.
2021-11-12 19:46:26 +00:00
Athanasius
538c06e342
systray: Out of paranoia, only .withdraw() on win32
Just in case a user gets the bright idea to set the config option
manually....
2021-11-12 18:54:35 +00:00
Athanasius
8af5424f9d
Revert change to PrefsVersion.stringSerial argument name
It's a 'published' interface in that importing PrefsVersion is
documented in PLUGINS.md, even if use of this specific function isn't.
2021-11-12 16:53:13 +00:00
Athanasius
83f6d037a0
Merge pull request #1344 from EDCD/fix/1342/navroute-no-route
EDDN: Sanity check NavRoute contents & handle EDDN 400
2021-11-12 16:46:21 +00:00
Athanasius
33fbbd4da9
eddn/L10n: Use single quotes in translated strings 2021-11-12 15:36:26 +00:00
Athanasius
f5a4469337
EDDN: Sanity check NavRoute contents & handle EDDN 400
* Closes #1342 - A user had a NavRoute message with no Route array.
  It's always from the file, so the file had to be missing it?
* This results in an EDDN '400', and now we'll drop such messages from
  the replaylog so they're not constantly retried.
2021-11-12 15:06:27 +00:00
Athanasius
29461dd6e3
systray: Now correctly minimising to systray if required 2021-11-12 14:23:18 +00:00
Athanasius
ac824ceb13
systray: Withdraw window when oniconify() called
NB: Currently this doesn't work for the Default theme as its 'iconify'
doesn't go through this function.
2021-11-12 13:37:45 +00:00
Athanasius
4d069cb406
Attempting to re-enable Windows "minimize to system tray" support
1. It's not actually hiding the task bar icon currently.
2. As this touched prefs.py I've done a flake8 and mypy cleanup pass
   too.  But some of that will want reviewing later as I noqa'd some
   things.
2021-11-12 13:17:27 +00:00
Athanasius
5301865c9f
Merge pull request #1341 from EDCD/dependabot/pip/develop/coverage-toml--6.1.2
build(deps-dev): bump coverage[toml] from 6.1.1 to 6.1.2
2021-11-11 17:41:07 +00:00
dependabot[bot]
5c3c7dff00
build(deps-dev): bump coverage[toml] from 6.1.1 to 6.1.2
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.1.1 to 6.1.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.1.1...6.1.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-11-11 17:03:26 +00:00
Athanasius
cae605ab71
Merge pull request #1339 from EDCD/fix/1132/unound-requests-on-network-down
CAPI: Don't blindly dump r(equest.Response) on failure
2021-11-10 17:45:58 +00:00
Athanasius
8b9e7684b3
Merge pull request #1340 from EDCD/dependabot/pip/develop/types-requests-2.26.0
build(deps-dev): bump types-requests from 2.25.12 to 2.26.0
2021-11-10 17:45:46 +00:00
dependabot[bot]
f427ca0d38
build(deps-dev): bump types-requests from 2.25.12 to 2.26.0
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.12 to 2.26.0.
- [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-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-10 17:04:26 +00:00
Athanasius
b0b1ed589b
CAPI: Don't blindly dump r(equest.Response) on failure
Also explicitly logs the exception now.
2021-11-10 10:07:37 +00:00
Athanasius
654e770b22
Merge pull request #1337 from EDCD/dependabot/pip/develop/types-requests-2.25.12
build(deps-dev): bump types-requests from 2.25.11 to 2.25.12
2021-11-10 10:04:10 +00:00
Athanasius
54b49fc4e8
Merge pull request #1336 from EDCD/dependabot/pip/develop/isort-5.10.1
build(deps-dev): bump isort from 5.10.0 to 5.10.1
2021-11-10 10:03:50 +00:00
dependabot[bot]
a8a1cf3249
build(deps-dev): bump types-requests from 2.25.11 to 2.25.12
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.11 to 2.25.12.
- [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-11-09 17:05:24 +00:00
dependabot[bot]
93d69a9809
build(deps-dev): bump isort from 5.10.0 to 5.10.1
Bumps [isort](https://github.com/pycqa/isort) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.10.0...5.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-09 17:05:21 +00:00
Athanasius
6c383b050c
config: develop appversion bump to 5.3.0-beta0 2021-11-07 13:19:47 +00:00
Athanasius
9eb90efed6
Bump pyton version to 3.9.8 2021-11-07 12:25:23 +00:00
Athanasius
b589ac39a5
Release 5.2.1: appversion and changelog Release/5.2.1 2021-11-07 11:59:26 +00:00
Athanasius
39a303fd17
Pre-Release 5.2.1-rc2: appversion and changelog Release/5.2.1-rc2 2021-11-06 14:58:30 +00:00
Athanasius
9600228391
Merge branch 'fix/1330/frontier-reauth' into release-5.2.1-rc1 2021-11-06 14:57:37 +00:00
Athanasius
7bf564d3b3
CAPI: ensure config.capi_debug_access_token is bound/set 2021-11-06 14:56:57 +00:00
Athanasius
b8719edb92
Pre-Release 5.2.1-rc1: appversion and changelog Release/5.2.1-rc1 2021-11-06 14:19:33 +00:00
Athanasius
6bec46be4e
CAPI: Implement a one-shot override of the Access Token
This allows you to force use of an expired token so as to test the code
paths for that without waiting up to 4 hours for the current one to
expire.

NB: The Access Token is *only* stored in the headers of the `requests`
object.
2021-11-06 10:41:33 +00:00
Athanasius
919136874d
CAPI: Re-auth when Access Token expired: Need to .close() first
The old code did this, and without it we enter a loop of:

1. CAPI says unauthorized
2. We call login()
3. But companion.session.state == STATE_OK, so do nothing
4. Re-scheduled CAPI request goes back to 1.
2021-11-06 08:41:09 +00:00
Athanasius
7a52ddd278
CAPI: Add retry of request after refreshing Access Token 2021-11-05 17:57:35 +00:00
Athanasius
8e32ecd216
CAPI: Actually try to use Refresh Token if CAPI says unauthorized
The refactor for threaded CAPI worker has inadvertently caused us to
always try *full* re-auth when the CAPI signals the Access Token is
expired.
2021-11-05 17:52:50 +00:00
Athanasius
1e00b64bc3
Merge pull request #1329 from EDCD/dependabot/pip/develop/isort-5.10.0
build(deps-dev): bump isort from 5.9.3 to 5.10.0
2021-11-03 17:59:34 +00:00
Athanasius
3cda191537
Merge pull request #1328 from EDCD/dependabot/github_actions/develop/actions/checkout-2.4.0
build(deps): bump actions/checkout from 2.3.5 to 2.4.0
2021-11-03 17:59:24 +00:00