Post download verification for wistia and generic downloads. Generic …

…downloads now send a head request to get the content length so a duplicates filesize can be compared and the download verified
Pseudorizer · Jun 15, 2019 · a56e44e · a56e44e
1 parent 399c03c
commit a56e44e
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 13 deletions.
diff --git a/codeWithMoshDownloader/codeWithMoshDownloader/Downloader.cs b/codeWithMoshDownloader/codeWithMoshDownloader/Downloader.cs
@@ -7,6 +7,7 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using static codeWithMoshDownloader.Helpers;
@@ -197,17 +198,21 @@ private async Task<bool> DownloadFile(GenericFile downloadInfo, string sectionPa
 
             Console.WriteLine($"[download] Downloading {downloadInfo.FileName}");
 
+            HttpResponseMessage fileHeadRequest = await SimpleHead(downloadInfo.Url);
+
+            var downloadSize = fileHeadRequest.Content.Headers.ContentLength;
+
             string filePath = Path.Combine(sectionPath, downloadInfo.FileName);
 
-            if (File.Exists(filePath) && !_force)
+            if (FileExists(filePath, downloadSize))
             {
-
-                Console.WriteLine("[download] File already exists");
                 return true;
             }
 
             bool result = await DownloadClient(downloadInfo.Url, filePath);
 
+            result = VerifyDownload(result, filePath, downloadSize);
+
             if (result && _unZip && Path.GetExtension(downloadInfo.FileName) == ".zip")
             {
                 UnZipArchive(sectionPath, filePath);
@@ -216,6 +221,42 @@ private async Task<bool> DownloadFile(GenericFile downloadInfo, string sectionPa
             return result;
         }
 
+        private static bool VerifyDownload(bool result, string filePath, long? downloadSize)
+        {
+            if (result)
+            {
+                long fileSize = new FileInfo(filePath).Length;
+
+                if (downloadSize != fileSize)
+                {
+                    Console.WriteLine("[download] Download failed\n");
+                    result = false;
+                }
+                else
+                {
+                    Console.Write("[download] Download complete\n");
+                }
+            }
+
+            return result;
+        }
+
+        private bool FileExists(string filePath, long? downloadSize)
+        {
+            if (File.Exists(filePath) && !_force)
+            {
+                long fileSize = new FileInfo(filePath).Length;
+
+                if (downloadSize == fileSize)
+                {
+                    Console.WriteLine("[download] File already exists");
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private void UnZipArchive(string sectionPath, string filePath)
         {
             Console.WriteLine("[download] Unzipping archive");
@@ -282,20 +323,18 @@ private async Task<bool> DownloadFile(WistiaDownloadInfo wistiaDownloadInfo, str
             wistiaDownloadInfo.FileName = AddIndex(wistiaDownloadInfo.FileName, _currentItemIndex).GetSafeFilename();
             string filePath = Path.Combine(sectionPath, wistiaDownloadInfo.FileName);
 
-            if (File.Exists(filePath) && !_force)
+            if (FileExists(filePath, wistiaDownloadInfo.FileSize))
             {
-                long fileSize = new FileInfo(filePath).Length;
-
-                if (fileSize == wistiaDownloadInfo.FileSize)
-                {
-                    Console.WriteLine("[download] File already exists");
-                    return true;
-                }
+                return true;
             }
 
             Console.WriteLine($"[download] Downloading {wistiaDownloadInfo.FileName}");
 
-            return await DownloadClient(wistiaDownloadInfo.Url, filePath);
+            bool result = await DownloadClient(wistiaDownloadInfo.Url, filePath);
+
+            result = VerifyDownload(result, filePath, wistiaDownloadInfo.FileSize);
+
+            return result;
         }
 
         private async Task<bool> DownloadClient(string url, string filepath)
@@ -316,7 +355,6 @@ private async Task<bool> DownloadClient(string url, string filepath)
                     else if (!args.Cancelled)
                     {
                         result = true;
-                        Console.Write("[download] Download complete\n");
                     }
                     else
                     {

diff --git a/codeWithMoshDownloader/codeWithMoshDownloader/Helpers.cs b/codeWithMoshDownloader/codeWithMoshDownloader/Helpers.cs
@@ -25,6 +25,17 @@ public static async Task<string> SimpleGet(string url)
             }
         }
 
+        public static async Task<HttpResponseMessage> SimpleHead(string url)
+        {
+            using (var request = new HttpRequestMessage(HttpMethod.Head, url))
+            {
+                using (HttpResponseMessage response = await HttpClient.SendAsync(request))
+                {
+                    return response;
+                }
+            }
+        }
+
         public static string GetSafeFilename(this string filename)
         {
             return string.Join("_", filename.Split(Path.GetInvalidFileNameChars()));