1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 18:37:39 +03:00

1679 Commits

Author SHA1 Message Date
Athanasius
b34faba96a Merge branch 'release-4.0.5' into releases 2020-08-26 14:45:08 +01:00
Athanasius
a862fc0860 appcast: Update size for 4.0.5 Release/4.0.5 2020-08-26 14:38:14 +01:00
Athanasius
84b0c566e7 Release 4.0.5: version, changelog, appcast 2020-08-26 14:34:56 +01:00
Athanasius
f21bad8fae Releasing.md: Now using Python 3.7.9 2020-08-26 14:31:23 +01:00
Athanasius
1164240387 translations: pt-PT: "Use alternate URL method" now translated 2020-08-26 14:29:42 +01:00
Athanasius
f004c9ddf6 "Not Python 3.x" popup message sub-substitutions fixed.
string.format() doesn't assign to string, so actually need to do that.
2020-08-26 14:21:25 +01:00
Athanasius
c1dfc3ac1f Plugins "Not Python 3.x": Hacky escaping fix so translations work 2020-08-26 14:13:06 +01:00
Athanasius
8d6f761fb9 plugins/inara: return '' if can't otherwise make system_url 2020-08-26 12:01:45 +01:00
Athanasius
bf9d7dff89 station providers: Ensure the 'early station' functionality for all
* If you request docking successfully then show the station namd and
  have the link work.
* This is then only undone if you:
	1) Dock and undock
	2) Supercruise away
	3) Jump away
  It is *not* undone if you simply cancel the docking request.

Tested only with same provider for system and station for each of the
three, not the other 6 combinations.
2020-08-26 11:55:23 +01:00
Athanasius
c9dee18d70 system/station providers: Sanitise {system,station}_url logic
* Make all plugins use `requests.utils.requote_uri()`
* Make all plugins use roughly the same logic, without if/else trees
 (as the bodies do a `return ...`), ending with `return ''` if input
 parameters are None.

 This throws away the inara fallback to `this.station or this.system` as
 it's unlikely the in-plugin tracking did a better job than the
 monitor.py code.
2020-08-26 10:18:10 +01:00
Athanasius
d46358796f system/station plugin providers: Don't override 'url'
By default the ttkHyperlinkLabels for 'system' and 'station' names have
their 'url' members set to the functions in EDMarketConnector.App.

The EDDB one used to override the function as it had to do that special
name -> EDDB ID lookup from systems.p.  When I changed the code to not
need that any more I didn't fully understand what these overrides were.

After updating the EDDB code I then made sure the same logic was also in
the other plugins which meant they *also* set static strings, overriding
the call to the EDMarketConnector.App functions (which chain through to
the current plugin providers).

Unfortunately I didn't quite update the EDSM code enough causing
journal_entry() code to *not* set a new system 'url' despite changing
the 'text'.  This meant that only CAPI updates (so docking and login)
caused the URL to change, despite updating the 'text' to the correct
system name.

Rather than have everything setting static strings just do away with the
overrides as they're not needed!
2020-08-25 21:38:22 +01:00
Athanasius
669f895ffa plugins/edsm: Set system_link based on system_provider, not station_provider 2020-08-25 13:37:26 +01:00
Athanasius
405edfacb6 Merge tag 'Release/4.0.4' into releases
Release 4.0.4
2020-08-02 20:20:04 +01:00
Athanasius
412dad86a7 Release 4.0.4: Correct translations and update appcast length
* Pulling in latest translations meant needing to change %H:%M:%S back
 to {HH}:{MM}:{SS}.
* Built and tested, so has appcast length updated too.
Release/4.0.4
2020-08-02 20:14:55 +01:00
Athanasius
c8635b84d2 Translations: Minor changes
* Back to {HH}:{MM}:{SS} for this.
* A few extra "Use alternate URL method" translations.
2020-08-02 20:04:37 +01:00
Athanasius
451dcbff21 Release 4.0.4: Post-build appcast length update 2020-08-02 20:02:45 +01:00
Athanasius
c51a1459d1 Release 4.0.4: Mention Python 3.7.8 in changelogs. 2020-08-02 19:56:14 +01:00
Athanasius
e5ca8a6f26 Release 4.0.4: Changelog, version, appcast
* Version 4.0.4
* ChangeLog.md
* edmarketconnector.xml (except length)
2020-08-02 19:41:14 +01:00
Athanasius
513e21a06e Inara timer fix.
I had to pull a diff out of the old branch, apply it, and reverse things
like the addition of logging.  This needs to be the minimum change for
the fix.

Tested with a quick login, then spamming market buy/sell orders.  They
were correctly queued and then sent after 30s since previous API calls.
2020-08-02 19:35:02 +01:00
Athanasius
ba09cfd8aa PLUGINS.md: except not catch 2020-08-02 19:35:02 +01:00
Athanasius
0d55e4f6c9 PLUGINS.md: Fix typo ' -> ` 2020-08-02 19:35:02 +01:00
Athanasius
ffd0079e16 PLUGINS.md: Logging is being added, how to prepare
* Currently you use `print(...)`
* `logging` support is coming, here's how to prepare.
2020-08-02 19:35:02 +01:00
Athanasius
cf6eec3289 Removed keyring dependency
This remove all dependencies on the keyring lib, updates the
requirements.txt to reflect that, and ensures that setup.py does not
attempt to package it.

Any use of the "old" keyring code will now return None and warn about
its deprecation.
2020-08-02 19:31:20 +01:00
A_D
68fb18310d Dont crash when journal_dir is None
Ensures that journal_dir is always at least an empty string.

Fixes #639
2020-08-02 19:29:03 +01:00
Athanasius
b9075f1159 Change \xd7 character to a normal 'x' so that 3.46 EDMC.exe finds newer versions. 2020-08-02 19:29:03 +01:00
Athanasius
d18c53e82b Translations: Add 'Use alternate URL method' to phrases 2020-08-02 19:29:03 +01:00
Athanasius
6d40d9dcdf Use SemVer for sparkle:version
Else it thinks 4.0.3.0 > 4.0.3 and keeps offering the upgrade.
2020-07-24 14:20:29 +01:00
Athanasius
ddadaf36f2 Update PLUGINS.md
Adds missing blank line that caused acciental underline/heading
2020-07-24 13:45:17 +01:00
Athanasius
f57ee880aa Change \xd7 character to a normal 'x' so that 3.46 EDMC.exe finds newer versions. 2020-07-24 12:59:41 +01:00
Athanasius
4131ab87c6 Release 4.0.3: edmarketconnector.xml updated 2020-07-24 12:55:12 +01:00
Athanasius
5c4ea273f4 Release 4.0.3: ChangeLog.md: Translations status Release/4.0.3 2020-07-24 12:42:47 +01:00
Athanasius
c3882705e9 Translations: Update to latest
This includes some having the new 'Use alternate URL method' phrase.
2020-07-24 12:37:17 +01:00
Athanasius
cb0c65d947 Release 4.0.3: ChangeLog - fully cite shipyard.html location 2020-07-24 12:21:28 +01:00
Athanasius
a67d0488d0 Release 4.0.3: ChangeLog - tweak Linux ~ text 2020-07-24 12:16:47 +01:00
Athanasius
93e4adb8c7 Release 4.0.3: Version and ChangeLog 2020-07-24 12:07:42 +01:00
Athanasius
5fb6e49690 Changelog.md: Fix missing % in LOCALDATAAPP ready for 4.0.3 2020-07-23 20:25:55 +01:00
Athanasius
d06104ec6e Release 4.0.3-rc3: ChangeLog and version string Release/4.0.3-rc3 2020-07-23 15:02:56 +01:00
Athanasius
0135c73f6f Merge branch 'fix/614-ship-name-underscore' into release-4.0.3-rc3 2020-07-23 14:43:15 +01:00
Athanasius
f9de137105 Add import of os.path.expanduser 2020-07-23 14:40:53 +01:00
Athanasius
b61645ab06 shipyard: Add UI to toggle option for alternate URL opening
* Added checkbox next to shipyard choice dropdown.
* Also a TODO for using an incrementing 'row' variable throughout.
2020-07-23 14:36:02 +01:00
A_D
99014dd970 Added a config to use the new file based shipyard
This also reverts commenting out the old solution for long URLs
2020-07-23 14:36:02 +01:00
A_D
b818922193 Fixed issues with super long links for shipyards
This works by creating a temp file at config.app_dir and storing the
link in there, followed by directing the local browser to open the file.

HTML meta tags are then used to direct the browser to refresh to a URL
of our choosing (which is HTML escaped, just in case someone tries
something clever)

This should work everywhere, and on any browser (as the file:// format
is defined at https://tools.ietf.org/html/rfc1738 which was posted in
1994).

The URI used (`file://localhost/path`) ensures that we only ever
ask for a localhost file at our path.

The HTML format should be completely compliant with all major browsers
as well, ensuring that behaviour is consistent (assuming they support
HTML meta tags)
2020-07-23 14:36:02 +01:00
A_D
aa95573f3d Fix ~ not being expanded on linux 2020-07-23 14:35:57 +01:00
Athanasius
58ad7156b4 monitor.py: Add comment about why this new check is there 2020-07-22 14:48:34 +01:00
Athanasius
ab5e94a7c8 monitor.py: Don't record '' or ' ' as ShipName
Doing so causes the ShipType to not be used in the UI, so you get a
'link' with just a space for the text.

Any user who purposefully sets their ship's name to a single space
can live with seeing the model name instead.  Yes, I checked, the game
allows it.
2020-07-22 14:43:45 +01:00
Athanasius
98e20b4568 Pre-Release 4.0.3-rc2 Release/4.0.3-rc2 2020-07-21 18:27:09 +01:00
Athanasius
b6f6365566 plugins/edsm: Fix missing line of code
Bad paste or something, who knows ?
2020-07-21 18:25:03 +01:00
Athanasius
d3e74bba39 Pre-Release 4.0.3-rc1
version and changelog updated.
Release/4.0.3-rc1
2020-07-21 17:42:31 +01:00
Athanasius
29e3cba67e plugins/edsm: Align with code tested in inara plugin
* Use same state logic as Inara plugin now has.
* this.system_link for the Tk item, this.system is the system name.
* Ensure station text+link set on prefs change.
# Add a set of future TODO items.
2020-07-21 17:29:03 +01:00
Athanasius
99d1578780 plugins/eddb: Align with code tested in inara plugin
* Use same state logic as Inara plugin now has.
* this.system_link for the Tk item, this.system is the system name.
* List some tests to pass (and later to be implemented as unittests).
* Be paranoid about URIs, quote them.
* Ensure station text+link set on prefs change.
2020-07-21 17:29:03 +01:00