1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 17:12:21 +03:00

2921 Commits

Author SHA1 Message Date
Athanasius
ce45a4d405 Fix console redirect to work with config.py now using logging.
1. We were now importing from config before the console redirect code
   runs.
2. That means that config.py's `logger = logging.getLogger(appname)`
   caused the logger to be set up whilst stdout/err were still pointing
   at the console.
3. So the redirect then had no effect on logging output.

This commit moves the import from config (and also killswitch, because
it also imports logging) to after the *moved* console redirect code.

NB: This needs the "detected a process already running" instance
checking.

NB: There's still a `True or ` for testing purposes EDMarketConnector.py:25

# Conflicts:
#	EDMarketConnector.py
2021-04-01 14:45:48 +01:00
dependabot[bot]
762ceda73f Bump watchdog from 0.10.3 to 1.0.2
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 0.10.3 to 1.0.2.
- [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/v0.10.3...v1.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:48 +01:00
Athanasius
cd909329af requirements: Change all specified versions to '=='
Although the issue we've identified with GitHub builds isn't to do with
a python module version it's best to nail precise versions so we can be
sure it will build with the same as we've tested locally.
2021-04-01 14:45:48 +01:00
Athanasius
b7094c59f3 config: __in_shutdown needs to be abstract member, not self. ? 2021-04-01 14:45:48 +01:00
Athanasius
104f215732 protocol.py: Need from config import config 2021-04-01 14:45:48 +01:00
Athanasius
a8aab186bf config: Update some 'callers' of config.shutting_down for it being a property 2021-04-01 14:45:48 +01:00
Athanasius
3ed08f0f7e plugins/inara: Avoid Tk event_generate() calls during shutdown
# Conflicts:
#	plugins/inara.py
2021-04-01 14:45:48 +01:00
Athanasius
db48b6eaad plugins/edsm: Avoid Tk event_generate() calls during shutdown
# Conflicts:
#	plugins/edsm.py
2021-04-01 14:45:48 +01:00
Athanasius
e7a7314c1a protocol: Avoid Tk event_generate() calls during shutdown
# Conflicts:
#	protocol.py
2021-04-01 14:45:48 +01:00
Athanasius
b39cc7974e hotkey: Avoid event_generate() calls during shutdown
# Conflicts:
#	hotkey.py
2021-04-01 14:45:48 +01:00
Athanasius
608a336bb3 dashboard: Bail early from process() if in shutdown
# Conflicts:
#	dashboard.py
2021-04-01 14:45:48 +01:00
Athanasius
28a230b584 config: Change self.in_shutdown to be mangled.
I specifically made set_shutdown() *not* take an argument and only ever
set this true so no-one else can monkey with it, so might as well mangle
it too.
2021-04-01 14:45:48 +01:00
Athanasius
719a58cbe9 plug.py: Avoid Tk event_generate() call from show_error() if in shutdown
# Conflicts:
#	plug.py
2021-04-01 14:45:48 +01:00
Athanasius
2459c40c48 EDMarketConnector: call config.set_shutdown() in AppWindow.onexit() 2021-04-01 14:45:48 +01:00
Athanasius
50f9410c02 config: Add class member and methods for signalling/checking shutdown status 2021-04-01 14:45:48 +01:00
dependabot[bot]
a1423c7eba Bump safety from 1.10.1 to 1.10.2
Bumps [safety](https://github.com/pyupio/safety) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/pyupio/safety/releases)
- [Changelog](https://github.com/pyupio/safety/blob/master/HISTORY.rst)
- [Commits](https://github.com/pyupio/safety/compare/1.10.1...1.10.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:48 +01:00
A_D
0035f69c18 Missed one _str 2021-04-01 14:45:48 +01:00
A_D
00629b7420 use _str versions of paths for string ops 2021-04-01 14:45:48 +01:00
A_D
41f7391e42 Added _str properties for config Path variables 2021-04-01 14:45:48 +01:00
Athanasius
2319cbf404 Releasing.md: Document adding killswitches if needed. 2021-04-01 14:45:48 +01:00
A_D
b5a8c03980 Added missing whitespace 2021-04-01 14:45:48 +01:00
A_D
0fb5a3476a Removed prototyping code 2021-04-01 14:45:48 +01:00
A_D
4900361621 Set default killswitch URL to releases branch 2021-04-01 14:45:48 +01:00
A_D
cd67f12f22 Fixed eddn event specific killswitch 2021-04-01 14:45:48 +01:00
A_D
37a6b13d08 Updated wording for killswitch popup 2021-04-01 14:45:48 +01:00
A_D
b694bdc965 Added per-event killswitch 2021-04-01 14:45:48 +01:00
A_D
81e2cd2f92 Added warning popup on start
Popup shows on start when there are killswitches that match the current
version.
2021-04-01 14:45:48 +01:00
A_D
6374fbbeb8 Added event disabling
You can now disable specific event handlers in plugins
2021-04-01 14:45:47 +01:00
A_D
70087a27e4 Added total journal cutoff killswitches 2021-04-01 14:45:47 +01:00
A_D
6b75179199 switched to using SimpleSpec for constraints 2021-04-01 14:45:47 +01:00
A_D
8dca6783fc Fixed spelling, added utility methods 2021-04-01 14:45:47 +01:00
A_D
d5b62d957b Added support for comments in kill switches 2021-04-01 14:45:47 +01:00
A_D
f10cd9d70f Dont exit inara worker thread 2021-04-01 14:45:47 +01:00
A_D
10ca50bf5a Moved edsm killswitch check
It was causing exit hangs when edsm was disabled
2021-04-01 14:45:47 +01:00
A_D
98b27ee046 Fixed startup exception when unable to connect 2021-04-01 14:45:47 +01:00
A_D
2d127ae3d0 Added docs, fixed incorrect kill switch names 2021-04-01 14:45:47 +01:00
A_D
c96e59f7b3 Added fetch killswitch task on start 2021-04-01 14:45:47 +01:00
A_D
d81093760e Added hooks into killswitches in plugins 2021-04-01 14:45:47 +01:00
A_D
517a0e1f7c Added timeout to GET for killswitches 2021-04-01 14:45:47 +01:00
A_D
29adaa413b Added util method for URL -> KillSwitchSet 2021-04-01 14:45:47 +01:00
A_D
f7890a460b Added killswitch library
Killswitch exists to allow us to disable features causing issues in
specific versions remotely.

The system is designed to support plugins, where they can request their
own killswitch list by querying any web file that follows our format
(docs to be added), and using the returned KillSwitchSet to check for
disabled features.
2021-04-01 14:45:47 +01:00
A_D
4692a98f04 Removed warning from transparency slider 2021-04-01 14:45:47 +01:00
A_D
2a9ac882cd Added reset UI flag
Resets the ui theme to default and the transparency to default
2021-04-01 14:45:47 +01:00
A_D
0258d881ea Localised options 2021-04-01 14:45:47 +01:00
A_D
5235019d2a Added warning
Using transparency options on windows may cause unexpected behaviour
2021-04-01 14:45:47 +01:00
A_D
ed7d79c2f7 Added UI transparency option 2021-04-01 14:45:47 +01:00
A_D
281f66c7c1 Stringified plugin_dir for len check 2021-04-01 14:45:47 +01:00
A_D
965493ffed Silenced flake8 warning 2021-04-01 14:45:47 +01:00
A_D
2ff06c15ab Fix double quoted strings in workflow 2021-04-01 14:45:47 +01:00
Athanasius
b3b72a05a8 PLUGINS.md: Be explicit about why plugin_prefs(...) -> Optional[tk.Frame] 2021-04-01 14:45:47 +01:00