ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-10-25 01:06:05 +03:00
Code Issues Projects Releases Wiki Activity
3,646 Commits 12 Branches 299 Tags
2e5e55af9ae97aa41b5d0eb9c0a2000fe8b3e2a4
Commit Graph
3646 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
A_D 2e5e55af9a Applied requested changes 2021-06-20 17:44:29 +02:00
A_D f609545fdc Updated plugin docs 2021-06-18 23:36:45 +02:00
A_D 6c140abe97 Fixed import ordering 2021-06-18 23:36:45 +02:00
A_D fe0e752c9b Added support for arbitrary plugins for POST debug 
This works by replacing --eddn-local with --debug-sender, and making the
webserver more generic. support has been added to EDSM, EDDN, and INARA.
 2021-06-18 23:36:42 +02:00
A_D 57d7889da9 Sorted imports 2021-06-18 23:34:26 +02:00
A_D 9c6577750e Sorted imports 2021-06-18 23:34:26 +02:00
A_D 520d80775d Output to a file instead of stdout 2021-06-18 23:34:26 +02:00
A_D 4ef153b1b2 Added fake EDDN Listener 
A simple HTTP handler has been added that will dump any and all POST
data it gets to EDMC's log.

Additionally, a new command line argument to switch EDMC to using this
as its EDDN target has been added.
 2021-06-18 23:34:20 +02:00
Athanasius 108205458b Merge pull request #1174 from EDCD/fix/1087-caseless-journal-event 
Made most event lookups case insensitive
 2021-06-18 19:40:55 +01:00
Athanasius 9280b902d1 monitor: Use original event type string for keying into monitor.state 2021-06-18 14:09:19 +01:00
Athanasius c6a42a3877 monitor: entry_type lower-case pass & one note to fix 
* This is after rebase on `develop`, so some 'new' events needed
  lowering.
* But there's one instance of entry_type being used as a key into
  monitor.state, so will need to rework that.
 2021-06-18 14:06:49 +01:00
A_D 6de13b9c4d Re-cased mistakenly lowered field 2021-06-18 13:56:45 +01:00
Athanasius 6ad22541fe Made most event lookups case insensitive 
Slightly more than `s/((el)?if event_type (in|==) \(?('(?:.*[A-Z].*).*')\)?:)$/\L$1`.

Closes #1087
 2021-06-18 10:42:13 +01:00
Athanasius d823082a51 Merge pull request #1172 from EDCD/dependabot/pip/develop/types-requests-0.1.12 
build(deps-dev): bump types-requests from 0.1.11 to 0.1.12
 2021-06-17 18:05:27 +01:00
dependabot[bot] 54e703bb29 build(deps-dev): bump types-requests from 0.1.11 to 0.1.12 
Bumps [types-requests](https://github.com/python/typeshed) from 0.1.11 to 0.1.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-06-17 17:03:10 +00:00
Athanasius 63dd73512e Merge pull request #1171 from EDCD/dependabot/pip/develop/types-requests-0.1.11 
build(deps-dev): bump types-requests from 0.1.9 to 0.1.11
 2021-06-14 08:54:02 +01:00
dependabot[bot] 58f562dbc1 build(deps-dev): bump types-requests from 0.1.9 to 0.1.11 
Bumps [types-requests](https://github.com/python/typeshed) from 0.1.9 to 0.1.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-06-14 06:48:13 +00:00
Athanasius c98d94e582 Merge pull request #1170 from EDCD/fix/1166/frontier-lagging-at-edo-settlement 
CAPI: Properly catch "CAPI says docked at EDO settlement, but we forgot where"
 2021-06-13 22:39:10 +01:00
Athanasius 713b6b753d CAPI: Catch where we're CAPI-docked, but monitor.station is None 
Docked at an EDO settlement means CAPI says we are, but we've forgotten
monitor.station because there's not enough Journal information and too
many corner cases to be *sure* of re-using old data.
 2021-06-13 20:09:00 +01:00
Athanasius 88b56b6913 CAPI: Add logger.warning() for *why* we raise ServerLagging 2021-06-13 19:43:14 +01:00
Athanasius a0b310f72e Translations: Amalgamate some LANG comments & en.template updated 2021-06-13 15:49:09 +01:00
Athanasius 4106cd9679 Merge pull request #1169 from EDCD/fix/l10n-script-wrong-comment-line 
LANG comments: Fix script for all situations
 2021-06-13 15:23:08 +01:00
Athanasius e584c13e8d l10n script: remove extraneous "and not out" from conditionals 
Left over from when trying to fix the old loop.
 2021-06-13 15:20:41 +01:00
Athanasius 5dee9d2cff l10n script: Use different regex for 'above' comments 
This allows us to only consider an 'above' comment if its a standalone
one.  Meaning there can't possibly be a `_(...)` call on its line, with
it intended for that call, not the one on this line.
 2021-06-13 15:13:36 +01:00
Athanasius 7a858b25d2 EDMarketConnector.py: Fix following-line LANG comment 2021-06-13 15:13:09 +01:00
Athanasius 4f481cc703 l10n script: TODO: issue with LANG above *for* above, not current 2021-06-13 15:02:50 +01:00
Athanasius 83f3f09882 companion: Tweak LANG comment for 'CAPI disagreed with Journal game location' 
'Journal location' is ambiguous, potentially referring to where on-disk
the files are.
 2021-06-13 14:59:35 +01:00
Athanasius e1e09aebad l10n script: Attempt to always use correct LANG comment 
There was an issue where consecutive lines, each with a LANG comment,
caused the next line to use the 'above' line's comment.
 2021-06-13 14:58:42 +01:00
Athanasius cba3835698 EDMarketConnector: Split multi-_(...) line to separate ones for LANG comments 2021-06-13 14:57:14 +01:00
Athanasius b6f3713531 Translations: Updated en.template with new LANG-comment based comments 2021-06-13 14:03:05 +01:00
Athanasius b3b4a482b3 Translations: Updated with latest 20210613 2021-06-13 13:49:13 +01:00
Athanasius e736f30358 Merge pull request #1158 from EDCD/enhancement/l10n-add-missing-LANG-comments 
Add all missing LANG comments
 2021-06-13 13:48:34 +01:00
Athanasius 28ceb72a27 plugins/edsm: LANG comments added 2021-06-13 13:37:21 +01:00
Athanasius 5ad3ec8d8f plugins/coriolis: LANG comments added 2021-06-13 13:10:14 +01:00
Athanasius 4f1f07957c journal_lock: LANG comments 2021-06-13 13:02:13 +01:00
Athanasius 7552e93f07 EDMarketConnector: Final LANG comments 2021-06-13 12:59:50 +01:00
Athanasius b09a102d87 companion.py: Final LANG comments added. 2021-06-13 12:51:48 +01:00
Athanasius f449e85c0b CAPI: 'SKUError' exception was never used - removed 
Also LANG comments added.
 2021-06-13 12:42:50 +01:00
Athanasius 3a1af1c2b2 prefs.py: Final additional LANG comments 2021-06-13 12:39:24 +01:00
Athanasius 5c6a4fe68c prefs.py: LANG comments and some slight code re-arrangement 
The whole LANG comment thing works best with a single `_(...)` on any
given line, so splitting some of these `thing if X else other` into full
conditionals.
 2021-06-13 12:22:01 +01:00
Athanasius 21098f8cfd stats.py: Missing LANG comment, and type ignore on some ctypes 2021-06-13 12:14:01 +01:00
Athanasius 8a756fee39 Merge pull request #1167 from A-UNDERSCORE-D/fix/890/forget-frontier-auth 
Added CL arg to forget all frontier tokens
 2021-06-13 12:04:32 +01:00
Athanasius 799b5b7666 CAPI: Change confusing post-login again log message 2021-06-12 19:24:26 +01:00
A_D 284064d6ed Added CL arg to forget all frontier tokens 
This is obviously quite annoying but should provide a magic fix to any
user with weird auth trouble (such as those seen by
EDCD/EDMarketConnector#1166 )

Closes EDCD/EDMarketConnector#890
 2021-06-12 16:38:25 +02:00
Athanasius 44e4772d60 Merge pull request #1165 from EDCD/dependabot/pip/develop/mypy-0.902 
build(deps-dev): bump mypy from 0.901 to 0.902
 2021-06-11 08:24:23 +01:00
dependabot[bot] 8abe0d7c8d build(deps-dev): bump mypy from 0.901 to 0.902 
Bumps [mypy](https://github.com/python/mypy) from 0.901 to 0.902.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.901...v0.902)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-11 06:48:40 +00:00
Athanasius 7d36404d5c config: Post-release appversion bump to 5.1.2-beta0 2021-06-10 20:47:12 +01:00
A_D cba7aee874 Fixed printed file line number sometimes off by one 2021-06-10 20:29:11 +01:00
A_D e89c0e9e21 Fixed possibly unbound variable 2021-06-10 20:29:11 +01:00
A_D 8d77cc039b Added LANG comments for EDDN localisation 2021-06-10 20:29:11 +01:00