1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-12 15:27:14 +03:00

55 Commits

Author SHA1 Message Date
David Sangrey
fe8818d187
[2114] Apply PathLib Handover 2024-06-10 17:21:06 -04:00
David Sangrey
3209b4e1fb
[2251] ResPath Update 2024-06-06 17:25:51 -04:00
David Sangrey
b2d5e13465
[2051] Update Supporting Files
Not touching any of the big ones, but some clarification updates to many of the supporting files.
2023-11-17 11:33:26 -05:00
Athanasius
fb065c5b78
collate.py: file paths/names should be pathlib.Path 2022-12-23 14:47:17 +00:00
Athanasius
da4ae24440
Document use of *local* outfitting.csv instead of FDevIDs version
That's in collate.py and coriolis.py docstrings.
2021-12-17 12:23:20 +00:00
Athanasius
1d3ff006cd
collate.py: Correction so it works with dump/ files
And adjust the dile docstring to point out it will only work with the
dump/ file format, not the new 'File > Save Raw Data' one.
2021-12-17 11:35:00 +00:00
Athanasius
3384412632
collapre.py: flake8/mypy fixups 2021-12-17 11:12:55 +00:00
Athanasius
bcabd97f4c
FDevIDs: Switch code to using FDevIDs/ files 2021-12-17 11:08:14 +00:00
Athanasius
472d7178a3 collate: docstring addships() 2021-04-12 08:31:48 +01:00
Athanasius
1e1e06c03b collate: docstring addmodules & noqa complexity 2021-04-12 08:31:48 +01:00
Athanasius
155d0082b0 collate: docstring module and addcommodities() 2021-04-12 08:31:47 +01:00
Athanasius
7fc6b624ee collate: Convert .format to f-string 2021-04-12 08:31:47 +01:00
Athanasius
4dfe467d1c collate: Fix dict : whitespace 2021-04-12 08:31:47 +01:00
Athanasius
c17e6ecade collate.py: Also newline='\n' on other open-for-write 2021-04-12 08:31:47 +01:00
Athanasius
dbfa50739f collate.py: Use always '\n` line-ending on commodity file 2021-04-12 08:31:47 +01:00
Athanasius
32d87f68dd collate.py: Fix references to companion_category_map 2021-04-12 08:31:47 +01:00
Athanasius
ad8c63c64c Move util_ships.py ship_map to data.py ship_name_map
Also refactors data.py to edmc_data.py as I'm having weird issues with
PyCharm debugger not starting, and this seems to be to do with module
name clashes.
2021-04-12 08:31:47 +01:00
Athanasius
5db62e48a3 Move companion.py category_map into data.py 2021-04-12 08:31:46 +01:00
Athanasius
a09512f3b3 Mostly refactoring companion.ship_file_name() into util_ships.py
* Also prevent "You're not docked at a station!" for on_foot.
2021-04-12 08:30:51 +01:00
A_D
dbcb4bb4fc clarified docs 2020-08-27 12:10:10 +01:00
A_D
1733aeae5a Replaced write out checks with guard clauses
Guard clauses reduce indentation and help when reading code as they
remove a variable and indentation level that the reader would otherwise
need to keep track of
2020-08-27 12:10:09 +01:00
A_D
8268bfe5da Removed repeated int(key)
With the previous formatting changes there is no reason to leave key as
possibly a string anywhere, as it was already being converted to an int
everywhere anyway
2020-08-27 12:10:09 +01:00
A_D
6a917acde0 Move file backup code to a method
It was repeated in various places and increased noise
2020-08-27 12:10:09 +01:00
A_D
3a2e159b1e Refactor __main__ logic
Most of this is just de-pyramiding the code, removing else clauses that
are unneeded (or making the if such that the else is not needed).
Rationale is simple, every level of indentation adds more that the
reader needs to keep track of.
2020-08-27 12:10:09 +01:00
A_D
fe3a6c11f4 replace list literals with tuples
Tuples ensure that this isnt changed at runtime
2020-08-27 12:10:09 +01:00
A_D
ed9c1c6774 Replace AssertionErrors with ValueError
AssertionError comes from `assert`s, using it for this doesn't make sense as we're complaining about values
2020-08-27 12:10:09 +01:00
A_D
fd3a4852f2 replace modulo formatting with .format 2020-08-27 12:10:09 +01:00
A_D
02d205fbee removed oneline statements 2020-08-27 12:10:09 +01:00
A_D
a7cf83d1e5 shortened line 2020-08-27 12:10:09 +01:00
A_D
8c0ab2dc75 added missing whitespace where needed 2020-08-27 12:10:09 +01:00
A_D
474c8d144f removed unused import 2020-08-27 12:10:09 +01:00
A_D
a546ecb735 Add newlines to separate scopes
Newlines between scope changes help you to not get lost when reading
source
2020-08-27 12:10:09 +01:00
Jonathan Harris
32c5cccce4 Fixes another binary versus string issue in collate.py 2020-06-21 16:33:37 +01:00
Jonathan Harris
3c46e8d5fa All executable files invoked with #!/usr/bin/env python3 2020-06-21 16:28:30 +01:00
Athanasius
0da9667cdb collate.py can be run stand-alone, update to 'env'-based first line 2020-06-21 16:23:01 +01:00
Athanasius
5beac17553 Fixes another binary versus string issue in collate.py 2020-06-21 16:23:01 +01:00
Athanasius
ddf2babaaa Fixes up "EDMC.py -j" for python3 2020-06-21 16:23:01 +01:00
Athanasius
67708fd090 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.
2020-06-21 16:23:01 +01:00
Athanasius
e7545e174f Use .items() instead of .iteritems() 2020-06-21 16:23:00 +01:00
Jonathan Harris
5fac03203a Handle Limpets 2018-12-28 03:32:35 +00:00
Jonathan Harris
f2bd931a84 Add missing 3.2 ships, modules & commoditites 2018-09-25 00:17:59 +01:00
Jonathan Harris
df944b0f6e Add some new 2.4 modules 2017-10-03 12:10:02 -07:00
Jonathan Harris
c2a17e60ca Collate commodities indexed by id and including symbolic name
Use collated info in export to older tools.
2017-09-23 12:58:53 +01:00
Jonathan Harris
e438ba216a No longer collate average commodity prices 2017-09-13 15:40:41 +01:00
Jonathan Harris
f790468078 Move functions that manipulate API output 2016-11-19 17:21:39 +00:00
Jonathan Harris
633edd5381 Fix for offline collation 2016-10-26 02:19:16 +01:00
Jonathan Harris
133e2be102 Also collate module and ship symbolic IDs 2016-07-28 14:09:04 +01:00
Jonathan Harris
d6bb4f90ca Correct some commodity categories
"Ion Distributor" and "Trinkets Of Hidden Fortune" - see https://github.com/EDCD/FDevIDs/pull/6
2016-07-08 00:33:45 +01:00
Jonathan Harris
0a88e3e0ab Support for collating from JSON dump 2016-06-19 16:47:28 +01:00
Jonathan Harris
ad0e57a285 Add "entitlement" field to collation 2016-02-25 05:39:34 +00:00