fixed crash when downloading ffmpeg due to zeranoe being offline

MilchRatchet · Oct 3, 2020 · 367e998 · 367e998
1 parent 26d0a9a
commit 367e998
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/SubBox/Models/Downloader.cs b/SubBox/Models/Downloader.cs
@@ -13,6 +13,7 @@ namespace SubBox.Models
 {
     public class Downloader
     {
+
         public static void DownloadFiles()
         {
             try
@@ -66,10 +67,22 @@ public static void DownloadFiles()
                         }
                     };
 
-                    client.DownloadFileAsync(new Uri("https://youtube-dl.org/downloads/latest/youtube-dl.exe"), "youtube-dl.exe");
+                    try
+                    {
+                        client.DownloadFile(new Uri("https://youtube-dl.org/downloads/latest/youtube-dl.exe"), "youtube-dl.exe");
+                    }
+                    catch (Exception m)
+                    {
+                        Logger.Info("Failed downloading youtube-dl");
+
+                        Logger.Info("Please open an issue on Github if this issue persists");
+
+                        Logger.Error(m.Message);
+                    }
                 }
 
-                if (!ffmpeg)
+                //ffmpeg is to be included in releases until a stable download option is found now that zeranoe is no more
+                /*if (!ffmpeg)
                 {
                     Logger.Info("ffmpeg.exe not found");
 
@@ -134,8 +147,19 @@ public static void DownloadFiles()
                         }
                     };
 
-                    client.DownloadFileAsync(new Uri("https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.2.1-win64-static.zip"), "ffmpeg.zip");
-                }
+                    try
+                    {
+                        client.DownloadFile(new Uri("https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip"), "ffmpeg.zip");
+                    }
+                    catch (Exception m)
+                    {
+                        Logger.Info("Failed downloading ffmpeg");
+
+                        Logger.Info("Please open an issue on Github if this issue persists");
+
+                        Logger.Error(m.Message);
+                    }
+                }*/
             }
             catch (Exception e)
             {

diff --git a/SubBox/Startup.cs b/SubBox/Startup.cs
@@ -74,10 +74,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             Logger.Info("SubBox Build v"+ BuildVersion + " - " + BuildTime.Day + "." + BuildTime.Month + "." + BuildTime.Year);
 
-            AppSettings.DownloadReady = false;
-
-            Downloader.DownloadFiles();
-
             //load settings
             try
             {
@@ -143,12 +139,16 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             AppSettings.SetFirstUse();
 
+            AppSettings.DownloadReady = false;
+
+            Downloader.DownloadFiles();
+
             if (AppSettings.LastRefresh.DayOfYear != DateTime.Now.DayOfYear || AppSettings.PicOfTheDayLink == "")
             {
                 Downloader.GetPictureOfTheDay();
             }
 
-            if (AppSettings.UpdateYDL)
+            if (AppSettings.UpdateYDL && AppSettings.DownloadReady)
             {
                 string path = Directory.GetCurrentDirectory() + @"\youtube-dl.exe";