ajout PokedexS2

PokedexS2/Pokedex/Commands/Command.cs

@@ -15,4 +15,5 @@ public Command(Pokedex pokedex, string[] commandArguments)
     }
 
     public abstract void Execute();
+
 }

PokedexS2/Pokedex/Commands/CommandInterpreter.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Reflection;
 
 namespace Pokedex;
 
@@ -29,11 +29,19 @@ public Command Interpret(string[] arguments)
         //commandName = localizationService.GetText(commandName);
         string[] commandArguments = arguments.Skip(1).ToArray();
 
+        //return MakeCommand(commandName, pokedex, commandArguments);
+
         switch (commandName)
         {
+            case "test":
+                return MakeCommand("add", pokedex, commandArguments);
+
             case "add":
                 return new AddCommand(pokedex, commandArguments);
 
+            // case "add_plant":
+            //     return new AddPlantCommand(pokedex, commandArguments);
+
             case "search":
                 return new SearchCommand(pokedex, commandArguments);
 
@@ -64,4 +72,16 @@ public Command Interpret(string[] arguments)
                 */
         }
     }
+
+    private Command MakeCommand(string name, Pokedex pokedex, string[] commandArguments)
+    {
+        string commandName = "Pokedex." + name[0].ToString().ToUpper() + name.Substring(1) + "Command";
+
+        Assembly asm = Assembly.GetExecutingAssembly();
+        System.Type type = asm.GetType(commandName);
+
+        object test = Activator.CreateInstance(type, new object[] { pokedex, commandArguments } );
+
+        return test as Command;
+    }
 }

PokedexS2/Pokedex/Commands/DiscoverCommand.cs

@@ -25,14 +25,14 @@ public override void Execute()
 
     void Discover(string name)
     {
-        Pokemon pokemon = Pokedex.Get(name);
+        ICollectible pokemon = Pokedex.Get(name);
         Console.WriteLine($"Pokemon {pokemon.Name} set to discovered");
         pokemon.Discover();
     }
 
     void Discover(int id)
     {
-        Pokemon pokemon = Pokedex.Get(id);
+        ICollectible pokemon = Pokedex.Get(id);
         Console.WriteLine($"Pokemon {pokemon.Name} set to discovered");
         pokemon.Discover();
     }

PokedexS2/Pokedex/Commands/ListCommand.cs

@@ -10,6 +10,6 @@ public ListCommand(Pokedex pokedex, string[] commandArguments)
 
     public override void Execute()
     {
-        // TODO
+        Console.WriteLine("coucou");
     }
 }

PokedexS2/Pokedex/Commands/LoadCommand.cs

@@ -1,3 +1,5 @@
+using System.Threading.Tasks;
+
 namespace Pokedex;
 
 public class LoadCommand : Command
@@ -12,6 +14,12 @@ public LoadCommand(Pokedex pokedex, string[] commandArguments)
     }
 
     public override void Execute()
+    {
+        throw new NotImplementedException("Execute() is not implemented. Use ExecuteAsync() instead.");
+    }
+
+
+    public async Task ExecuteAsync()
     {
         if (!isValid)
         {
@@ -29,12 +37,12 @@ public override void Execute()
             return;
         }
 
-        StreamReader reader = new StreamReader(path);
+        using StreamReader reader = new StreamReader(path);
 
         int count = 0;
         while(!reader.EndOfStream)
         {
-            string line = reader.ReadLine();
+            string line = await reader.ReadLineAsync(); // Ajout Async
             if (string.IsNullOrWhiteSpace(line))
             {
                 continue;
@@ -65,6 +73,8 @@ public override void Execute()
 
         Console.WriteLine($"{count} pokemons loaded from file.");
 
-        reader.Close();
+        //reader.Close();
+        //reader.Dispose();
+        return;
     }
 }

PokedexS2/Pokedex/Commands/ReadJsonCommand.cs

@@ -21,6 +21,10 @@ public ReadJsonCommand(
     }
 
     public override void Execute()
+    {
+        throw new NotImplementedException();
+    }
+    public async Task ExecuteAsync()
     {
         JsonSerializerOptions options = new JsonSerializerOptions
         {
@@ -34,7 +38,7 @@ public override void Execute()
         try
         {
             string path = $"{saveDirecty}/{arguments[0]}.json";
-            string content = File.ReadAllText(path);
+            string content = await File.ReadAllTextAsync(path);
 
             PokedexDto pokedexDto = JsonSerializer.Deserialize<PokedexDto>(content, options);
             Pokedex.LoadDto(pokedexDto);
@@ -47,5 +51,9 @@ public override void Execute()
         {
             Console.WriteLine("Fichier non trouvé");
         }
+        finally
+        {
+            Console.WriteLine("Finally");
+        }
     }
 }

PokedexS2/Pokedex/Commands/SaveCommand.cs

@@ -3,7 +3,7 @@ namespace Pokedex;
 // save <fichier>
 public class SaveCommand : Command
 {
-    string saveDirecty = "Data";
+    // string saveDirecty = "Data";
 
     public SaveCommand(Pokedex pokedex, string[] commandArguments)
         : base(pokedex, commandArguments)
@@ -16,32 +16,17 @@ public SaveCommand(Pokedex pokedex, string[] commandArguments)
 
     public override void Execute()
     {
-        // TODO: if valid
-        string path = AddExtension(arguments[0]);
-        path = $"{saveDirecty}/{path}";
-        Directory.CreateDirectory(saveDirecty);
-
-        StreamWriter streamWriter = new StreamWriter(path);
-
-        SavePokedex(streamWriter);
-        streamWriter.Flush();
-        streamWriter.Close();
-
-        Console.WriteLine($"Pokedex saved to file {path}");
-    }
-
-    void SavePokedex(StreamWriter file)
-    {
-        Pokedex.Save(file);
-    }
-
-    string AddExtension(string path)
-    {
-        if (!path.Contains("."))
+        /*
+        if (isValid)
         {
-            return $"{path}.csv";
+            IWriter writer = new TextWriter();
+            string path = $"{saveDirecty}/{arguments[0]}.txt";
+            writer.SaveFile(Pokedex, path);
         }
-
-        return path;
+        else
+        {
+            Console.WriteLine("Argument manquant.");
+        }
+        */
     }
 }

PokedexS2/Pokedex/Commands/SearchCommand.cs

@@ -20,11 +20,11 @@ public override void Execute()
             return;
         }
 
-        Pokemon pokemon = Pokedex.Get(arguments[0]);
+        ICollectible pokemon = Pokedex.Get(arguments[0]);
         if (pokemon != null)
         {
             Console.WriteLine($"Name: {pokemon.Name} ({pokemon.Id})");
-            Console.WriteLine($"Type: {pokemon.Type}");
+            //Console.WriteLine($"Type: {pokemon.Type}");
         }
         else
         {

PokedexS2/Pokedex/Commands/WriteJsonCommand.cs

@@ -1,6 +1,4 @@
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Unicode;
+using System.Threading.Tasks;
 
 namespace Pokedex;
 
@@ -12,25 +10,31 @@ public class WriteJsonCommand : Command
     public WriteJsonCommand(Pokedex pokedex, string[] commandArguments)
         : base(pokedex, commandArguments)
     {
+        if (commandArguments.Length != 1)
+        {
+            isValid = false;
+        }
     }
-
     public override void Execute()
     {
-        // Cette classe permet de configurer comment est écrit le fichier JSON
-        JsonSerializerOptions options = new JsonSerializerOptions
+        throw new NotImplementedException();
+    }
+
+    public async Task ExecuteAsync()
+    {
+        if (isValid)
         {
-            WriteIndented = true,
-            PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
-            // Le comporte par défault du sérialiseur est débile et échappe tous les caractères non ASCII
-            // par exemple Salamèche -> Salam\u00E8che. Pour éviter ça on utilise l'option qui suit
-            Encoder = JavaScriptEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.Latin1Supplement),
-        };
-
-        PokedexDto pokedexDto = Pokedex.ToDto();
-        string jsonString = JsonSerializer.Serialize(pokedexDto, options);
-        string path = $"{saveDirecty}/{arguments[0]}.json";
-        File.WriteAllText(path, jsonString);
-
-        Console.WriteLine("Fichier bien sauvegardé.");
+            IWriter writer = new JsonWriter();
+            string path = $"{saveDirecty}/{arguments[0]}.json";
+            await writer.SaveFileAsync(Pokedex, path);
+        }
+        else
+        {
+            Console.WriteLine("Argument manquant.");
+        }
     }
+
+    // TODO : faire une commande unique qui refactore WriteJsonCmd et SaveCmd
+    // qui contient private IWriter GetWriter(string format)
+    // (bonus: ajout xml)
 }

PokedexS2/Pokedex/ICollectible.cs

@@ -0,0 +1,9 @@
+namespace Pokedex;
+
+public interface ICollectible
+{
+    int Id { get; }
+    string Name { get; }
+    bool Discovered { get; }
+    void Discover();
+}

PokedexS2/Pokedex/Plant.cs

@@ -0,0 +1,21 @@
+namespace Pokedex;
+
+public class Plant : ICollectible
+{
+    public int Id { get; private set; }
+
+    public string Name { get; private set; }
+
+    public bool Discovered { get; private set; }
+
+    public Plant(int id, string name)
+    {
+        Id = id;
+        Name = name;
+    }
+
+    public void Discover()
+    {
+        Discovered = true;
+    }
+}