From 096b41fa844a82d2011610029f0e0e4cffad587e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 17:34:46 +0000 Subject: [PATCH 1/7] fdevids: Add FDevIDs repo as a submodule --- .gitmodules | 3 +++ FDevIDs | 1 + 2 files changed, 4 insertions(+) create mode 160000 FDevIDs diff --git a/.gitmodules b/.gitmodules index 134d60e0..b844f49e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "coriolis-data"] path = coriolis-data url = git@github.com:EDCD/coriolis-data.git +[submodule "FDevIDs"] + path = FDevIDs + url = https://github.com/EDCD/FDevIDs.git diff --git a/FDevIDs b/FDevIDs new file mode 160000 index 00000000..f4677fff --- /dev/null +++ b/FDevIDs @@ -0,0 +1 @@ +Subproject commit f4677fffe618439e4111b97154c4592fe4f360e9 From bcabd97f4cb623d5f5b375482ae59821168e552d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 11:08:14 +0000 Subject: [PATCH 2/7] FDevIDs: Switch code to using FDevIDs/ files --- collate.py | 3 ++- companion.py | 3 +-- setup.py | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/collate.py b/collate.py index a47b4a45..5ba0731a 100755 --- a/collate.py +++ b/collate.py @@ -4,6 +4,7 @@ import csv import json import os +import pathlib import sys from os.path import isfile from traceback import print_exc @@ -38,7 +39,7 @@ def addcommodities(data) -> None: # noqa: CCR001 if not data['lastStarport'].get('commodities'): return - commodityfile = 'commodity.csv' + commodityfile = pathlib.Path('FDevIDs/commodity.csv') commodities = {} # slurp existing diff --git a/companion.py b/companion.py index 9a175a1d..91b306e3 100644 --- a/companion.py +++ b/companion.py @@ -22,7 +22,6 @@ import urllib.parse import webbrowser from builtins import object, range, str from email.utils import parsedate -from os.path import join from queue import Queue from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDict, TypeVar, Union @@ -1065,7 +1064,7 @@ def fixup(data: CAPIData) -> CAPIData: # noqa: C901, CCR001 # Can't be usefully if not commodity_map: # Lazily populate for f in ('commodity.csv', 'rare_commodity.csv'): - with open(join(config.respath_path, f), 'r') as csvfile: + with open(config.respath_path / 'FDevIDs' / f, 'r') as csvfile: reader = csv.DictReader(csvfile) for row in reader: diff --git a/setup.py b/setup.py index 8bb8fb30..4a9ed68d 100755 --- a/setup.py +++ b/setup.py @@ -144,8 +144,10 @@ if sys.platform == 'darwin': ('plugins', x) for x in PLUGINS ], 'resources': [ - 'commodity.csv', - 'rare_commodity.csv', + '.gitversion', # Contains git short hash + 'ChangeLog.md', + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', @@ -213,8 +215,8 @@ elif sys.platform == 'win32': 'WinSparkle.pdb', # For debugging - don't include in package 'EUROCAPS.TTF', 'ChangeLog.md', - 'commodity.csv', - 'rare_commodity.csv', + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', From 33844126329c3c95c26a87fa495e75953ba79c07 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 11:12:55 +0000 Subject: [PATCH 3/7] collapre.py: flake8/mypy fixups --- collate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/collate.py b/collate.py index 5ba0731a..0350485f 100755 --- a/collate.py +++ b/collate.py @@ -14,14 +14,14 @@ import outfitting from edmc_data import companion_category_map, ship_name_map -def __make_backup(file_name: str, suffix: str = '.bak') -> None: +def __make_backup(file_name: pathlib.Path, suffix: str = '.bak') -> None: """ Rename the given file to $file.bak, removing any existing $file.bak. Assumes $file exists on disk. :param file_name: The name of the file to make a backup of :param suffix: The suffix to use for backup files (default '.bak') """ - backup_name = file_name + suffix + backup_name = file_name.parent / (file_name.name + suffix) if isfile(backup_name): os.unlink(backup_name) @@ -150,7 +150,7 @@ def addships(data) -> None: # noqa: CCR001 if not data['lastStarport'].get('ships'): return - shipfile = 'shipyard.csv' + shipfile = pathlib.Path('shipyard.csv') ships = {} fields = ('id', 'symbol', 'name') From 1d3ff006cd5bc5e2b04734676527b2621e852de7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 11:35:00 +0000 Subject: [PATCH 4/7] 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. --- collate.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/collate.py b/collate.py index 0350485f..d789a6c5 100755 --- a/collate.py +++ b/collate.py @@ -1,5 +1,11 @@ #!/usr/bin/env python3 -"""Collate lists of seen commodities, modules and ships from dumps of the Companion API output.""" +""" +Collate lists of seen commodities, modules and ships from dumps of the Companion API output. + +Note that currently this will only work with the output files created if you +run the main program from a working directory that has a `dump/` directory, +which causes a file to be written per CAPI query. +""" import csv import json @@ -210,6 +216,7 @@ if __name__ == "__main__": with open(file_name) as f: print(file_name) data = json.load(f) + data = data['data'] if not data['commander'].get('docked'): print('Not docked!') From 77e89a9df15ea76d02e728781ea64f4058352627 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 12:00:49 +0000 Subject: [PATCH 5/7] setup.py: Properly include FDevIDs files I have my doubts about the darwin section, but we never package for it any more, so I'm not going to worry about it now. --- setup.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 4a9ed68d..f73dc370 100755 --- a/setup.py +++ b/setup.py @@ -146,12 +146,14 @@ if sys.platform == 'darwin': 'resources': [ '.gitversion', # Contains git short hash 'ChangeLog.md', - join('FDevIDs', 'commodity.csv'), - join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', 'ships.p', + ('FDevIDs', [ + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), + ]), ], 'site_packages': False, 'plist': { @@ -215,8 +217,6 @@ elif sys.platform == 'win32': 'WinSparkle.pdb', # For debugging - don't include in package 'EUROCAPS.TTF', 'ChangeLog.md', - join('FDevIDs', 'commodity.csv'), - join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', @@ -228,6 +228,10 @@ elif sys.platform == 'win32': 'EDMarketConnector - reset-ui.bat', ]), ('L10n', [join('L10n', x) for x in os.listdir('L10n') if x.endswith('.strings')]), + ('FDevIDs', [ + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), + ]), ('plugins', PLUGINS), ] From c45b99a1804270540c2111a4a510a12ed56d4f28 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 12:17:07 +0000 Subject: [PATCH 6/7] Remove local copies of (rare_)commodity.csv in favour of FDevIDs versions NB: Keeping the local outfitting.csv for now due to how it's used (both input and output in collate.py, input in coriolis.py). --- commodity.csv | 220 --------------------------------------------- rare_commodity.csv | 139 ---------------------------- 2 files changed, 359 deletions(-) delete mode 100644 commodity.csv delete mode 100644 rare_commodity.csv diff --git a/commodity.csv b/commodity.csv deleted file mode 100644 index eb7084a3..00000000 --- a/commodity.csv +++ /dev/null @@ -1,220 +0,0 @@ -id,symbol,category,name -128049152,Platinum,Metals,Platinum -128049153,Palladium,Metals,Palladium -128049154,Gold,Metals,Gold -128049155,Silver,Metals,Silver -128049156,Bertrandite,Minerals,Bertrandite -128049157,Indite,Minerals,Indite -128049158,Gallite,Minerals,Gallite -128049159,Coltan,Minerals,Coltan -128049160,Uraninite,Minerals,Uraninite -128049161,Lepidolite,Minerals,Lepidolite -128049162,Cobalt,Metals,Cobalt -128049163,Rutile,Minerals,Rutile -128049165,Bauxite,Minerals,Bauxite -128049166,Water,Chemicals,Water -128049168,Beryllium,Metals,Beryllium -128049169,Indium,Metals,Indium -128049170,Gallium,Metals,Gallium -128049171,Tantalum,Metals,Tantalum -128049172,Uranium,Metals,Uranium -128049173,Lithium,Metals,Lithium -128049174,Titanium,Metals,Titanium -128049175,Copper,Metals,Copper -128049176,Aluminium,Metals,Aluminium -128049177,Algae,Foods,Algae -128049178,FruitAndVegetables,Foods,Fruit and Vegetables -128049180,Grain,Foods,Grain -128049182,Animalmeat,Foods,Animal Meat -128049183,Fish,Foods,Fish -128049184,FoodCartridges,Foods,Food Cartridges -128049185,SyntheticMeat,Foods,Synthetic Meat -128049188,Tea,Foods,Tea -128049189,Coffee,Foods,Coffee -128049190,Leather,Textiles,Leather -128049191,NaturalFabrics,Textiles,Natural Fabrics -128049193,SyntheticFabrics,Textiles,Synthetic Fabrics -128049197,Polymers,Industrial Materials,Polymers -128049199,Semiconductors,Industrial Materials,Semiconductors -128049200,Superconductors,Industrial Materials,Superconductors -128049202,HydrogenFuel,Chemicals,Hydrogen Fuel -128049203,MineralOil,Chemicals,Mineral Oil -128049204,Explosives,Chemicals,Explosives -128049205,Pesticides,Chemicals,Pesticides -128049208,AgriculturalMedicines,Medicines,Agri-Medicines -128049209,PerformanceEnhancers,Medicines,Performance Enhancers -128049210,BasicMedicines,Medicines,Basic Medicines -128049212,BasicNarcotics,Legal Drugs,Narcotics -128049213,Tobacco,Legal Drugs,Tobacco -128049214,Beer,Legal Drugs,Beer -128049215,Wine,Legal Drugs,Wine -128049216,Liquor,Legal Drugs,Liquor -128049217,PowerGenerators,Machinery,Power Generators -128049218,WaterPurifiers,Machinery,Water Purifiers -128049220,HeliostaticFurnaces,Machinery,Microbial Furnaces -128049221,MineralExtractors,Machinery,Mineral Extractors -128049222,CropHarvesters,Machinery,Crop Harvesters -128049223,MarineSupplies,Machinery,Marine Equipment -128049225,ComputerComponents,Technology,Computer Components -128049226,HazardousEnvironmentSuits,Technology,H.E. Suits -128049227,Robotics,Technology,Robotics -128049228,AutoFabricators,Technology,Auto-Fabricators -128049229,AnimalMonitors,Technology,Animal Monitors -128049230,AquaponicSystems,Technology,Aquaponic Systems -128049231,AdvancedCatalysers,Technology,Advanced Catalysers -128049232,TerrainEnrichmentSystems,Technology,Land Enrichment Systems -128049233,PersonalWeapons,Weapons,Personal Weapons -128049234,BattleWeapons,Weapons,Battle Weapons -128049235,ReactiveArmour,Weapons,Reactive Armour -128049236,NonLethalWeapons,Weapons,Non-Lethal Weapons -128049238,DomesticAppliances,Consumer Items,Domestic Appliances -128049240,ConsumerTechnology,Consumer Items,Consumer Technology -128049241,Clothing,Consumer Items,Clothing -128049243,Slaves,Slavery,Slaves -128049244,Biowaste,Waste,Biowaste -128049245,ToxicWaste,Waste,Toxic Waste -128049246,ChemicalWaste,Waste,Chemical Waste -128049248,Scrap,Waste,Scrap -128049669,ProgenitorCells,Medicines,Progenitor Cells -128049670,CombatStabilisers,Medicines,Combat Stabilisers -128049671,ResonatingSeparators,Technology,Resonating Separators -128049672,BioReducingLichen,Technology,Bioreducing Lichen -128064028,AtmosphericExtractors,Machinery,Atmospheric Processors -128066403,Drones,NonMarketable,Limpets -128666752,USSCargoBlackBox,Salvage,Black Box -128666754,USSCargoTradeData,Salvage,Trade Data -128666755,USSCargoMilitaryPlans,Salvage,Military Plans -128666756,USSCargoAncientArtefact,Salvage,Ancient Artefact -128666757,USSCargoRareArtwork,Salvage,Rare Artwork -128666758,USSCargoExperimentalChemicals,Salvage,Experimental Chemicals -128666759,USSCargoRebelTransmissions,Salvage,Rebel Transmissions -128666760,USSCargoPrototypeTech,Salvage,Prototype Tech -128666761,USSCargoTechnicalBlueprints,Salvage,Technical Blueprints -128667728,ImperialSlaves,Slavery,Imperial Slaves -128668547,UnknownArtifact,Salvage,Thargoid Sensor -128668548,AiRelics,Salvage,AI Relics -128668549,Hafnium178,Metals,Hafnium 178 -128668550,Painite,Minerals,Painite -128668551,Antiquities,Salvage,Antiquities -128668552,MilitaryIntelligence,Salvage,Military Intelligence -128671118,Osmium,Metals,Osmium -128671443,SAP8CoreContainer,Salvage,SAP 8 Core Container -128671444,TrinketsOfFortune,Consumer Items,Trinkets of Hidden Fortune -128672123,WreckageComponents,Salvage,Wreckage Components -128672124,EncriptedDataStorage,Salvage,Encrypted Data Storage -128672125,OccupiedCryoPod,Salvage,Occupied Escape Pod -128672126,PersonalEffects,Salvage,Personal Effects -128672127,ComercialSamples,Salvage,Commercial Samples -128672128,TacticalData,Salvage,Tactical Data -128672129,AssaultPlans,Salvage,Assault Plans -128672130,EncryptedCorrespondence,Salvage,Encrypted Correspondence -128672131,DiplomaticBag,Salvage,Diplomatic Bag -128672132,ScientificResearch,Salvage,Scientific Research -128672133,ScientificSamples,Salvage,Scientific Samples -128672134,PoliticalPrisoner,Salvage,Political Prisoners -128672135,Hostage,Salvage,Hostages -128672136,LargeExplorationDataCash,Salvage,Large Survey Data Cache -128672137,SmallExplorationDataCash,Salvage,Small Survey Data Cache -128672159,AntiqueJewellery,Salvage,Antique Jewellery -128672160,PreciousGems,Salvage,Precious Gems -128672161,EarthRelics,Salvage,Earth Relics -128672162,GeneBank,Salvage,Gene Bank -128672163,TimeCapsule,Salvage,Time Capsule -128672294,Cryolite,Minerals,Cryolite -128672295,Goslarite,Minerals,Goslarite -128672296,Moissanite,Minerals,Moissanite -128672297,Pyrophyllite,Minerals,Pyrophyllite -128672298,Lanthanum,Metals,Lanthanum -128672299,Thallium,Metals,Thallium -128672300,Bismuth,Metals,Bismuth -128672301,Thorium,Metals,Thorium -128672302,CeramicComposites,Industrial Materials,Ceramic Composites -128672303,SyntheticReagents,Chemicals,Synthetic Reagents -128672304,NerveAgents,Chemicals,Nerve Agents -128672305,SurfaceStabilisers,Chemicals,Surface Stabilisers -128672306,BootlegLiquor,Legal Drugs,Bootleg Liquor -128672307,GeologicalEquipment,Machinery,Geological Equipment -128672308,ThermalCoolingUnits,Machinery,Thermal Cooling Units -128672309,BuildingFabricators,Machinery,Building Fabricators -128672310,MuTomImager,Technology,Muon Imager -128672311,StructuralRegulators,Technology,Structural Regulators -128672312,Landmines,Weapons,Landmines -128672313,SkimerComponents,Machinery,Skimmer Components -128672314,EvacuationShelter,Consumer Items,Evacuation Shelter -128672315,GeologicalSamples,Salvage,Geological Samples -128672701,MetaAlloys,Industrial Materials,Meta-Alloys -128672775,Taaffeite,Minerals,Taaffeite -128672776,Jadeite,Minerals,Jadeite -128672810,UnstableDataCore,Salvage,Unstable Data Core -128672811,DamagedEscapePod,Salvage,Damaged Escape Pod -128673845,Praseodymium,Metals,Praseodymium -128673846,Bromellite,Minerals,Bromellite -128673847,Samarium,Metals,Samarium -128673848,LowTemperatureDiamond,Minerals,Low Temperature Diamonds -128673850,HydrogenPeroxide,Chemicals,Hydrogen Peroxide -128673851,LiquidOxygen,Chemicals,Liquid oxygen -128673852,MethanolMonohydrateCrystals,Minerals,Methanol Monohydrate Crystals -128673853,LithiumHydroxide,Minerals,Lithium Hydroxide -128673854,MethaneClathrate,Minerals,Methane Clathrate -128673855,InsulatingMembrane,Industrial Materials,Insulating Membrane -128673856,CMMComposite,Industrial Materials,CMM Composite -128673857,CoolingHoses,Industrial Materials,Micro-weave Cooling Hoses -128673858,NeofabricInsulation,Industrial Materials,Neofabric Insulation -128673859,ArticulationMotors,Machinery,Articulation Motors -128673860,HNShockMount,Machinery,HN Shock Mount -128673861,EmergencyPowerCells,Machinery,Emergency Power Cells -128673862,PowerConverter,Machinery,Power Converter -128673863,PowerGridAssembly,Machinery,Energy Grid Assembly -128673864,PowerTransferConduits,Machinery,Power Transfer Bus -128673865,RadiationBaffle,Machinery,Radiation Baffle -128673866,ExhaustManifold,Machinery,Exhaust Manifold -128673867,ReinforcedMountingPlate,Machinery,Reinforced Mounting Plate -128673868,HeatsinkInterlink,Machinery,Heatsink Interlink -128673869,MagneticEmitterCoil,Machinery,Magnetic Emitter Coil -128673870,ModularTerminals,Machinery,Modular Terminals -128673871,Nanobreakers,Technology,Nanobreakers -128673872,TelemetrySuite,Technology,Telemetry Suite -128673873,MicroControllers,Technology,Micro Controllers -128673874,IonDistributor,Machinery,Ion Distributor -128673875,DiagnosticSensor,Technology,Hardware Diagnostic Sensor -128673876,UnknownArtifact2,Salvage,Thargoid Probe -128682044,ConductiveFabrics,Textiles,Conductive Fabrics -128682045,MilitaryGradeFabrics,Textiles,Military Grade Fabrics -128682046,AdvancedMedicines,Medicines,Advanced Medicines -128682047,MedicalDiagnosticEquipment,Technology,Medical Diagnostic Equipment -128682048,SurvivalEquipment,Consumer Items,Survival Equipment -128682049,DataCore,Salvage,Data Core -128682051,MysteriousIdol,Salvage,Mysterious Idol -128682052,ProhibitedResearchMaterials,Salvage,Prohibited Research Materials -128682053,AntimatterContainmentUnit,Salvage,Antimatter Containment Unit -128682054,SpacePioneerRelics,Salvage,Space Pioneer Relics -128682055,FossilRemnants,Salvage,Fossil Remnants -128732183,AncientRelic,Salvage,Ancient Relic -128732184,AncientOrb,Salvage,Ancient Orb -128732185,AncientCasket,Salvage,Ancient Casket -128732186,AncientTablet,Salvage,Ancient Tablet -128732187,AncientUrn,Salvage,Ancient Urn -128732188,AncientTotem,Salvage,Ancient Totem -128737287,UnknownResin,Salvage,Thargoid Resin -128737288,UnknownBiologicalMatter,Salvage,Thargoid Biological Matter -128737289,UnknownTechnologySamples,Salvage,Thargoid Technology Samples -128740752,UnknownArtifact3,Salvage,Thargoid Link -128793127,ThargoidHeart,Salvage,Thargoid Heart -128793128,ThargoidTissueSampleType1,Salvage,Thargoid Cyclops Tissue Sample -128793129,ThargoidTissueSampleType2,Salvage,Thargoid Basilisk Tissue Sample -128793130,ThargoidTissueSampleType3,Salvage,Thargoid Medusa Tissue Sample -128824468,ThargoidScoutTissueSample,Salvage,Thargoid Scout Tissue Sample -128888499,AncientKey,Salvage,Ancient Key -128902652,ThargoidTissueSampleType4,Salvage,Thargoid Hydra Tissue Sample -128913661,Nanomedicines,Medicines,Nanomedicines -128922524,Duradrives,Consumer Items,Duradrives -128924325,Rhodplumsite,Minerals,Rhodplumsite -128924326,Serendibite,Minerals,Serendibite -128924327,Monazite,Minerals,Monazite -128924328,Musgravite,Minerals,Musgravite -128924329,Benitoite,Minerals,Benitoite -128924330,Grandidierite,Minerals,Grandidierite -128924331,Alexandrite,Minerals,Alexandrite -128924332,Opal,Minerals,Void Opal -128924333,RockforthFertiliser,Chemicals,Rockforth Fertiliser -128924334,AgronomicTreatment,Chemicals,Agronomic Treatment diff --git a/rare_commodity.csv b/rare_commodity.csv deleted file mode 100644 index 67b95dbd..00000000 --- a/rare_commodity.csv +++ /dev/null @@ -1,139 +0,0 @@ -id,symbol,market_id,category,name -128666746,EraninPearlWhisky,128001536,Legal Drugs,Eranin Pearl Whisky -128666747,LavianBrandy,128106744,Legal Drugs,Lavian Brandy -128667019,HIP10175BushMeat,3223234816,Foods,HIP 10175 Bush Meat -128667020,AlbinoQuechuaMammoth,3222822912,Foods,Albino Quechua Mammoth Meat -128667021,UtgaroarMillenialEggs,128037120,Foods,Utgaroar Millennial Eggs -128667022,WitchhaulKobeBeef,3223358720,Foods,Witchhaul Kobe Beef -128667023,KarsukiLocusts,3225028096,Foods,Karsuki Locusts -128667024,GiantIrukamaSnails,3225345792,Foods,Giant Irukama Snails -128667025,BaltahSineVacuumKrill,128088056,Foods,Baltah'sine Vacuum Krill -128667026,CetiRabbits,3222560000,Foods,Ceti Rabbits -128667027,KachiriginLeaches,3221595648,Medicines,Kachirigin Filter Leeches -128667028,LyraeWeed,3226417152,Legal Drugs,Lyrae Weed -128667029,OnionHead,128129272,Legal Drugs,Onionhead -128667030,TarachTorSpice,128041984,Legal Drugs,Tarach Spice -128667031,Wolf1301Fesh,128084984,Legal Drugs,Wolf Fesh -128667032,BorasetaniPathogenetics,3229638400,Weapons,Borasetani Pathogenetics -128667033,HIP118311Swarm,3223177472,Weapons,HIP 118311 Swarm -128667034,KonggaAle,3226978048,Legal Drugs,Kongga Ale -128667035,WuthieloKuFroth,3222155776,Legal Drugs,Wuthielo Ku Froth -128667036,AlacarakmoSkinArt,3231373824,Consumer Items,Alacarakmo Skin Art -128667037,EleuThermals,3230624768,Consumer Items,Eleu Thermals -128667038,EshuUmbrellas,3222295552,Consumer Items,Eshu Umbrellas -128667039,KaretiiCouture,3227333120,Consumer Items,Karetii Couture -128667040,NjangariSaddles,3222416896,Consumer Items,Njangari Saddles -128667041,AnyNaCoffee,3229880064,Foods,Any Na Coffee -128667042,CD75CatCoffee,3228566016,Foods,CD-75 Kitten Brand Coffee -128667043,GomanYauponCoffee,3224449792,Foods,Goman Yaupon Coffee -128667044,VolkhabBeeDrones,3227831808,Machinery,Volkhab Bee Drones -128667045,KinagoInstruments,3227394304,Consumer Items,Kinago Violins -128667046,NgunaModernAntiques,3221538304,Consumer Items,Nguna Modern Antiques -128667047,RajukruStoves,3227512320,Consumer Items,Rajukru Multi-Stoves -128667048,TiolceWaste2PasteUnits,3224141312,Consumer Items,Tiolce Waste2Paste Units -128667049,ChiEridaniMarinePaste,128128760,Foods,Chi Eridani Marine Paste -128667050,EsusekuCaviar,3226919680,Foods,Esuseku Caviar -128667051,LiveHecateSeaWorms,128042496,Foods,Live Hecate Sea Worms -128667052,HelvetitjPearls,3231094528,Metals,Helvetitj Pearls -128667053,HIP41181Squid,3227995392,Foods,HIP Proto-Squid -128667054,CoquimSpongiformVictuals,3223832576,Foods,Coquim Spongiform Victuals -128667055,AerialEdenApple,128083448,Foods,Eden Apples of Aerial -128667056,NeritusBerries,3228206080,Foods,Neritus Berries -128667057,OchoengChillies,3226719232,Foods,Ochoeng Chillies -128667058,DeuringasTruffles,3229713408,Foods,Deuringas Truffles -128667059,HR7221Wheat,3226170880,Foods,HR 7221 Wheat -128667060,JarouaRice,3224698112,Foods,Jaroua Rice -128667061,BelalansRayLeather,3223537152,Textiles,Belalans Ray Leather -128667062,DamnaCarapaces,3227751936,Textiles,Damna Carapaces -128667063,RapaBaoSnakeSkins,3222875648,Textiles,Rapa Bao Snake Skins -128667064,VanayequiRhinoFur,3227289856,Textiles,Vanayequi Ceratomorpha Fur -128667065,BastSnakeGin,128086776,Legal Drugs,Bast Snake Gin -128667066,ThrutisCream,3226522368,Legal Drugs,Thrutis Cream -128667067,WulpaHyperboreSystems,3221388032,Machinery,Wulpa Hyperbore Systems -128667068,AganippeRush,128012800,Medicines,Aganippe Rush -128667069,TerraMaterBloodBores,128051466,Medicines,Terra Mater Blood Bores -128667070,HolvaDuellingBlades,3222713088,Weapons,Holva Duelling Blades -128667071,KamorinHistoricWeapons,3221669632,Weapons,Kamorin Historic Weapons -128667072,GilyaSignatureWeapons,3226857216,Weapons,Gilya Signature Weapons -128667073,DeltaPhoenicisPalms,128045312,Chemicals,Delta Phoenicis Palms -128667074,ToxandjiVirocide,3230258688,Chemicals,Toxandji Virocide -128667075,XiheCompanions,3224133120,Technology,Xihe Biomorphic Companions -128667076,SanumaMEAT,3230331136,Foods,Sanuma Decorative Meat -128667077,EthgrezeTeaBuds,3229524992,Foods,Ethgreze Tea Buds -128667078,CeremonialHeikeTea,3227417856,Foods,Ceremonial Heike Tea -128667079,TanmarkTranquilTea,128057866,Foods,Tanmark Tranquil Tea -128667080,AZCancriFormula42,3228400128,Technology,Az Cancri Formula 42 -128667081,KamitraCigars,3225450752,Legal Drugs,Kamitra Cigars -128667082,RusaniOldSmokey,3229255680,Legal Drugs,Rusani Old Smokey -128667083,YasoKondiLeaf,3223088640,Legal Drugs,Yaso Kondi Leaf -128667084,ChateauDeAegaeon,3228416768,Legal Drugs,Chateau De Aegaeon -128667085,WatersOfShintara,128666762,Medicines,The Waters of Shintara -128667668,OphiuchiExinoArtefacts,3228939264,Consumer Items,Ophiuch Exino Artefacts -128667669,BakedGreebles,3229378560,Foods,Baked Greebles -128667670,CetiAepyornisEgg,3222560256,Foods,Aepyornis Egg -128667671,SaxonWine,3227986432,Legal Drugs,Saxon Wine -128667672,CentauriMegaGin,3228728832,Legal Drugs,Centauri Mega Gin -128667673,AnduligaFireWorks,3230243584,Consumer Items,Anduliga Fire Works -128667674,BankiAmphibiousLeather,3228346112,Textiles,Banki Amphibious Leather -128667675,CherbonesBloodCrystals,3229594624,Metals,Cherbones Blood Crystals -128667676,MotronaExperienceJelly,3229750528,Legal Drugs,Motrona Experience Jelly -128667677,GeawenDanceDust,3230954752,Legal Drugs,Geawen Dance Dust -128667678,GerasianGueuzeBeer,3228047360,Legal Drugs,Gerasian Gueuze Beer -128667679,HaidneBlackBrew,3226557696,Foods,Haiden Black Brew -128667680,HavasupaiDreamCatcher,3221438976,Consumer Items,Havasupai Dream Catcher -128667681,BurnhamBileDistillate,3230224384,Legal Drugs,Burnham Bile Distillate -128667682,HIPOrganophosphates,3227036160,Chemicals,HIP Organophosphates -128667683,JaradharrePuzzlebox,3230754816,Consumer Items,Jaradharre Puzzle Box -128667684,KorroKungPellets,3228726272,Chemicals,Koro Kung Pellets -128667685,LFTVoidExtractCoffee,3229028864,Foods,Void Extract Coffee -128667686,HonestyPills,3229561344,Medicines,Honesty Pills -128667687,NonEuclidianExotanks,3224135424,Machinery,Non Euclidian Exotanks -128667688,LTTHyperSweet,3224166400,Foods,LTT Hyper Sweet -128667689,MechucosHighTea,3228398848,Foods,Mechucos High Tea -128667690,MedbStarlube,3228762368,Chemicals,Medb Starlube -128667691,MokojingBeastFeast,3229612800,Foods,Mokojing Beast Feast -128667692,MukusubiiChitinOs,3221719296,Foods,Mukusubii Chitin-os -128667693,MulachiGiantFungus,3228892672,Foods,Mulachi Giant Fungus -128667694,NgadandariFireOpals,3226127872,Metals,Ngadandari Fire Opals -128667695,TiegfriesSynthSilk,3227726848,Textiles,Tiegfries Synth Silk -128667696,UzumokuLowGWings,3226474496,Consumer Items,Uzumoku Low-G Wings -128667697,VHerculisBodyRub,3228959232,Medicines,V Herculis Body Rub -128667698,WheemeteWheatCakes,3225032704,Foods,Wheemete Wheat Cakes -128667699,VegaSlimWeed,128149240,Medicines,Vega Slimweed -128667700,AltairianSkin,128151032,Consumer Items,Altairian Skin -128667701,PavonisEarGrubs,128117240,Legal Drugs,Pavonis Ear Grubs -128667702,JotunMookah,128078840,Textiles,Jotun Mookah -128667703,GiantVerrix,128121336,Machinery,Giant Verrix -128667704,IndiBourbon,128118520,Legal Drugs,Indi Bourbon -128667705,AroucaConventualSweets,128098040,Foods,Arouca Conventual Sweets -128667706,TauriChimes,128134648,Consumer Items,Tauri Chimes -128667707,ZeesszeAntGlue,128125432,Consumer Items,Zeessze Ant Grub Glue -128667708,PantaaPrayerSticks,3228824064,Medicines,Pantaa Prayer Sticks -128667709,FujinTea,128134392,Foods,Fujin Tea -128667710,ChameleonCloth,3223418880,Textiles,Chameleon Cloth -128667711,OrrerianViciousBrew,128166392,Foods,Orrerian Vicious Brew -128667712,UszaianTreeGrub,128164856,Foods,Uszaian Tree Grub -128667713,MomusBogSpaniel,128075256,Consumer Items,Momus Bog Spaniel -128667714,DisoMaCorn,128161016,Foods,Diso Ma Corn -128667715,LeestianEvilJuice,128639992,Legal Drugs,Leestian Evil Juice -128667716,BlueMilk,128639992,Foods,Azure Milk -128667717,AlienEggs,128164088,Consumer Items,Leathery Eggs -128667718,AlyaBodilySoap,3221638400,Medicines,Alya Body Soap -128667719,VidavantianLace,3231082240,Consumer Items,Vidavantian Lace -128667760,TransgenicOnionHead,128057866,Legal Drugs,Lucan Onionhead -128668017,JaquesQuinentianStill,128667761,Consumer Items,Jaques Quinentian Still -128668018,SoontillRelics,3225348096,Consumer Items,Soontill Relics -128671119,Advert1,3227172352,Consumer Items,Ultra-Compact Processor Prototypes -128672121,TheHuttonMug,3228728832,Consumer Items,The Hutton Mug -128672122,SothisCrystallineGold,128668557,Metals,Sothis Crystalline Gold -128672316,MasterChefs,3228193280,Slavery,Master Chefs -128672431,PersonalGifts,3223105792,Salvage,Personal Gifts -128672432,CrystallineSpheres,128059402,Salvage,Crystalline Spheres -128672812,OnionHeadA,3226977024,Legal Drugs,Onionhead Alpha Strain -128673069,OnionHeadB,3223027200,Legal Drugs,Onionhead Beta Strain -128682050,GalacticTravelGuide,128673074,Salvage,Galactic Travel Guide -128727921,AnimalEffigies,3228463360,Legal Drugs,Crom Silver Fesh -128732551,ShansCharisOrchid,128107768,Consumer Items,Shan's Charis Orchid -128748428,BuckyballBeerMats,128745551,Consumer Items,Buckyball Beer Mats -128793113,HarmaSilverSeaRum,3221575424,Legal Drugs,Harma Silver Sea Rum -128793114,PlatinumAloy,3223779840,Metals,Platinum Alloy From da4ae24440c7815492a6f59d7416725dea0cee37 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 12:23:20 +0000 Subject: [PATCH 7/7] Document use of *local* outfitting.csv instead of FDevIDs version That's in collate.py and coriolis.py docstrings. --- collate.py | 5 +++++ coriolis.py | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/collate.py b/collate.py index d789a6c5..3ab5224b 100755 --- a/collate.py +++ b/collate.py @@ -5,6 +5,11 @@ Collate lists of seen commodities, modules and ships from dumps of the Companion Note that currently this will only work with the output files created if you run the main program from a working directory that has a `dump/` directory, which causes a file to be written per CAPI query. + +This script also utilise the file outfitting.csv. As it both reads it in *and* +writes out a new copy a local copy, in the root of the project structure, is +used for this purpose. If you want to utilise the FDevIDs/ version of the +file, copy it over the local one. """ import csv diff --git a/coriolis.py b/coriolis.py index 5ce76a29..0afb16e5 100755 --- a/coriolis.py +++ b/coriolis.py @@ -1,5 +1,12 @@ #!/usr/bin/env python3 -"""Build ship and module databases from https://github.com/EDCD/coriolis-data/ .""" +""" +Build ship and module databases from https://github.com/EDCD/coriolis-data/ . + +This script also utilise the file outfitting.csv. Due to how collate.py +both reads and writes to this file a local copy is used, in the root of the +project structure, is used for this purpose. If you want to utilise the +FDevIDs/ version of the file, copy it over the local one. +""" import csv