diff --git a/MCTG/ConsoleApp/Program.cs b/MCTG/ConsoleApp/Program.cs index eed2186..089b8f0 100644 --- a/MCTG/ConsoleApp/Program.cs +++ b/MCTG/ConsoleApp/Program.cs @@ -12,11 +12,10 @@ Console.WriteLine("Hello, World!\n\n"); // TESTS: DataManager dataMgr = new DataManager(new Stubs()); -List allRecipes = dataMgr.Data["recipes"]; +RecipeCollection rc = new RecipeCollection("All recipes", dataMgr.Data["recipes"].Cast().ToArray()); +Recipe? ret = SearcherRecipe.ResearchOn(rc); +Console.WriteLine(ret); -Recipe? ret = SearcherRecipe.ResearchOn(allRecipes); -Console.WriteLine(ret); - -// press any key to quit -Console.ReadKey(); +// press any key to quit +Console.ReadKey(); diff --git a/MCTG/DataPersistence/DataManager.cs b/MCTG/DataPersistence/DataManager.cs index f9b5c22..cc17e64 100644 --- a/MCTG/DataPersistence/DataManager.cs +++ b/MCTG/DataPersistence/DataManager.cs @@ -14,14 +14,14 @@ namespace DataPersistence public DataManager(IDataManager dataMgr, string? path = null) { - if (path is null) path = "..//..//..//..//data"; - Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), path)); + //if (path is null) path = "..//..//..//..//data"; + //Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), path)); Serializer = dataMgr; - Data = Serializer.LoadAll(); + Data = Serializer.Load(); } public void Reload() - => Data = Serializer.LoadAll(); + => Data = Serializer.Load(); } } diff --git a/MCTG/DataPersistence/IDataManager.cs b/MCTG/DataPersistence/IDataManager.cs index 4f89cb2..4329c78 100644 --- a/MCTG/DataPersistence/IDataManager.cs +++ b/MCTG/DataPersistence/IDataManager.cs @@ -11,7 +11,7 @@ namespace DataPersistence //void Save(List values); //List Load(); - void SaveAll(); - Dictionary> LoadAll(); + void Save(); + Dictionary> Load(); } } diff --git a/MCTG/DataPersistence/Stubs.cs b/MCTG/DataPersistence/Stubs.cs index 06671db..ba6d4dd 100644 --- a/MCTG/DataPersistence/Stubs.cs +++ b/MCTG/DataPersistence/Stubs.cs @@ -9,7 +9,7 @@ namespace DataPersistence { public class Stubs : IDataManager { - public Dictionary> LoadAll() + public Dictionary> Load() { Dictionary> data = new Dictionary> { @@ -87,7 +87,7 @@ namespace DataPersistence return data; } - public void SaveAll() + public void Save() { // Stubs dont' have to save. }