Updated regex to support Odyssey. #1

Closed

Epaphus wants to merge 1 commit from release into release

Epaphus commented

2022-02-17 20:53:26 +01:00

(Migrated from github.com)

Odyssey log file format is slightly different to Horizons, I have updated the regex to support both.

EDO log sample

Undocking

{ "timestamp":"2022-02-17T18:42:50Z", "event":"Undocked", "StationName":"Garden Ring", "StationType":"Outpost", "MarketID":3226668288, "Taxi":false, "Multicrew":false }

Docking


{ "timestamp":"2022-02-17T18:50:50Z", "event":"Docked", "StationName":"Garden Ring", "StationType":"Outpost", "Taxi":false, "Multicrew":false, "StarSystem":"Pareco", "SystemAddress":3034117572971, "MarketID":3226668288, "StationFaction":{ "Name":"Pareco SCIEnCE Institute", "FactionState":"Boom" }, "StationGovernment":"$government_Democracy;", "StationGovernment_Localised":"Democracy", "StationServices":[ "dock", "autodock", "blackmarket", "commodities", "contacts", "exploration", "missions", "outfitting", "crewlounge", "rearm", "refuel", "repair", "tuning", "engineer", "missionsgenerated", "flightcontroller", "stationoperations", "powerplay", "searchrescue", "stationMenu", "livery", "socialspace", "bartender", "vistagenomics", "pioneersupplies", "apexinterstellar", "frontlinesolutions" ], "StationEconomy":"$economy_Industrial;", "StationEconomy_Localised":"Industrial", "StationEconomies":[ { "Name":"$economy_Industrial;", "Name_Localised":"Industrial", "Proportion":1.000000 } ], "DistFromStarLS":12062.257570, "LandingPads":{ "Small":2, "Medium":1, "Large":0 } }

Odyssey log file format is slightly different to Horizons, I have updated the regex to support both. EDO log sample Undocking ``` { "timestamp":"2022-02-17T18:42:50Z", "event":"Undocked", "StationName":"Garden Ring", "StationType":"Outpost", "MarketID":3226668288, "Taxi":false, "Multicrew":false } ``` Docking ``` { "timestamp":"2022-02-17T18:50:50Z", "event":"Docked", "StationName":"Garden Ring", "StationType":"Outpost", "Taxi":false, "Multicrew":false, "StarSystem":"Pareco", "SystemAddress":3034117572971, "MarketID":3226668288, "StationFaction":{ "Name":"Pareco SCIEnCE Institute", "FactionState":"Boom" }, "StationGovernment":"$government_Democracy;", "StationGovernment_Localised":"Democracy", "StationServices":[ "dock", "autodock", "blackmarket", "commodities", "contacts", "exploration", "missions", "outfitting", "crewlounge", "rearm", "refuel", "repair", "tuning", "engineer", "missionsgenerated", "flightcontroller", "stationoperations", "powerplay", "searchrescue", "stationMenu", "livery", "socialspace", "bartender", "vistagenomics", "pioneersupplies", "apexinterstellar", "frontlinesolutions" ], "StationEconomy":"$economy_Industrial;", "StationEconomy_Localised":"Industrial", "StationEconomies":[ { "Name":"$economy_Industrial;", "Name_Localised":"Industrial", "Proportion":1.000000 } ], "DistFromStarLS":12062.257570, "LandingPads":{ "Small":2, "Medium":1, "Large":0 } } ```

alterNERDtive commented

2022-02-18 16:33:56 +01:00

(Migrated from github.com)

Ugh, I hat everything Odyssey.

You missed the multicrew part of the Docked event, and I made the Undocked one more specific.

In the future, please create pull requests against the develop branch :)

Ugh, I hat everything Odyssey. You missed the multicrew part of the `Docked` event, and I made the `Undocked` one more specific. In the future, please create pull requests against the `develop` branch :)