ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-11-14 02:32:44 +03:00
Code Issues Projects Releases Wiki Activity
3,933 Commits 17 Branches 299 Tags
58ea0abd5e2e862b17bdbabe2a982780cd5f4efb
Commit Graph
3933 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius 58ea0abd5e companion: s/URL_MARKET/Session.FRONTIER_CAPI_PATH_MARKET/g 2021-08-23 18:29:34 +01:00
Athanasius 6f9f71d699 companion: s/FRONTIER_PATH/FRONTIER_AUTH_PATH/g 
This is so as to keep Frontier *auth* separate from Frontier *CAPI*.
 2021-08-23 18:29:34 +01:00
Athanasius 661ffb100b companion: URL_DECODE -> Auth.FRONTIER_PATH_DECODE 2021-08-23 18:29:33 +01:00
Athanasius 52a6eeb82a companion: URL_TOKEN -> Auth.FRONTIER_PATH_TOKEN 
Also, rename FRONTIER_AUTH_PATH to FRONTIER_PATH_AUTH.
 2021-08-23 18:29:33 +01:00
Athanasius f5bde2dcc6 companion: Rename URL_AUTH to FRONTIER_AUTH_PATH, in class Auth 2021-08-23 18:29:33 +01:00
Athanasius a823106556 companion: Rename SERVER_AUTH to FRONTIER_AUTH_SERVER 
Also moves back to global scope, as it's used in both Auth and Session
classes.
 2021-08-23 18:29:33 +01:00
Athanasius 692b014cda companion: Correct import order of tkinter 2021-08-23 18:29:33 +01:00
Athanasius 23e67dab82 companion: Move global constants into appropriate classes 2021-08-23 18:29:32 +01:00
Athanasius 454c9f3d0c CAPI: Continuing code moving/cleanup up/testing 
1. Sending back a spurious CredentialsError() to check it's now handled,
   but other issues blocking the code from getting there currently.
2. Move the "Update suit data from CAPI" call into the AppWindow
   handler.
3. Move some more of the old query() exception handling into the worker.
4. session.query() no longer returns anything, and neither should
   anything that calls it (like session.station()).  This is going to
   take quite some unwinding and code moving.
 2021-08-23 18:29:32 +01:00
Athanasius 018b4563b3 CAPI: return good data from worker & start handling reauth 2021-08-23 18:29:32 +01:00
Athanasius ce02cfdf2d CAPI: Remove "test failure propogration" forced error 2021-08-23 18:29:32 +01:00
Athanasius 7f362be740 CAPI: Reinstate/format post-query exceptions/etc in AppWindow 2021-08-23 18:29:32 +01:00
Athanasius 407bc9f53a CAPI: Set companion.Session.tk_master ASAP from AppWindow 2021-08-23 18:29:31 +01:00
Athanasius 655c7ea1ca CAPI: Some progress in using a Queue to signal result/error 
Due to main app being Tk we can't just use Python async functionality.

So instead we have a class to hold a message and optional exception.
And instance of that goes into a queue.
The reading of that in the main thread is triggered by sending a Tk
event.

Much more to come.
 2021-08-23 18:29:31 +01:00
Athanasius 2fc1568bf7 CAPI: Move CAPI response processing into AppWindow.capi_handle_response() 2021-08-23 18:29:31 +01:00
Athanasius e79d219657 CAPI: Rename AppWindow.getandsend() to be more obvious 2021-08-23 18:29:31 +01:00
Athanasius 9c079c190d CAPI: Set up AppWindow handling of <<CAPIResponse>> Tk event 2021-08-23 18:29:31 +01:00
Athanasius 11916f1387 companion; Dummy CAPI worker enqueue to test code 
This properly triggered the logging in the worker thread
 2021-08-23 18:29:30 +01:00
Athanasius 9661d770cb companion: Implement, and use, asking CAPI thread to close down 2021-08-23 18:29:30 +01:00
Athanasius c5af0a3397 companion: Create CAPI worker thread on startup 
Confirmed to also *not* block shutdown currently
 2021-08-23 18:29:30 +01:00
Athanasius bfaf66d873 EDMarketConnector: Correct back to monitor.start() 
Bad PyCharm Refactor ! No Cookie!
 2021-08-23 18:29:30 +01:00
Athanasius d0e1391238 companion: More function reordering, and comment-marking of sections 
The file has:

1a. class Session - Frontier Auth
1b. class Session - CAPI queries
1c. class Session - Utility functions (to do with CAPI query data, but
  not directly about *making* those queries.
2. Some non-class utility functions.
 2021-08-23 18:29:30 +01:00
Athanasius c01438f77e companion: Move start_frontier_auth() above login() 
The former will be used by the latter, so this makes more sense when
reading the code.

In general I'm going to ensure there are two sections to this Session
class:

1. Frontier Auth code.
2. CAPI query code.

Yes, ideally I'd split it into two classes.  But that kind of
refactoring isn't for *this* branch.  I just want things straight in my
head for the "make CAPI queries run in a thread" changes.
 2021-08-23 18:29:29 +01:00
Athanasius 81b5d015fd Frontier Auth: Rename start() method to something more obvious 2021-08-23 18:29:29 +01:00
Athanasius 7339cc59ed companion: Fix class Session docstring 
This is *not* only for the Frontier oAuth2 authn, it's also for the
actual CAPI queries.
 2021-08-23 18:29:15 +01:00
Athanasius e0f3787a31 Merge pull request #1258 from EDCD/dependabot/pip/develop/watchdog-2.1.5 
build(deps): bump watchdog from 2.1.4 to 2.1.5
 2021-08-23 18:28:16 +01:00
dependabot[bot] a70c43098b build(deps): bump watchdog from 2.1.4 to 2.1.5 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.4 to 2.1.5.
- [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.4...v2.1.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 17:03:20 +00:00
Athanasius b0bf291dd7 Merge pull request #1257 from A-UNDERSCORE-D/enhancement/killswitch-docs 
Additional example for killswitch docs
 2021-08-23 13:39:56 +01:00
A_D bc7985e8fb updated docs 2021-08-23 12:50:07 +02:00
A_D 0eb3056236 resolved bug in wildcard detection 2021-08-23 12:46:57 +02:00
Athanasius c886290ff8 Merge pull request #1191 from A-UNDERSCORE-D/fix/1187/EDDN-Extend-killswitch-functionality-to-fields-within-events 
Extend killswitch functionality to fields within events
 2021-08-23 11:03:57 +01:00
A_D 88a7de6dd0 removed redundant test 2021-08-22 22:18:50 +02:00
A_D e8cd29442f fixed missing data types 2021-08-22 21:46:02 +02:00
A_D afa0217ed8 additional info in docstrings 2021-08-22 21:45:51 +02:00
A_D b86a010596 updated docs further 2021-08-22 09:03:36 +02:00
A_D dac13216a0 remove uneeded cast and fix bug in passed data 2021-08-19 20:51:23 +02:00
A_D 8134a04739 clarified docstrings 2021-08-19 20:46:29 +02:00
A_D 3e5efb03ec mentioned killswitch test script 2021-08-19 20:41:40 +02:00
A_D 1b45c562c1 added note about killswitch_test.py 2021-08-19 20:41:40 +02:00
A_D 27c1871250 cleanup 2021-08-19 20:41:37 +02:00
A_D cc17f21cc5 s/\t/\s\s\s\s/g 2021-08-19 20:39:40 +02:00
A_D 5a080c8e55 updated docs 2021-08-19 20:37:40 +02:00
A_D c86b9790ca updated eddb to new killswitches 2021-08-19 20:37:40 +02:00
A_D bb882d633a clarified docs around inara 2021-08-19 20:37:40 +02:00
A_D 6c7245ee3d updated eddn to new killswitches 2021-08-19 20:37:39 +02:00
A_D f62f1ee97b made types consistent and generic 2021-08-19 20:37:39 +02:00
A_D 1e71955375 added check_multiple method 2021-08-19 20:37:39 +02:00
A_D 984d09947c added threaded request helper 2021-08-19 20:37:38 +02:00
A_D 665548fde3 Clarified that SimpleSpec supports both version wildcards and ranges 2021-08-19 20:37:38 +02:00
A_D e081e1991b docstring fixups 2021-08-19 20:37:38 +02:00