ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 18:37:39 +03:00
Code Issues Projects Releases Wiki Activity
1,175 Commits 16 Branches 276 Tags
Commit Graph

1175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
decadd634e Fixes another binary versus string issue in collate.py 2019-09-26 11:40:42 +01:00
Athanasius
e51b4f5c68 Cleanup of EDMC.py and related code. All flags tested. 
Mostly the usual file-mode versus .encode('utf-8') tweaks, but also
one list() needed around a <dict>.values().
 2019-09-26 11:40:42 +01:00
Athanasius
f91baf8911 EDMC.py: Small fix to exception handling. 
Now stymied on further work due to game patch today and CAPI being
down.
 2019-09-26 11:40:42 +01:00
Athanasius
df987a3a40 Fixes up "EDMC.py -j" for python3 2019-09-26 11:40:42 +01:00
Athanasius
e9931aa348 Initial work on getting the EDMC.py CLI to work under python3 
*) Fix up print usage
  *) cPickle -> cpickle
  *) "EDMC.py -p <cmdr name>" appears to have never been properly
  updated for multi-account support.
 2019-09-26 11:40:42 +01:00
Athanasius
95693edb19 Updates prefs.py for "import tkinter.filedialog" 2019-09-26 11:40:42 +01:00
Athanasius
a2e73fbe90 platform is always just 'linux' under python3 2019-09-26 11:40:42 +01:00
Athanasius
5c59f32d15 Minor cleanup. 2019-09-26 11:40:42 +01:00
Athanasius
acc78d2657 update.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
5e52273896 plugins/edsy.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
a505402d2a plugins/eddb.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
9bfe7134a9 Need to int() a division if passing where an int is required 2019-09-26 11:40:42 +01:00
Athanasius
5341651c83 Updates generation of ships.p and modules.p 
In doing so also fixes up outfitting.py for Int_DroneControl_ResourceSiphon
 2019-09-26 11:40:42 +01:00
Athanasius
6b75fdb34c dashboard.py: Missed de-future'ing old_div 2019-09-26 11:40:42 +01:00
Athanasius
477a460943 theme.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
6aeb22d670 protocol.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
ae16b4f522 plugins/inara.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
e6f88d3bd4 plugins/edsm.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
116fd175d3 plugins/eddn.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
a15311f08f plugins/eddn.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
7e59c4e582 monitor.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
99bc019e14 l10n.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
7e0cd609a6 config.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
b64d59c2e5 dashboard.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
6c2a44e29b companion.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
b0abc3f865 Revert "Switches to .format() for startup code." 
This reverts commit 11194c1374e4e325b523e6a348503dd0bc0d1a6b.
 2019-09-26 11:40:42 +01:00
Athanasius
0b842f6dff EDMarketConnector.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
c2605c3a91 Switches to .format() for startup code. 2019-09-26 11:40:42 +01:00
Athanasius
24a8a5bce6 Fixes plugins/eddn massaging of economies and prohibited data 2019-09-26 11:40:42 +01:00
Athanasius
e40dc5a4ae Removes problematic .encode('utf-8')'s in companion.py 2019-09-26 11:40:42 +01:00
Athanasius
89df69601d TODO: 'Hotkey' setting works. 
Tested with:

  	NumPad 5 (revealed s/unichr/chr/ issue)
	F1
	Ctrl+Shift+F1
	Shift+Ins
	Shift+Del
 2019-09-26 11:40:42 +01:00
Athanasius
5caf861172 Fixes Trade Dangerous .prices export. 
Confirmed by Snake Man on EDCD Discordin #edmc

Snake Man : looks ok I guess (never done much of these manual imports)

	python3 trade.py import ../Daurtu.Panshin.Terminal.2019-09-12T12.29.27.prices
	NOTE: Import complete: 93 updated items over 1 stations in 1 systems

Snake Man : trade.py market -vv daurtu/panshin command looks fine too. and trade.py run --cap 500 --cr 20m --ly 12 --fr daurtu/pans gives trading results, looks good indeed
 2019-09-26 11:40:42 +01:00
Athanasius
c932bee929 Fixes __debug__ dump/ file writing. 
Similarly to the 'Save Raw Data' fix in 9ccca42b31102fd713b26a7a8223472d364772ab
 2019-09-26 11:40:42 +01:00
Athanasius
07c52ee9ab Fixes File > 'Save Raw Data' 
Another str versus bytes issue.  We *do* need the .encode('utf-8') in
this case, else it will assume Windows cp1252 encoding which then can't
encode some characters.  So we switch to binary file mode instead.
 2019-09-26 11:40:42 +01:00
Athanasius
f1462ef151 Fixes plugins/coriolis.py to appear in settings, and confirms click-through works 
*) Code and imports brought in line with edsy plugin
  *) 'Coriolis' now appears in Settings > Configuration > Shipyard
    dropdown
  *) Confirmed that with this active a valid build opens on coriolis.io
 2019-09-26 11:40:42 +01:00
Athanasius
a4e95d6ac4 Applies "log to file" necessary fix, whether we're forcing it or not. 2019-09-26 11:40:42 +01:00
Athanasius
7be0c76986 Gets plugins/edsy.py working. The usual string vs. bytes shenanigans. 2019-09-26 11:40:42 +01:00
Athanasius
14d6d353a8 Fixes registry browser lookup, and confirms EDDB system/station lookups work 2019-09-26 11:40:42 +01:00
Athanasius
2756ea3f39 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.
 2019-09-26 11:40:41 +01:00
Athanasius
a07f502f09 plugins/inara.py: No need for encode('utf-8') 2019-09-26 11:40:41 +01:00
Athanasius
c3620b932b Removes un-necessary encode('utf-8') 2019-09-26 11:40:41 +01:00
Athanasius
1a518e366a plugins/eddn.py: encode() un-necessary 2019-09-26 11:40:41 +01:00
Athanasius
1cedfaf759 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.
 2019-09-26 11:40:41 +01:00
Athanasius
e2be3b98e6 Use .items() instead of .iteritems() 2019-09-26 11:40:41 +01:00
Athanasius
a62c101056 Fixes str/bytes issues on "Last updated at" UI update 2019-09-26 11:40:41 +01:00
Athanasius
08e5b6ff6a Fixes generation of market CSV files 2019-09-26 11:40:41 +01:00
Athanasius
3117f7ca3e Fixes do_GET()'s use of .write() 2019-09-26 11:40:41 +01:00
Athanasius
457c533980 Fixes Frontier oAuth2 initiation 2019-09-26 11:40:41 +01:00
Athanasius
9910024004 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.
 2019-09-26 11:40:41 +01:00
Athanasius
218c068ee5 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.
 2019-09-26 11:40:38 +01:00