Change download API and remove unused parameter

Author: Meyn

UnitTest/DownloadTest.cs

@@ -1,6 +1,5 @@
 using DownloadAssistant.Request;
 using Requests;
-using System.Diagnostics;
 using WebsiteScraper.Downloadable.Books;
 using WebsiteScraper.WebsiteUtilities;
 
@@ -9,7 +8,7 @@ namespace UnitTest
     [TestClass]
     public class DownloadTest
     {
-        private string _pathToWebsite = @$"{Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.Parent.FullName}\Websites\mangaread.org.wsf";
+        private string _pathToWebsite = @$"{Directory.GetParent(Directory.GetCurrentDirectory())!.Parent!.Parent!.Parent!.FullName}\Websites\mangaread.org.wsf";
 
         private Website _mangaread = null!;
 
@@ -80,7 +79,7 @@ public async Task DownloadTestAsync()
             await _mangaread.GetStatusTask();
             Comic onePunch = new("https://www.mangaread.org/manga/one-punch-man-onepunchman/", "One Punch Man", _mangaread);
             await onePunch.UpdateAsync();
-            ProgressableContainer<LoadRequest> container = await onePunch.Chapter.First().DownloadAsync(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + @"\One Punch Man\1\");
+            ProgressableContainer<GetRequest> container = await onePunch.Chapter.First().DownloadAsync(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + @"\One Punch Man\1\");
             container.StateChanged += (s, e) => Console.WriteLine("State: " + e);
             await container.Task;
             Console.WriteLine("Downloaded");

WebsiteScraper/Downloadable/Books/Chapter.cs

@@ -32,20 +32,20 @@ public void SetOrder(int i)
 
         public Chapter(Comic holdingComic) => HoldingComic = holdingComic;
 
-        public Task<ProgressableContainer<LoadRequest>> DownloadAsync(string destination, string? tempDestination = null, CancellationToken? token = null, Action? finished = null)
+        public Task<ProgressableContainer<GetRequest>> DownloadAsync(string destination, CancellationToken? token = null)
         {
             if (!string.IsNullOrWhiteSpace(DownloadURL))
                 return DownloadImageFromFileAsync(token);
             if (GetValue("AddToListUrl") != null)
-                return DownloadImageListAsync(destination, tempDestination, token, finished);
+                return DownloadImageListAsync(destination, token);
             else if (GetValue("AddToPagedUrl") != null)
-                return DownloadImagePageAsync(destination, tempDestination, token, finished);
+                return DownloadImagePageAsync(destination, token);
             else throw new Exception("Can not donwload this object");
         }
 
-        private async Task<ProgressableContainer<LoadRequest>> DownloadImageListAsync(string destination, string? tempDestination, CancellationToken? token, Action? finished = null)
+        private async Task<ProgressableContainer<GetRequest>> DownloadImageListAsync(string destination, CancellationToken? token)
         {
-            ProgressableContainer<LoadRequest> container = new();
+            ProgressableContainer<GetRequest> container = new();
             await new OwnRequest(async DToken =>
             {
                 string? selector = GetValue("ListImageQuery");
@@ -63,11 +63,10 @@ private async Task<ProgressableContainer<LoadRequest>> DownloadImageListAsync(st
                 string[] imageLinks = selector.ParseAll(html);
 
                 for (int i = 0; i < imageLinks.Length; i++)
-                    container.Add(new LoadRequest(imageLinks[i], new()
+                    container.Add(new GetRequest(imageLinks[i], new()
                     {
                         IsDownload = true,
-                        DestinationPath = destination,
-                        TempDestination = tempDestination ?? string.Empty,
+                        DirectoryPath = destination,
                         CancellationToken = token,
                         Filename = $"{Order}_{i}.*",
                         Priority = RequestPriority.High,
@@ -83,9 +82,9 @@ private async Task<ProgressableContainer<LoadRequest>> DownloadImageListAsync(st
             return container;
         }
 
-        private async Task<ProgressableContainer<LoadRequest>> DownloadImagePageAsync(string destination, string? tempDestination, CancellationToken? token, Action? finished = null)
+        private async Task<ProgressableContainer<GetRequest>> DownloadImagePageAsync(string destination, CancellationToken? token)
         {
-            ProgressableContainer<LoadRequest> container = new();
+            ProgressableContainer<GetRequest> container = new();
             await new OwnRequest(async DToken =>
              {
                  bool stop = false;
@@ -106,12 +105,11 @@ private async Task<ProgressableContainer<LoadRequest>> DownloadImagePageAsync(st
                      res.Dispose();
                      if (string.IsNullOrWhiteSpace(imageLink))
                          break;
-                     container.Add(new LoadRequest(imageLink, new()
+                     container.Add(new GetRequest(imageLink, new()
                      {
                          IsDownload = true,
                          Priority = RequestPriority.High,
-                         DestinationPath = destination,
-                         TempDestination = tempDestination ?? string.Empty,
+                         DirectoryPath = destination,
                          CancellationToken = token,
                          Filename = $"{Order}_{i}.*",
                          RequestFailed = (request, path) => { Debug.WriteLine("Failed: " + path); }
@@ -129,7 +127,7 @@ private async Task<ProgressableContainer<LoadRequest>> DownloadImagePageAsync(st
             return container;
         }
 
-        private Task<ProgressableContainer<LoadRequest>> DownloadImageFromFileAsync(CancellationToken? token)
+        private Task<ProgressableContainer<GetRequest>> DownloadImageFromFileAsync(CancellationToken? token)
         {
             throw new NotImplementedException();
         }

WebsiteScraper/Downloadable/Books/Comic.cs

@@ -55,7 +55,9 @@ public static Comic CreateSearch(IElement html, Website website)
                 _isSearchObject = true,
                 HoldingWebsite = website
             };
-            comic.Chapter = new Chapter[] { new(comic) { Url = GetParsed(html, searchId?.GetValueOrDefault("LastChapter")) } };
+            string url = GetParsed(html, searchId?.GetValueOrDefault("LastChapter"));
+            if (!string.IsNullOrEmpty(url))
+                comic.Chapter = new Chapter[] { new(comic) { Url = url } };
             return comic;
         }
 

WebsiteScraper/WebsiteScraper.csproj

@@ -8,7 +8,7 @@
     <Title>WebsiteScraper</Title>
     <Authors>Meyn</Authors>
     <Company>Shard</Company>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <Description>WebsiteScraper is a powerful tool that allows you to effortlessly download your favorite comics and manga from various websites. 
 You can easily provide a JSON file containing the website links, and the scraper will do the rest. 
 Using the advanced parsing capabilities of Angelsharp and Regex, the tool efficiently extracts the desired content from the website and saves it onto your device for offline reading. 
@@ -22,6 +22,7 @@ With WebsiteScraper, you can enjoy your favorite comics and manga anytime, anywh
     <PackageTags>WebsiteScraper; Shard; Manga; Comic; JSON; Parser</PackageTags>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes>Change download API and remove unused parameter</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>