ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 17:12:21 +03:00
Code Issues Projects Releases Wiki Activity
2,385 Commits 16 Branches 276 Tags
Commit Graph

2385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
A_D
d58d831ebe
Replace python checks with jq in workflow 
Also makes sure that pushes to main ARE checked
 2021-01-05 17:20:21 +02:00
A_D
525f0b05e7 Added doctest 2021-01-05 14:34:52 +00:00
A_D
416b73bc3b Modified location of state updates 2021-01-05 14:34:52 +00:00
A_D
13f7b62fe8 Added cargoJSON to state docs 2021-01-05 14:34:52 +00:00
A_D
1be723e249 Added additional doccumentation 2021-01-05 14:34:51 +00:00
A_D
b04b39fa8a Fix multiple missions with the same cargo type 
A user can collect multiple missions with the same mission cargo, which
is added to the cargo.json as distinct entries. Previously we would take
the last number as the total, leading to invalid counts (and possibly
negative counts).

This adds a method to sum cargo entries based on the cargo name. It also
adds a field on status to access the original cargo JSON data.

Fixes #817
 2021-01-05 14:34:51 +00:00
Athanasius
91e6583326
Merge pull request #812 from A-UNDERSCORE-D/fix/808-log-in-property-func 
Added support for logging from properties
 2021-01-05 14:27:59 +00:00
Athanasius
2b96004100 Merge branch 'stable' into main 2021-01-05 14:18:12 +00:00
Athanasius
c1dcd30280 PLUGINS.md: Be explicit about why plugin_prefs(...) -> Optional[tk.Frame] 2020-12-21 14:44:39 +00:00
A_D
1cb876c594
Added support for logging from properties 
This is some best effort support for using logging in properties.

This works by using the (as suggested by reporter) inspect
`getattr_static` method, and failing that (as it can possibly fail),
wrapping a `getattr` in a try/catch for a RecursionError--don't want to
catch other things, probably best if that explodes on its own.

From there as the `property` object will not have location information,
we rebuild as best we can to an approximation of what the path would be.
With a healthy dash of defensive programming "Just in case".

I don't think that this will have any adverse effects to other logging
methods, as all the new code should only be touched if we hit a property
object.

Closes #808
 2020-12-21 12:39:45 +02:00
Athanasius
a65d77a67e PLUGINS.md: Make the disctinction between "ShutDown" and "Shutdown" clear 2020-12-18 12:32:45 +00:00
Athanasius
4883c1606b Merge branch 'releases' into stable 2020-12-15 20:12:50 +00:00
Athanasius
819bb27997 4.1.5: appcast file update Release/4.1.5 2020-12-15 20:02:24 +00:00
Athanasius
741d62c072 Release 4.1.5: Config.py version bump 2020-12-15 19:57:24 +00:00
Athanasius
95becbc49c 4.1.5 Changelog: The '??:??' logging thing, bug linking & preamble. 2020-12-15 19:45:17 +00:00
Athanasius
a68f5d6e84 Initial changelog for 4.1.5. 2020-12-15 19:39:23 +00:00
Athanasius
104963ceb1
Merge pull request #803 from EDCD/fix/catch-logging-inspect-failure 
EDMCLogging: Catch inspect.getframeinfo(frame) not working
 2020-12-15 19:37:55 +00:00
Athanasius
286647869b EDMCLogging: Comment out a 'testing' raise() call 2020-12-15 19:35:51 +00:00
Athanasius
f885c2b769 EDMCLogging: Catch inspect.getframeinfo(frame) not working 
Maybe with this we'll see something 'here' or later to give a clue as to
why this doesn't work on at least two systems.
 2020-12-15 15:08:36 +00:00
Athanasius
d903d80410 Make 'Shutting down...' text translatable. 2020-12-15 14:49:22 +00:00
Athanasius
3057551bff
Merge pull request #802 from EDCD/docs/plugins-python-version 
PLUGINS.md: Point to current Python version information in Releasing.md
 2020-12-12 14:03:02 +00:00
Athanasius
a181379669 PLUGINS.md: Point to current Python version information in Releasing.md 2020-12-12 14:02:11 +00:00
Athanasius
b5f98d7ced
Merge pull request #796 from A-UNDERSCORE-D/docs/windows-build-action 
Added docs for windows build action
 2020-12-08 18:20:18 +00:00
A_D
2b038a551b
Fixed github capitialization 2020-12-08 20:17:12 +02:00
A_D
f468227a6c
Renamed to Automatic builds in link 2020-12-08 20:12:09 +02:00
A_D
20f95460c4
Fixed actions link in release docs 2020-12-08 20:09:36 +02:00
A_D
77d9eb293e
Fixed a few style errors 2020-12-08 20:07:12 +02:00
A_D
3a980ef16a
Added docs for windows build action 2020-12-08 19:59:41 +02:00
Athanasius
cabf7289cb
Merge pull request #794 from EDCD/fix/actions-windows-build-name 
Add name to windows build action
 2020-12-08 17:42:27 +00:00
A_D
bd74aaf0aa
Add name to windows build action 
This should make it show up with a more sane name
 2020-12-08 19:36:26 +02:00
Athanasius
7737766a58
Merge pull request #792 from A-UNDERSCORE-D/actions/only-msi 
Remove Appcast generation, only upload msi installer
 2020-12-08 16:55:16 +00:00
A_D
3a0da6dadc
Added missing newline 2020-12-08 18:53:23 +02:00
A_D
033a3bb4da
Removed appcast, only upload msi installer 2020-12-08 18:51:00 +02:00
Athanasius
85a1a8efce
Merge pull request #789 from A-UNDERSCORE-D/github-actions-build 
Build automatically with github actions
 2020-12-08 16:40:24 +00:00
A_D
87afa69f53
Removed py2exe setup 2020-12-08 18:37:33 +02:00
A_D
fa3335d59a
Added windows build 2020-12-08 18:37:32 +02:00
Athanasius
ec93dec8a7
Merge pull request #791 from EDCD/enhancement/main-for-4.1.5 
Cherry-pick in some key commits for upcoming 4.1.5
 2020-12-08 16:33:01 +00:00
Athanasius
5cc4a6e80b EDMarketConnector: Add detailed logging to shutdown sequence 2020-12-08 16:14:06 +00:00
Athanasius
3ff9bdcc88 Fix Python 3.8 syntax use in backport to 4.1.x/Python 3.7 2020-12-08 16:08:30 +00:00
Athanasius
2b60220365 EDMarketConnector: popup for "already running" 
* This also refactors code around so that isort and flake8 are happy
  about the module level imports.
 2020-12-08 16:06:50 +00:00
A_D
d650db5a1a Added name mangling support to EDMCContextFilter 
Python name mangling is more about name collisions than actually making
things private.

This commit adds a check to resolve mangled names to their runtime
names, and adds a just-in-case default to fetching the attribute.

Fixes #764
 2020-12-08 15:59:40 +00:00
Athanasius
7be255b8ac Releasing: py2exe via pip / requirements-dev.txt now. 2020-12-08 15:59:28 +00:00
Athanasius
08ac054cce requirements: py2exe now available from pypi, so no need for VCS 2020-12-08 15:58:41 +00:00
Athanasius
654e062966
Merge pull request #790 from J15t98J/patch-1 
Fix dead link in PLUGINS.md
 2020-12-08 15:14:20 +00:00
Joshua Tyler-Jones
1c16b5fae6
Fix dead link in PLUGINS.md 2020-12-08 15:08:27 +00:00
Athanasius
f658660580
Merge pull request #783 from A-UNDERSCORE-D/fix/commodities-csv-not-updated 
Fixed Void Opal name in commodities.csv
 2020-12-04 15:17:44 +00:00
Athanasius
9009dc7340 Merge branch 'main' of https://github.com/EDCD/EDMarketConnector into main 2020-12-03 12:27:38 +00:00
Athanasius
412708b3d1 Issues: Bugs: Emphasise we want BOTH log files. 
Also cleans up the wording, as 4.1.4 has been out months so there'll
always be the -debug log file now.
 2020-12-03 12:26:50 +00:00
A_D
859572e8b6
Fixed Void Opal name 2020-12-02 17:19:27 +02:00
Athanasius
128f22941d
Merge pull request #781 from A-UNDERSCORE-D/fix/779-utf8-file-encodings 
Always read journal with utf-8 in EDMC.py
 2020-12-02 14:22:45 +00:00