1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00

1488 Commits

Author SHA1 Message Date
Athanasius
ce460712e2 Ensure we definitely can add mandatory fields to EDDN messages
This came to light due to python3 not liking try['StarPos'] =
list(this.coordinates) if this.coordinates was None.  As the comment
says these three fields are mandatory, ensure we can actually set them
appropriately, and display an error if not.
2020-06-21 16:23:00 +01:00
Athanasius
bebc3648b8 plugins/inara.py: No need for encode('utf-8') 2020-06-21 16:23:00 +01:00
Athanasius
0f38e3e824 Removes un-necessary encode('utf-8') 2020-06-21 16:23:00 +01:00
Athanasius
fd4acae9a5 plugins/eddn.py: encode() un-necessary 2020-06-21 16:23:00 +01:00
Athanasius
e73db981a8 Fixes EDDN sending to be working.
NB: Due to, I assume, EDDN relay de-duplication of messages, it's been
difficult to 100% test this.  No errors thrown, and stock/release EDMC
also doesn't result in a new message arriving at my EDDN consumer.
2020-06-21 16:23:00 +01:00
Athanasius
e7545e174f Use .items() instead of .iteritems() 2020-06-21 16:23:00 +01:00
Athanasius
662d35f0bb Fixes str/bytes issues on "Last updated at" UI update 2020-06-21 16:23:00 +01:00
Athanasius
ee588e2f1f Fixes generation of market CSV files 2020-06-21 16:23:00 +01:00
Athanasius
a25d22123b Fixes do_GET()'s use of .write() 2020-06-21 16:23:00 +01:00
Athanasius
d00472c2cd Fixes Frontier oAuth2 initiation 2020-06-21 16:23:00 +01:00
Athanasius
90b05d22c5 Now runs without console errors so far as pressing 'Update' is concerned.
There's an error on the console about an iterator when doing so
though.
2020-06-21 16:23:00 +01:00
Athanasius
d0ae621387 Running EDMarketConnector.py 'works'.
First pass utilising 'futurize' to do most of the work.

  There's an issue with ur'\"' in l10n.py which I'm not sure how to
properly fix.

  This now has errors when hitting the 'Update' button.
2020-06-21 16:23:00 +01:00
Athanasius
d2352f7ab2 Fix 'an'/'a' typo 2020-06-21 10:58:55 +01:00
Athanasius
14617d3605 Prepare changelog for 3.46 release. 2020-06-21 10:53:31 +01:00
Athanasius
4d5fa590af New option to NOT check for app updates automatically if in-game.
* Stores disable_autoappupdatecheckingame in settings.
  * If 'disable' is active then once you're in-game WinSparkle auto
    check for updates is disabled.
  * Whatever the state of the option WinSparkle auto updates are
    (re-)enabled when you exit the game to Main Menu or fully.
  * Using 'Help' > 'Check for updates' manually will still always work.

It has been difficult to test the code fully because it isn't easy to
get WinSparkle's registry data about last update check time set just right
to not check immediately, but to do so some reasonable time after you're
in-game and have confirmed the new option setting isn't easy.
  Worst case people won't learn about an update until the next time they
run EDMC.
rel-346
2020-06-20 20:46:05 +01:00
Athanasius
aa8df90e55 Only warn once in 24 hours about plugins not ready for python 3.x 2020-06-20 14:29:00 +01:00
Athanasius
9fb64e1437 Merge branch 'master' into release-final-python27 2020-06-20 12:21:51 +01:00
Athanasius
a8631e5bb8 Gives up and uses full URL for python3 branch 2020-06-20 12:20:32 +01:00
Athanasius
8262a2afba Attempts to fix the 'python3' branch URL in migration guide 2020-06-20 12:18:58 +01:00
Athanasius
670842e8f6 Adds link to plugin migration guide to Settings > Plugins 2020-06-19 19:43:12 +01:00
Athanasius
7ed7f904a8 Adds an edited version of python3/PLUGINS.md#Migration for master branch
We need this in master so that the forthcoming Python 2.7 version that
detects plugins that aren't ready for migration can provide a link to
information about migrating.  In the future the 'python3' branch might
have been removed.
2020-06-19 19:28:01 +01:00
Athanasius
9c285a79e7 config: Change update_interval to 8 hours 2020-06-19 07:29:17 +01:00
Athanasius
d3abb6fa1f Detect plugins without Python 3.x support and warn user.
To allow users to sort out their plugins before EDMC itself moves to
Python 3.x warn them if any of their enabled, non-stock, plugins do not
have a plugin_start3() method.

  * If any are found without support there's a popup triggered at the
    end of AppWindow initialisation.
  * Then the user can check Settings > Plugins to see a list of the
    plugins without Python 3.x support.
2020-06-18 19:40:46 +01:00
Athanasius
2aa5154a1a config: Bump version to 3.4.6.0 so it shows up in testing
As the new Fleet Carrier code needs testing we need to be able to
filter down to our test messages if needs be.
2020-06-18 18:26:20 +01:00
Bernd Gollesch
38ba48c713 added carrier data to CarrierJump event 2020-06-18 17:46:16 +01:00
Bernd Gollesch
098613ea0a There is now an api event for 'CarrierJump' -> 'addCommanderTravelCarrierJump' 2020-06-18 17:46:06 +01:00
Bernd Gollesch
02649b8c6f there is also a 'Factions' list in the 'CarrierJump' event 2020-06-18 17:44:22 +01:00
Bernd Gollesch
b45df6b4fd keep track of location if the carrier you're docked at jumps 2020-06-18 17:44:14 +01:00
Bernd Gollesch
8db229585d send 'CarrierJump' event to EDDN 2020-06-18 17:36:51 +01:00
Bernd Gollesch
690ef067b0 keep track of system location if fleet carrier jumps while docked 2020-06-18 17:35:35 +01:00
Athanasius
148ea8d79c Merge branch 'master' into release-final-python27 2020-06-18 17:19:29 +01:00
Athanasius
bb9385422d
Merge pull request #479 from VAKazakov/patch-1
Fixing reputation values error on Inara
2020-06-18 17:18:40 +01:00
Athanasius
512b07daa0 Merge coriolis-data from upstream after fresh pull 2020-06-18 15:49:16 +01:00
Athanasius
6e72806bb7 Merge coriolis-data from upstream after fresh pull 2020-06-18 15:38:34 +01:00
Athanasius
886c5740e5 Changes CAPI CLIENT_ID to one under Athanasius' Frontier account 2020-06-18 15:34:39 +01:00
Athanasius
53bbeca12b Merge branch 'releases'
Release 3.44 just made as pre-release, soon to be live.
2020-06-17 18:15:33 +01:00
Athanasius
a5edde146e docs: RELEASING.md: Various changes after confirming releasing works.
* Outline the `release-XYZ` > `releases` workflow.
 * Expanded on exact git CLI commands to use in some stages.
2020-06-17 18:04:25 +01:00
Athanasius
cc9779f4c2 Changes additional copyright from 'Athanasius' to 'EDCD'.
Spansh confirmed this was OK on EDCD Discord.
rel-344
2020-06-17 17:14:34 +01:00
Athanasius
b0b0d8c41b edmarketconnector.xml: Updates MacOS title to reference 3.44 2020-06-17 17:10:30 +01:00
Athanasius
48181e5f46 edmarketconnector.xml: Ensure 3.44 changelog is complete.
* Copied the Windows one to the MacOS section, and added some emphasis.
  * URL-ised the reference to the README.md.
2020-06-17 17:08:11 +01:00
Athanasius
4ee1510862 Updates build config for EDCD, tweaked copyright, and latest WiX
* Change instances of 'Marginal' to 'EDCD'.  Including github URLs.
  * Update SDKPATH and WIXPATH to the latest versions.
  * Removes un-necessary attempt at including VCredist file.  This isn't
    needed on any Windows 10 version that is vaguely current (tested on
    1909).
  * Adds the following to the EDMarketConnector.wxs <Product Id ...>
    section so that any new version definitely replaces any older one:

    	InstallScope="perMachine"

    without this it defaults to a per-user install, and you end up with
    the prior Marginal-era EDMC allegedly still installed as well, even
    though they're installed into the same path.
    See commit 1beca864d362625f983cc9465125124ffada4ae2 in the python3
    branch.
  * Appends ", 2020 Athanasius" to the copyright notices in setup.py.
    This will likely change to ", 2020 EDCD" pending EDCD Council
    approval.
2020-06-17 16:42:17 +01:00
Athanasius
f52d4a5e75 Updates various github URLs to EDCD, not Marginal, ones. 2020-06-17 16:41:25 +01:00
Athanasius
e3d5acc27f Initial commits before release 3.4.4.0
This is a little messy due to the need to bootstrap the edmarketconnector.xml
file into the 'releases' branch.
2020-06-17 15:28:59 +01:00
Athanasius
141609e7fb docs: RELEASING.md: github adds the Source Code files itself 2020-06-17 00:15:17 +01:00
Athanasius
381c039a31 docs: RELEASING.md: Mostly have the actual release procedure documented now.
There's a 'TODO' for generating the zip and tar.gz source files.
2020-06-17 00:15:17 +01:00
Athanasius
ade048d1fc docs: RELEASING.md: How to update edmarketconnector.xml 2020-06-17 00:15:17 +01:00
Athanasius
4459e19b47 docs: RELEASING.md: Clarify the py2exe version requirements.
0.9.3.2 will work, due to a hack in setup.py.

 0.9.4.0 is pre-release and works with or without that hack.
2020-06-17 00:15:17 +01:00
Athanasius
e008986490 docs: RELEASING.md: site-packages corrected.
This had been listing importlib_metadata, and its dependency zipp,
because it's a dependency of newer 'keyring'.   As we're hard-coding an
older 'keyring' without that dependency we don't need to list them here.
2020-06-17 00:15:17 +01:00
Athanasius
69b585ac1d docs: RELEASING.md: Reminder to check the .exe and .msi actually work. 2020-06-17 00:15:17 +01:00
Athanasius
806bea5b5c docs: RELEASING.md: Expand on how to run the py2exe command 2020-06-17 00:15:17 +01:00