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

2697 Commits

Author SHA1 Message Date
A_D
7f53230a95 Cleaned up imports 2021-04-01 14:45:45 +01:00
A_D
54023725e9 Made sure to catch exceptions in get()
The various get_* functions vary in implementation, but some raise a
ValueError when they are used with a key of the wrong type. This catches
that ValueError when hunting for a valid type.
2021-04-01 14:45:45 +01:00
A_D
36f80d6b15 Updated docstrings, added bool support 2021-04-01 14:45:45 +01:00
A_D
0367dd8ba0 Added legacy password subsystem to AbstractConfig 2021-04-01 14:45:45 +01:00
A_D
e3807648f7 Added linux AbstractConfig implementation 2021-04-01 14:45:45 +01:00
A_D
482c502f52 Added darwin config implementation 2021-04-01 14:45:45 +01:00
A_D
6b464432bf Simplified __get_registry logic. Added Docstrings 2021-04-01 14:45:45 +01:00
A_D
6a159c0a25 Added Abstract config class
The abstract class will be implemented by per-platform subclasses, which
will be set as the singleton at the end of development.
2021-04-01 14:45:45 +01:00
A_D
8104359a72 Resolved mypy windll errors 2021-04-01 14:45:45 +01:00
A_D
bbcf5c9daa Removed unknown error log, added defaults 2021-04-01 14:45:45 +01:00
dependabot[bot]
3d19d26edd Bump safety from 1.9.0 to 1.10.0
Bumps [safety](https://github.com/pyupio/safety) from 1.9.0 to 1.10.0.
- [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.9.0...1.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
dependabot[bot]
4a9fe077f9 Bump flake8-comprehensions from 3.3.0 to 3.3.1
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases)
- [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/master/HISTORY.rst)
- [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.3.0...3.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
A_D
c2faad1eb7 Removed uneeded whitespace 2021-04-01 14:45:45 +01:00
A_D
1c80578fef Fixed backwards pip install command 2021-04-01 14:45:45 +01:00
Athanasius
c69cc77682 Added auto-annotation to both checks
This works based on telling github how to understand the flake8 output

# Conflicts:
#	.github/workflows/push-checks.yml
2021-04-01 14:45:45 +01:00
Athanasius
7e094df6c4 Switch to Python 3.8.6 for windows builds on GitHub 2021-04-01 14:45:45 +01:00
A_D
d847fb8bc1 Removed appcast, only upload msi installer 2021-04-01 14:45:45 +01:00
dependabot[bot]
7bdbcd5538 Bump certifi from 2020.11.8 to 2020.12.5
Bumps [certifi](https://github.com/certifi/python-certifi) from 2020.11.8 to 2020.12.5.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2020.11.08...2020.12.05)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
dependabot[bot]
8bc119c834 Bump flake8-json from 19.8.0 to 20.12.1
Bumps [flake8-json](https://gitlab.com/pycqa/flake8-json) from 19.8.0 to 20.12.1.
- [Release notes](https://gitlab.com/pycqa/flake8-json/tags)
- [Commits](https://gitlab.com/pycqa/flake8-json/compare/19.8.0...20.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
dependabot[bot]
80ac14756d Bump py2exe from 0.10.0.2 to 0.10.1.0
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.10.0.2 to 0.10.1.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.10.0.2...v0.10.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
dependabot[bot]
3e96184ba5 Bump certifi from 2020.6.20 to 2020.11.8
Bumps [certifi](https://github.com/certifi/python-certifi) from 2020.6.20 to 2020.11.8.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2020.06.20...2020.11.08)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
Athanasius
cb678522d7 Releasing: py2exe via pip / requirements-dev.txt now. 2021-04-01 14:45:45 +01:00
Athanasius
0f3ba584e9 requirements: py2exe now available from pypi, so no need for VCS 2021-04-01 14:45:45 +01:00
dependabot[bot]
bdb3387df3 Bump flake8-comprehensions from 3.2.3 to 3.3.0
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases)
- [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/master/HISTORY.rst)
- [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.2.3...3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 14:45:45 +01:00
Athanasius
df238c3e95 Bump py2exe to 0.10.0.2
NB: Possibly due to the git tag form I had to

'pip install --user --upgrade -r requirements-dev.txt`

to get it to upgrade.
2021-04-01 14:45:45 +01:00
Athanasius
6ec24157f2 CAPIData: Only call self.check_modules_ships() if lastStarport present
* The companion Session.query is called for *all* CAPI endpoints and
  only the /profile one will return lastStartport data, which is where
  ships/modules are if present, so only do these checks if we see
  lastStarport.
2021-04-01 14:45:45 +01:00
Athanasius
bd670b7ff1 Updated plugins to expect that CAPI data is safe
# Conflicts:
#	plugins/eddn.py
2021-04-01 14:45:45 +01:00
A_D
fbd924d5aa Added CAPIData class
Currently it is simply a dict subclass that does some of the cleanup
required to make everything happy. In future it will be changed to be a
NamedTuple or similar that can be typed
2021-04-01 14:45:44 +01:00
Athanasius
9f45960fe3 dashboard: Reinstate "from calendar import timegm"
This was inadvertently removed in 102fe809783141394ee31a30158c5ed81ea4d996
2021-04-01 14:45:44 +01:00
Athanasius
bc3269f2f8 EDMarketConnector: popup for "already running"
* This also refactors code around so that isort and flake8 are happy
  about the module level imports.
2021-04-01 14:45:44 +01:00
Athanasius
c6083a2643 EDMarketConnector: Minor comments changes
# Conflicts:
#	EDMarketConnector.py
2021-04-01 14:45:44 +01:00
Athanasius
248493c16a EDMarketConnector: Change 'no other .exe runnig?' checks
* This is now done even before the stdout/err redirect.
* The function is now called no_other_instance_running() to make the
  conditional use of it read more naturally.
* For now this *append* logs to the plain log file.  **BUT** any
  subsequent write by the already-running process will be over the top
  of this, so a future commit will use a popup instead.

# Conflicts:
#	EDMarketConnector.py
2021-04-01 14:45:44 +01:00
Athanasius
3a57128e28 EDMarketConnector: Care about "are we already running?" check
1) Don't log in this check, we're a different process.
2) But we've stomped the plain log file already!
3) Python 3.8.6 seems to not like sys.exit(0) from that ctypes code, so
 `return False` instead and check the return from EnumWindows().
2021-04-01 14:45:44 +01:00
Athanasius
404f1fa641 dashboard: No need for except var if unused. 2021-04-01 14:45:44 +01:00
Athanasius
9b09d8bd07 plugins/inara: Close down logging & Remove unused this.queue.
* The new_worker/NewThis doesn't currently have a mechanism to ask the
 new_worker to exit.  It's relying on being a daemon thread and dying
 once all non-daemon (i.e. main) threads have exited.
2021-04-01 14:45:44 +01:00
Athanasius
8aac704fa1 plugins/edsm: start/stop detailed logging. 2021-04-01 14:45:44 +01:00
Athanasius
983e4d7acb plugins/eddn: Detailed stop logging. 2021-04-01 14:45:44 +01:00
Athanasius
8b3785cdf7 monitor.py: Detailed logging EDLogs.worker() 2021-04-01 14:45:44 +01:00
Athanasius
abfde73362 dashboard, hotkey, protocol: Use EDMCLogging.get_main_logger()
It does the EDMC/EDMarketConnector check.
2021-04-01 14:45:44 +01:00
Athanasius
9be7f14573 monitor.py: Detailed logging EDLogs.start() 2021-04-01 14:45:44 +01:00
Athanasius
4a84d9c341 monitor: Detailed logging EDLogs.stop()
# Conflicts:
#	monitor.py
2021-04-01 14:45:44 +01:00
Athanasius
7ebf2a553a monitor: Detailed logging EDLogs.close() 2021-04-01 14:45:44 +01:00
Athanasius
c47688227b dashboard: Detailed logging Dashboard.start()
# Conflicts:
#	dashboard.py
2021-04-01 14:45:44 +01:00
Athanasius
137c66048a dashboard: Remove print_exc use (logger.exception instead)
# Conflicts:
#	dashboard.py
2021-04-01 14:45:44 +01:00
Athanasius
fd19ac337a dashboard: Detailed logging Dashboard .stop() & .close()
# Conflicts:
#	dashboard.py
2021-04-01 14:45:44 +01:00
Athanasius
99e2dfb62a hotkey: Detailed logging in HotKeyMgr.worker()
# Conflicts:
#	hotkey.py
2021-04-01 14:45:44 +01:00
Athanasius
9cff84327d hotkey: Detailed logging in HotKeyMgr.register() 2021-04-01 14:45:44 +01:00
Athanasius
a47b9cfa8d hotkey: Detailed logging in HotKeyMgr.unregister() 2021-04-01 14:45:44 +01:00
Athanasius
c5a57e8a43 protocol.py: Log *end* of protocolhandler.close() 2021-04-01 14:45:44 +01:00
Athanasius
d5b2f32d18 protocol.py: Add logging to protocol shutdown sequence
# Conflicts:
#	protocol.py
2021-04-01 14:45:44 +01:00