1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-22 03:40:46 +03:00

1569 Commits

Author SHA1 Message Date
Athanasius
7d0bd6e4bc Removes py2exe from requirements.txt
We specify version and where to get it in docs/Releasing.md, and it's
not "pip install"-able, so don't cause errors with this.
2020-07-13 10:53:12 +01:00
Athanasius
dec2f3d041 theme not them 2020-07-12 23:15:47 +01:00
Athanasius
f96b00f8ef
Merge pull request #574 from A-UNDERSCORE-D/enhancement/cleanup-edshipyard
cleanup edshipyard
2020-07-12 20:50:25 +01:00
Athanasius
04090842d7 Add a few more allowed plugin imports in docs
* L10n
* theme.theme
* plug allows for flags.
* monitor.gamerunning()
2020-07-12 19:54:23 +01:00
Athanasius
e473493509
Merge pull request #593 from EDCD/issue/545-plugin-api-doc
Issue/545 plugin api doc
2020-07-12 19:27:17 +01:00
Athanasius
71bb14a737 Document allowed imports for PLUGINS
* List added in 'Available imports' section of PLUGINS.md
* Various *.py files now have comments about things being allowed for
 plugin import.
2020-07-12 19:25:47 +01:00
Athanasius
63f5db3785 plugins/inara.py makes no use of import companion
So remove it.
2020-07-12 19:24:16 +01:00
Athanasius
c25120e0aa plugins/edsm.py makes no use of import companion
So remove it.
2020-07-12 19:10:57 +01:00
Athanasius
2bd6e4cb1c PLUGINS.md: Flesh out plugin API docs
* Note in monitor.py to update the docs if anything changed about the
 'state' dictionary.
* Expand on arguments to all plugin call-ins.
* Particularly what the 'state' diction passed to journal_entry()
 contains.
* The contents of the `data` dictionary passed to `cmdr_data()`.
2020-07-12 18:10:16 +01:00
Athanasius
37c00d31ee General text re-flow to make subsequent changes more obvious.
Also fixed formatting of some of the embedded code.
2020-07-12 16:25:20 +01:00
Athanasius
ae62bec63d Remove extraneous 'e '
*shakes fist at PyCharm*
2020-07-12 16:07:19 +01:00
Athanasius
690b8b0da3 Use 'main' branch for 'migrate plugins' URL 2020-07-12 15:59:40 +01:00
Athanasius
6910696172
Merge pull request #591 from EDCD/feature/589-sort-plugins-for-load
sort internal plugins before loading
2020-07-12 15:51:50 +01:00
Athanasius
076eab9e22 sort internal plugins before loading
This is already done for 'found' plugins, so let's avoid any potnetial
future surprise with the internal ones as well.

close #589
2020-07-12 15:50:49 +01:00
Athanasius
624f2a7907 Changelog and version bump for 3.99.5.0 Release/3.99.5.0 2020-07-11 21:03:48 +01:00
Athanasius
c78d9241df
Merge pull request #573 from A-UNDERSCORE-D/fix/477-inara-cargo-slow-update
Fixed updating inara cargo only on major events
2020-07-11 20:04:17 +01:00
A_D
f43141202b
Removed debug print 2020-07-11 20:55:18 +02:00
A_D
061fbddb2d
Fixed wording of comment on last_update_time 2020-07-11 20:53:48 +02:00
A_D
9b82464f88
Fixed updating inara cargo only on major events
This works by checking on _any_ event the status of the cargo vs the
current stored version. If the live cargo differs from the updated
cargo, _and_ we have not sent any update in the past 45 seconds (as this
would have contained the cargo anyway), we queue an actual send to the
API.

This unfortunately isn't checked only when docked, but on the plus side
miners will be happy to have their cargo updated relatively often.

Fixes #477. Possibly not quite what they wanted, but its about as close
as this will get
2020-07-11 20:53:47 +02:00
Athanasius
96f7457ae3
Merge pull request #587 from EDCD/fix/586-EDDB-system-links
Fix/586 eddb system links
2020-07-11 19:48:19 +01:00
Athanasius
317a0f6b63 EDDB is default station provider, do station_marketid as needed
We need a better way to do provider defaults.  Heck, settings defaults period.
Let's assume we'll put in place a "standard" config file once we move to one.
2020-07-11 19:47:30 +01:00
Athanasius
6932fdc883 EDDB: Use CAPI for system_address/station_marketid only if not already set
See issue #586 - a user had incorrect system_address set, but only sometimes.

This could possibly be due to CAPI errors/lag, so only use it as the source
when the values aren't yet set.  Otherwise Journal should always have provided
the correct value in a timely manner.
2020-07-11 18:57:04 +01:00
A_D
1928379571
Removed broken link, fixed interpolation key name
Broken link didn't appear to add any further information as per
discussion in PR
2020-07-10 23:44:56 +02:00
Athanasius
0282d0c6ba Version 3.99.4.0
* config.appversion increased.
* Changelog updated.
Release/3.99.4.0
2020-07-10 12:52:36 +01:00
Athanasius
ec9533d092 Updated translations: pl, pt-BR 2020-07-10 12:50:12 +01:00
Athanasius
1fd35bb119 Change URL branch 'develop' to 'main' in docs 2020-07-10 11:15:26 +01:00
Athanasius
d4706a053e We now use 'main' instead of 'master' in place of 'develop'
After 4.0.0.0 we need to not have 'develop' as default branch, so change it
now, and migrate to 'main' instead of 'master' whilst we're at it.
2020-07-10 11:07:45 +01:00
Athanasius
fb6e4b1d38
Merge pull request #578 from EDCD/issue/576-Remove-all-BPC-code
Remove last traces of 'BPC' output code
2020-07-10 10:26:08 +01:00
Athanasius
65086be1cd Remove last traces of 'BPC' output code
close #576
2020-07-10 10:25:08 +01:00
Athanasius
accc361d54
Merge pull request #577 from EDCD/fix/575-Remove-old-anonymous
Remove all use of defunct 'anonymous' option
2020-07-10 08:40:29 +01:00
Athanasius
ef3306e3f5 Remove all use of defunct 'anonymous' option
The UI for setting the 'anonymous' option was removed in
f17f5d3f257e2359d4728ce8c296d70dc5e7609f ("PKCE OAuth2 access to cAPI").
Since then there's been no way for a user to set, or unset, this option
(and the associated custom uploaderID).  However anyone with the registry keys
still set would have had them take effect.

This commit removes the last bits of code that were making use of it.

Note that the EDDN Relay anonymises all uploaderID values, so no listener
has been seeing the 'raw' values for a long time now.

close #575
2020-07-10 08:36:13 +01:00
A_D
c4abe6b3ca
Replaced missed modulo formatting 2020-07-10 06:01:47 +02:00
A_D
a6e6b6353d
Tidied regexp
Python regexps should always be held in r'' or raw strings, ensuring
that python doesn't try to expand the regexp escapes.

I also removed the escaped -, as they're only special characters in
character groups
2020-07-10 06:01:47 +02:00
A_D
be9ac29a5b
Replaced for x in $list with $tuple
Tuples are static and smaller memory wise
2020-07-10 06:01:47 +02:00
A_D
87ad0f3080
Replaced or magic with multiline if
Abusing ors for that is incredibly confusing.
Additionally, I replaced the .join() call with a static .format call, as
the join is confusing for no reason
2020-07-10 06:01:46 +02:00
A_D
82fce9e8c0
Replaced modulo string interpolation with .format
.format is newer and easier to read
2020-07-10 06:01:46 +02:00
A_D
9581ead7cc
Fixed inline comments using tabs for separation
Two spaces after tabs, according to flake8
2020-07-10 06:01:45 +02:00
A_D
7879a803e1
Replaced bare except clauses with except Exception
Catching SystemExit and KeyboardInterrupt is bad.
2020-07-10 06:01:45 +02:00
A_D
11df049d0c
Added line breaks where logical
Line breaks after scope change helps to wrap your head around code
2020-07-10 06:01:44 +02:00
A_D
b2ae2c1ecf
Removed oneliners
Oneline ifs are against pep8 and are a pain to read.
2020-07-10 06:01:44 +02:00
A_D
5df8ce36b7
Cleaned class_rating closure
This replaces a bunch of repeated string concats with a single string
concat and string interpolation. It also does a little bit of type
hinting as I needed to see what was used where
2020-07-10 06:01:44 +02:00
Athanasius
cd0352d506
Merge pull request #565 from A-UNDERSCORE-D/enhancement/cleanup-companion
Cleanup companion.py
2020-07-09 16:58:22 +01:00
Athanasius
0c6f1acd59
Merge pull request #571 from EDCD/fix/display-var-errors
Pull X11 setup back out of function for 'dpy'.
2020-07-09 13:07:31 +01:00
Athanasius
94a9a9b948 Pull X11 setup back out of function for 'dpy'.
'dpy' needs to be global, and there might be other side effects.  So
just revert to this code being global.
2020-07-09 08:32:35 +01:00
A_D
1481c3d13e
Added todo, removed import
Added a TODO on the incase plugins need it line, and removed the unused
sys import
2020-07-08 21:24:15 +02:00
A_D
09f5dfff23
Replaced assert False with a clearer raise
previously this would assert False, which always raises an
AssertionError, now we raise a saner ValueError
2020-07-08 18:12:15 +02:00
Athanasius
758b726878
Merge pull request #570 from A-UNDERSCORE-D/fix/display-var-errors
Fix #568 with ENV var workaround
2020-07-08 17:07:54 +01:00
A_D
2890d33d03
Address review comments
Added a missing comma to the category_map literal
Added parens around an index that does math beforehand
Clarified HTTP/JSON error CredentialsError
2020-07-08 18:05:43 +02:00
A_D
be98365fb3
Fix #568 with ENV var workaround
EDMC.py would break due to an import chain that ends up in theme. Theme
does a whole bunch of work to setup our GUI for EDMarketConnector.py,
but it does this on any import, which will fail spectacularly if there
is either no DISPLAY var set or no X11 libs available on our machine at
all (as a sidenote this means it probably also breaks on a wholly
wayland install).

This fixes the issue by adding a check for an environment variable on
import of theme. This can and WILL break if the env var is set and
EDMarketConnector.py is used, but if you do that its your own fault.
2020-07-08 17:55:54 +02:00
A_D
dcb9853b68
Removed python2 specific code
This entire branch is py3 only, and even with this code the actual file
isn't py2 compatible syntax wise
2020-07-07 21:52:30 +02:00