Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add error handling #39

Merged
merged 4 commits into from
Jul 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions src/G2DataGUI.Common/Data/Bosses/Bosses.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Errors;
using G2DataGUI.Common.Paths;

namespace G2DataGUI.Common.Data.Bosses;
Expand Down Expand Up @@ -29,23 +30,30 @@ private async Task ReadBossesAsync() =>

private void ReadBosses()
{
GameBosses.Clear();
var directory =
DifficultyMode.Instance.IsHardMode ?
Version.Instance.RootDataDirectory + GamePaths.BossHardmodeDirectory :
Version.Instance.RootDataDirectory + GamePaths.BossDirectory;
foreach (var file in Directory.GetFiles(directory, "*_0.dat", SearchOption.AllDirectories))
{
using FileStream reader = File.Open(file, FileMode.Open);
GameBosses.Add(Boss.ReadBoss(reader, file));
try
{
GameBosses.Clear();
var directory =
DifficultyMode.Instance.IsHardMode ?
Version.Instance.RootDataDirectory + GamePaths.BossHardmodeDirectory :
Version.Instance.RootDataDirectory + GamePaths.BossDirectory;
foreach (var file in Directory.GetFiles(directory, "*_0.dat", SearchOption.AllDirectories))
{
using FileStream reader = File.Open(file, FileMode.Open);
GameBosses.Add(Boss.ReadBoss(reader, file));

if (Boss.FileHasSecondBoss(reader))
{
GameBosses.Add(Boss.ReadBoss(reader, file, true));
}
}
if (Boss.FileHasSecondBoss(reader))
{
GameBosses.Add(Boss.ReadBoss(reader, file, true));
}
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Bosses", ex.Message));
}
}

private void WriteBosses()
Expand Down
42 changes: 25 additions & 17 deletions src/G2DataGUI.Common/Data/Enemies/Enemies.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Errors;
using G2DataGUI.Common.Paths;

namespace G2DataGUI.Common.Data.Enemies;
Expand Down Expand Up @@ -29,25 +30,32 @@ private async Task ReadEnemiesAsync() =>

private void ReadEnemies()
{
GameEnemies.Clear();
var directory =
DifficultyMode.Instance.IsHardMode ?
Version.Instance.RootDataDirectory + GamePaths.EnemyHardmodeDirectory :
Version.Instance.RootDataDirectory + GamePaths.EnemyDirectory;
foreach (var file in Directory.GetFiles(directory, "*_0.dat", SearchOption.AllDirectories))
{
using FileStream reader = File.Open(file, FileMode.Open, FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
GameEnemies.Add(Enemy.ReadEnemy(memReader, file));
try
{
GameEnemies.Clear();
var directory =
DifficultyMode.Instance.IsHardMode ?
Version.Instance.RootDataDirectory + GamePaths.EnemyHardmodeDirectory :
Version.Instance.RootDataDirectory + GamePaths.EnemyDirectory;
foreach (var file in Directory.GetFiles(directory, "*_0.dat", SearchOption.AllDirectories))
{
using FileStream reader = File.Open(file, FileMode.Open, FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
GameEnemies.Add(Enemy.ReadEnemy(memReader, file));

if (Enemy.FileHasSecondEnemy(memReader))
{
GameEnemies.Add(Enemy.ReadEnemy(memReader, file, true));
}
}
if (Enemy.FileHasSecondEnemy(memReader))
{
GameEnemies.Add(Enemy.ReadEnemy(memReader, file, true));
}
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Enemies", ex.Message));
}
}

private void WriteEnemies()
Expand Down
21 changes: 21 additions & 0 deletions src/G2DataGUI.Common/Data/Errors/Error.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using Avalonia.Media;

namespace G2DataGUI.Common.Data.Errors;

public class Error
{
public string Area { get; }
public string Message { get; }
public Color ErrorColor { get; }

private Error() { }

public Error(string area, string message)
{
Area = area;
Message = message;
}

public void Remove() =>
Errors.Instance.RemoveError(this);
}
20 changes: 20 additions & 0 deletions src/G2DataGUI.Common/Data/Errors/Errors.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System.Collections.ObjectModel;
using G2DataGUI.Common.Data.Common;

namespace G2DataGUI.Common.Data.Errors;

public class Errors : BaseContainer
{
public static Errors Instance = new();

public ObservableCollection<Error> AppErrors = new();

private Errors() { }

public void AddError(Error error) => AppErrors.Add(error);

public void AddError(string message, string area) =>
AppErrors.Add(new Error(message, area));

public void RemoveError(Error error) => AppErrors.Remove(error);
}
38 changes: 23 additions & 15 deletions src/G2DataGUI.Common/Data/Items/Items.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Errors;
using G2DataGUI.Common.Paths;

namespace G2DataGUI.Common.Data.Items;
Expand All @@ -27,22 +28,29 @@ private async Task ReadItemsAsync() =>

private void ReadItems()
{
GameItems.Clear();
using FileStream reader = File.Open(
Version.Instance.RootDataDirectory + GamePaths.ItemsPath,
FileMode.Open,
FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
for (uint index = 0; index < NumberOfItems; index++)
{
Item item = Item.ReadItem(memReader);
item.ID = index;
GameItems.Add(item);
}
try
{
GameItems.Clear();
using FileStream reader = File.Open(
Version.Instance.RootDataDirectory + GamePaths.ItemsPath,
FileMode.Open,
FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
for (uint index = 0; index < NumberOfItems; index++)
{
Item item = Item.ReadItem(memReader);
item.ID = index;
GameItems.Add(item);
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Items", ex.Message));
}
}

private void WriteItems()
Expand Down
40 changes: 24 additions & 16 deletions src/G2DataGUI.Common/Data/Levelups/Levelups.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Common;
using G2DataGUI.Common.Data.Errors;
using G2DataGUI.Common.Paths;
using G2DataGUI.UI.Common.Locale;

Expand All @@ -28,24 +29,31 @@ private async Task ReadLevelupsAsync() =>

private void ReadLevelups()
{
GameLevelups.Clear();
using FileStream reader = File.Open(
Version.Instance.RootDataDirectory + GamePaths.LevelupsPath,
FileMode.Open,
FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
int index = 0;
while (memReader.Position < memReader.Length)
try
{
GameLevelups.Add(
CharacterLevelups.ReadCharacterLevelups(
memReader,
LocaleManager.Instance[LocaleKeys.Characters][index++]));
}
GameLevelups.Clear();
using FileStream reader = File.Open(
Version.Instance.RootDataDirectory + GamePaths.LevelupsPath,
FileMode.Open,
FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
int index = 0;
while (memReader.Position < memReader.Length)
{
GameLevelups.Add(
CharacterLevelups.ReadCharacterLevelups(
memReader,
LocaleManager.Instance[LocaleKeys.Characters][index++]));
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Levelups", ex.Message));
}
}

private void WriteLevelups()
Expand Down
24 changes: 16 additions & 8 deletions src/G2DataGUI.Common/Data/Maps/Maps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Errors;

namespace G2DataGUI.Common.Data.Maps;

Expand All @@ -25,14 +26,21 @@ private async Task ReadMapsAsync() =>

private void ReadMaps()
{
GameMaps.Clear();
foreach(var file in Directory.GetFiles(Version.Instance.RootDataDirectory + "map", "*.mdt", SearchOption.AllDirectories))
{
using FileStream reader = File.Open(file, FileMode.Open);
GameMaps.Add(Map.ReadMap(reader, file));
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
try
{
GameMaps.Clear();
foreach (var file in Directory.GetFiles(Version.Instance.RootDataDirectory + "map", "*.mdt", SearchOption.AllDirectories))
{
using FileStream reader = File.Open(file, FileMode.Open);
GameMaps.Add(Map.ReadMap(reader, file));
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Maps", ex.Message));
}
}

private void WriteMaps()
Expand Down
28 changes: 18 additions & 10 deletions src/G2DataGUI.Common/Data/Moves/Manaeggs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Errors;
using G2DataGUI.Common.Paths;
using G2DataGUI.UI.Common.Locale;

Expand All @@ -28,17 +29,24 @@ private async Task ReadManaeggsAsync() =>

private void ReadManaeggs()
{
GameManaeggs.Clear();
using FileStream reader = File.Open(Version.Instance.RootDataDirectory + GamePaths.ManaeggsPath, FileMode.Open, FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
while (memReader.Position < memReader.Length)
{
GameManaeggs.Add(Manaegg.ReadManaegg(memReader));
}
try
{
GameManaeggs.Clear();
using FileStream reader = File.Open(Version.Instance.RootDataDirectory + GamePaths.ManaeggsPath, FileMode.Open, FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
while (memReader.Position < memReader.Length)
{
GameManaeggs.Add(Manaegg.ReadManaegg(memReader));
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Manaeggs", ex.Message));
}
}

private void WriteManaeggs()
Expand Down
38 changes: 23 additions & 15 deletions src/G2DataGUI.Common/Data/Moves/Moves.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.IO;
using System.Threading.Tasks;
using G2DataGUI.Common.Data.Errors;
using G2DataGUI.Common.Paths;

namespace G2DataGUI.Common.Data.Moves;
Expand All @@ -27,22 +28,29 @@ private async Task ReadMovesAsync() =>

private void ReadMoves()
{
GameMoves.Clear();
using FileStream reader = File.Open(
Version.Instance.RootDataDirectory + GamePaths.MovesPath,
FileMode.Open,
FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
while (memReader.Position < memReader.Length)
{
Move move = Move.ReadMove(memReader);
move.ID = Convert.ToByte(GameMoves.Count);
GameMoves.Add(move);
}
try
{
GameMoves.Clear();
using FileStream reader = File.Open(
Version.Instance.RootDataDirectory + GamePaths.MovesPath,
FileMode.Open,
FileAccess.Read);
using MemoryStream memReader = new();
reader.CopyTo(memReader);
memReader.Seek(0, SeekOrigin.Begin);
while (memReader.Position < memReader.Length)
{
Move move = Move.ReadMove(memReader);
move.ID = Convert.ToByte(GameMoves.Count);
GameMoves.Add(move);
}

CollectionRefreshed?.Invoke(this, EventArgs.Empty);
CollectionRefreshed?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
{
Errors.Errors.Instance.AddError(new Error("Moves", ex.Message));
}
}

private void WriteMoves()
Expand Down
Loading