From 9293351b77dc150fc93a8dab4d3cb1bf478461a5 Mon Sep 17 00:00:00 2001 From: matt <18199813engirugger42@users.noreply.github.com> Date: Sat, 30 Mar 2024 12:49:34 +0100 Subject: [PATCH] Fixing some warnings and removing extraneous required args. --- MyArgs.cs | 14 +++++++------- Program.cs | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/MyArgs.cs b/MyArgs.cs index d841695..334ded9 100644 --- a/MyArgs.cs +++ b/MyArgs.cs @@ -5,19 +5,19 @@ namespace SBT_Downloader [TabCompletion] public class MyArgs { - [ArgRequired(PromptIfMissing = false), ArgShortcut("-a")] - public string Author { get; set; } + [ArgShortcut("-a")] + public string? Author { get; set; } [ArgRequired(PromptIfMissing = true), ArgShortcut("-h")] public string Har { get; set; } - [ArgRequired(PromptIfMissing = false), ArgShortcut("-n")] - public string Narrator { get; set; } + [ArgShortcut("-n")] + public string? Narrator { get; set; } - [ArgRequired(PromptIfMissing = true), ArgShortcut("-t")] - public string Title { get; set; } + [ArgShortcut("-t")] + public string? Title { get; set; } [ArgShortcut("-s")] - public string Series { get; set; } + public string? Series { get; set; } } } \ No newline at end of file diff --git a/Program.cs b/Program.cs index 36dcbdd..4b2b970 100644 --- a/Program.cs +++ b/Program.cs @@ -1,7 +1,6 @@ using PowerArgs; using Newtonsoft.Json.Linq; using System.Net; -using System; namespace SBT_Downloader { @@ -12,7 +11,7 @@ namespace SBT_Downloader Console.WriteLine("Welcome to the Sound Booth Theater Personal Archiving Tool!"); try { - var parsed = Args.Parse(args); + MyArgs parsed = Args.Parse(args); Console.WriteLine("Downloading book now..."); (List mp3Urls, List chapters) = ParseHar(parsed.Har); DownloadMp3s(mp3Urls, chapters, parsed); @@ -30,7 +29,7 @@ namespace SBT_Downloader { string harContents = LoadHar(har); JObject harObject = JObject.Parse(harContents); - List requestObjects = ParseRequests(harObject); + List requestObjects = ParseRequests(harObject); List mp3Urls = ParseUrls(requestObjects); List chapters = ParseChapters(mp3Urls); return (mp3Urls, chapters); @@ -107,7 +106,7 @@ namespace SBT_Downloader var file = TagLib.File.Create($"{chapterNumber} {chapterName}.mp3"); file.Tag.Album = arguments.Title.IsNullOrEmpty() ? string.Empty : arguments.Title; - List artistsList = new List(); + List artistsList = new(); if (!arguments.Author.IsNullOrEmpty()) artistsList.Add(arguments.Author); if (!arguments.Narrator.IsNullOrEmpty()) artistsList.Add(arguments.Narrator); file.Tag.AlbumArtists = artistsList.ToArray();