Merge pull request #107 from yairp03/dev

Added a proper way to quit the app
yairp03 · Oct 2, 2022 · 3a2c502 · 3a2c502
2 parents 20e3ac8 + 8b7eeb6
commit 3a2c502
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/HoradotTV.Console/IOHelpers.cs b/HoradotTV.Console/IOHelpers.cs
@@ -41,8 +41,8 @@ public static string ChooseOption(IEnumerable<string> options, string type = "op
         do
         {
             Print($"\nAvailable {type}s: " + string.Join(", ", options));
-            option = Input($"{title}: ");
-            if (options.Contains(option))
+            option = Input($"{title} (c - cancel): ");
+            if (option == "c" || options.Contains(option))
                 return option;
             Print($"Please enter an valid {type}.");
         } while (true);

diff --git a/HoradotTV.Console/Program.cs b/HoradotTV.Console/Program.cs
@@ -47,20 +47,26 @@ static async Task Main()
             }
 
             var season = await GetSeason(driver, series);
+            if (season is null)
+                continue;
             if (mode == Modes.Season)
             {
                 await DownloadSeason(driver, season, downloadLocation);
                 continue;
             }
 
             var episode = await GetEpisode(driver, season);
+            if (episode is null)
+                continue;
             if (mode == Modes.Episode)
             {
                 await DownloadEpisode(driver, episode, downloadLocation);
                 continue;
             }
 
             var episodesAmount = GetEpisodesAmount();
+            if (episodesAmount == 0)
+                continue;
             await DownloadEpisodes(driver, episode, episodesAmount, downloadLocation);
         }
     }
@@ -70,7 +76,9 @@ static async Task Main()
         var searchResult = new List<SeriesInformation>();
         do
         {
-            var query = IOHelpers.Input("\nEnter series name or part of it: ");
+            var query = IOHelpers.Input("\nEnter series name or part of it (q - quit): ");
+            if (query == "q")
+                Environment.Exit(0);
             if (query.Length < Constants.QUERY_MIN_LENGTH)
             {
                 IOHelpers.Print($"Please enter at least {Constants.QUERY_MIN_LENGTH} characters.");
@@ -132,25 +140,29 @@ static Modes GetMode()
         return (Modes)IOHelpers.ChooseOptionRange(Enum.GetNames(typeof(Modes)).Length - 1, "Choose a mode");
     }
 
-    static async Task<SeasonInformation> GetSeason(SdarotDriver driver, SeriesInformation series)
+    static async Task<SeasonInformation?> GetSeason(SdarotDriver driver, SeriesInformation series)
     {
         var seasons = await driver.GetSeasonsAsync(series);
         var seasonName = IOHelpers.ChooseOption(seasons.Select(s => s.SeasonName), "season", "Choose a season");
+        if (seasonName == "c")
+            return null;
         var season = seasons.Where(s => s.SeasonName == seasonName).First();
         return season;
     }
-    static async Task<EpisodeInformation> GetEpisode(SdarotDriver driver, SeasonInformation season)
+    static async Task<EpisodeInformation?> GetEpisode(SdarotDriver driver, SeasonInformation season)
     {
         var episodes = await driver.GetEpisodesAsync(season);
         var episodeName = IOHelpers.ChooseOption(episodes.Select(e => e.EpisodeName), "episode", "Choose an episode");
+        if (episodeName == "c")
+            return null;
         var episode = episodes.Where(e => e.EpisodeName == episodeName).First();
         return episode;
     }
 
     static int GetEpisodesAmount()
     {
-        var amount = IOHelpers.InputInt("\nEnter episodes amount: ");
-        while (amount <= 0)
+        var amount = IOHelpers.InputInt("\nEnter episodes amount (0 - cancel): ");
+        while (amount < 0)
         {
             IOHelpers.Print("Please enter a positive amount.");
             amount = IOHelpers.InputInt("Enter episodes amount: ");