Skip to content

Commit

Permalink
removed ticker/name caches
Browse files Browse the repository at this point in the history
  • Loading branch information
BitBaboonSteve committed Apr 19, 2023
1 parent 6d44489 commit 50913c7
Showing 1 changed file with 3 additions and 32 deletions.
35 changes: 3 additions & 32 deletions EVEData/EveManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,6 @@ public void LoadFromDisk()
SystemIDToName = new SerializableDictionary<long, string>();

Regions = Serialization.DeserializeFromDisk<List<MapRegion>>(AppDomain.CurrentDomain.BaseDirectory + @"\data\MapLayout.dat");

Systems = Serialization.DeserializeFromDisk<List<System>>(AppDomain.CurrentDomain.BaseDirectory + @"\data\Systems.dat");
ShipTypes = Serialization.DeserializeFromDisk<SerializableDictionary<string, string>>(AppDomain.CurrentDomain.BaseDirectory + @"\data\ShipTypes.dat");

Expand All @@ -1595,34 +1594,10 @@ public void LoadFromDisk()
SystemIDToName[s.ID] = s.Name;
}

if (File.Exists(SaveDataVersionFolder + @"\CharacterNames.dat"))
{
CharacterIDToName = Serialization.DeserializeFromDisk<SerializableDictionary<long, string>>(SaveDataVersionFolder + @"\CharacterNames.dat");
}
if (CharacterIDToName == null)
{
CharacterIDToName = new SerializableDictionary<long, string>();
}

if (File.Exists(SaveDataVersionFolder + @"\AllianceNames.dat"))
{
AllianceIDToName = Serialization.DeserializeFromDisk<SerializableDictionary<long, string>>(SaveDataVersionFolder + @"\AllianceNames.dat");
}

if (AllianceIDToName == null)
{
AllianceIDToName = new SerializableDictionary<long, string>();
}

if (File.Exists(SaveDataVersionFolder + @"\AllianceTickers.dat"))
{
AllianceIDToTicker = Serialization.DeserializeFromDisk<SerializableDictionary<long, string>>(SaveDataRootFolder + @"\AllianceTickers.dat");
}
CharacterIDToName = new SerializableDictionary<long, string>();
AllianceIDToName = new SerializableDictionary<long, string>();
AllianceIDToTicker = new SerializableDictionary<long, string>();

if (AllianceIDToTicker == null)
{
AllianceIDToTicker = new SerializableDictionary<long, string>();
}

// patch up any links
foreach (System s in Systems)
Expand Down Expand Up @@ -1805,10 +1780,6 @@ public void SaveData()
xms.Serialize(tw, saveList);
}

// now serialise the caches to disk
Serialization.SerializeToDisk<SerializableDictionary<long, string>>(CharacterIDToName, SaveDataVersionFolder + @"\CharacterNames.dat");
Serialization.SerializeToDisk<SerializableDictionary<long, string>>(AllianceIDToName, SaveDataVersionFolder + @"\AllianceNames.dat");
Serialization.SerializeToDisk<SerializableDictionary<long, string>>(AllianceIDToTicker, SaveDataVersionFolder + @"\AllianceTickers.dat");

string jbFileName = SaveDataRootFolder + @"\JumpBridges_" + JumpBridge.SaveVersion + ".dat";
Serialization.SerializeToDisk<ObservableCollection<JumpBridge>>(JumpBridges, jbFileName);
Expand Down

0 comments on commit 50913c7

Please sign in to comment.