Patch release [v4.3.1.0]

- Greatly improved the bootstrapper, it now has a nice GUI that shows progress
- Improved the update checker
- Added some config safety features, this will prevent the config manager from breaking if the user inputs a '¶' or '\n' (these two characters are used as delimiters in the config manager)

Author: o7q

assets_raw/graphics/icons/checkmark.png

@@ -1,5 +1,7 @@
-~
-- Removed "by o7q" on the banners and logos (didn't like having my name on it because yt-dlp did most of the heavy lifting, and I didn't make yt-dlp)
+~ v4.3.1.0
+- Greatly improved the bootstrapper, it now has a nice GUI that shows progress
+- Improved the update checker
+- Added some config safety features, this will prevent the config manager from breaking if the user inputs a '¶' or '\n' (these two characters are used as delimiters in the config manager)
 
 ~ v4.3.0.0
 - Improved the progress bar for the queue system

assets_raw/graphics/icons/crossmark.png

@@ -0,0 +1,2 @@
+# Build folder
+BUILD

assets_raw/graphics/icons/loading_icon.gif

@@ -2,6 +2,4 @@
 rmdir ".vs" /s /q 2> nul
 rmdir "MediaDownloader\.vs" /s /q 2> nul
 rmdir "MediaDownloader\bin" /s /q 2> nul
-rmdir "MediaDownloader\obj" /s /q 2> nul
-rmdir "MediaDownloader\Build" /s /q 2> nul
-mkdir "MediaDownloader\Build/MediaDownloader" 2> nul
+rmdir "MediaDownloader\obj" /s /q 2> nul

changelog.txt

@@ -2,9 +2,10 @@
 using System.IO;
 using System.Windows.Forms;
 using System.Diagnostics;
+
 using MediaDownloader.Tools.CustomMessageBox;
+using MediaDownloader.Setup.BootstrapForm;
 using static MediaDownloader.Global;
-using static MediaDownloader.Setup.Bootstrapper;
 using static MediaDownloader.Tools.FolderCompressor;
 using static MediaDownloader.Updater.UpdaterSetup;
 using static MediaDownloader.Data.Config.ConfigManager;
@@ -27,43 +28,39 @@ static void Main()
                     return;
             }
 
-            // detect if redists exist
-            bool ytdlpCheck = true;
-            bool ffmpegCheck = true;
-            string redistText = "";
+            bool ytdlpMissing = false;
+            bool ffmpegMissing = false;
+
             if (!File.Exists("MediaDownloader\\redist\\yt-dlp\\yt-dlp.exe"))
+                ytdlpMissing = true;
+
+            if (
+                !File.Exists("MediaDownloader\\redist\\ffmpeg\\ffmpeg.exe") ||
+                !File.Exists("MediaDownloader\\redist\\ffmpeg\\ffprobe.exe")
+                )
             {
-                ytdlpCheck = false;
-                redistText += "\n- yt-dlp";
-            }
-            if (!File.Exists("MediaDownloader\\redist\\ffmpeg\\ffmpeg.exe") || !File.Exists("MediaDownloader\\redist\\ffmpeg\\ffprobe.exe"))
-            {
-                ffmpegCheck = false;
-                redistText += "\n- ffmpeg";
+                ffmpegMissing = true;
             }
 
-            if (!ytdlpCheck || !ffmpegCheck)
+            if (ytdlpMissing || ffmpegMissing)
             {
-                CustomMessageBox customMessageBox = new CustomMessageBox("MediaDownloader will download the following redist files:" + redistText + "\n\nPress OK to continue\nPress CLOSE to cancel", "OK", true);
-                customMessageBox.ShowDialog();
+                BootstrapForm bootstrapForm = new BootstrapForm(ytdlpMissing, ffmpegMissing);
+                bootstrapForm.ShowDialog();
 
-                if (customMessageBox.Result == DialogResult.Cancel)
-                    return;
+                if (bootstrapForm.Result == DialogResult.Cancel)
+                {
+                    Environment.Exit(0);
+                }
             }
 
-            if (!ytdlpCheck)
-                InstallYtdlp();
-            if (!ffmpegCheck)
-                InstallFFmpeg();
-
             InstallUpdater();
 
             if (File.Exists("MediaDownloader\\config\\config.cfg"))
                 CONFIG = ReadConfig("MediaDownloader\\config\\config.cfg");
             else
             {
                 CONFIG.NOTIFICATIONS_ENABLE = true;
-                CONFIG.DATA_ZIPPING_ENABLE = true;
+                CONFIG.DATA_ZIPPING_ENABLE = false;
                 CONFIG.TRUSTED_URLS = "youtube.com,youtu.be,twitter.com,instagram.com";
             }
 

src/.gitignore

@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Threading.Tasks;
 using System.Diagnostics;
+
 using MediaDownloader.Tools.CustomMessageBox;
 using static MediaDownloader.Global;
 using static MediaDownloader.Data.Config.ConfigManager;
@@ -80,7 +81,7 @@ private void Program_Load(object sender, EventArgs e)
             var newVersionAvailable = CheckForNewUpdate(VERSION_INTERNAL);
             if (newVersionAvailable.Item1 && CONFIG.NOTIFICATIONS_ENABLE && !VERSION_INTERNAL.Contains("dev"))
             {
-                VERSION_REMOTE = newVersionAvailable.Item2;
+                VERSION_INTERNAL_REMOTE = newVersionAvailable.Item2;
                 NotificationPictureBox.Visible = true;
                 NotificationLabel.Visible = true;
             }
@@ -112,19 +113,19 @@ private void Program_Load(object sender, EventArgs e)
                 "OutputTimeframeTrimFromStart", "Trim from the start",
                 "OutputTimeframeTrimToEnd", "Trim to the end",
 
-                "DownloadButton", "Download from the URL using the configured options",
+                "DownloadButton", "Download from the URL using the configured options (ctrl or shift click if it gets stuck)",
 
                 "OutputChangeLocationButton", "Change the folder location for download",
                 "OutputOpenLocationButton", "Open the selected download location in the file explorer",
                 "OutputClearLocationButton", "Reset the selected download location",
                 "OutputLocationTextBox", "Currently selected download location",
 
                 "OutputResizeCheckBox", "Enable resizing for video",
-                "OutputResizeWidthTextBox", "Width for video",
-                "OutputResizeHeightTextBox", "Height for video",
+                "OutputResizeWidthTextBox", "Width for video (this is fed into FFmpeg, meaning you can use math expressions - Examples: \"1920/2\" | \"1280*4\"",
+                "OutputResizeHeightTextBox", "Height for video (this is fed into FFmpeg, meaning you can use math expressions - Examples: \"1080/2\" | \"720*4\"",
 
                 "OutputFramerateCheckBox", "Enable framerate change for video",
-                "OutputFramerateTextBox", "Framerate for video",
+                "OutputFramerateTextBox", "Framerate for video (this is fed into FFmpeg, meaning you can use math expressions - Examples: \"60/2\" | \"30*4\"",
 
                 "OutputVideoBitrateTextBox", "Bitrate for video - Examples: \"100M\" | \"900K\" (M = MB/s, K = KB/s)",
                 "OutputAudioBitrateTextBox", "Bitrate for audio - Examples: \"320K\" | \"10K\" (M = MB/s, K = KB/s)",
@@ -1052,7 +1053,7 @@ private void RunUpdateDialog()
         {
             string changelog = ReadRemoteResource("https://raw.githubusercontent.com/o7q/MediaDownloader/main/remote/changelog");
 
-            CustomMessageBox customMessageBox = new CustomMessageBox("A newer version of MediaDownloader is available! (" + VERSION_REMOTE + ")\n\nChangelog:\n" + changelog + "\n\nWould you like to download/install it now?\n\nPress OK to continue\nPress CLOSE to cancel\n\n(you can disable this notification in the config)", "OK", true);
+            CustomMessageBox customMessageBox = new CustomMessageBox("A newer version of MediaDownloader is available! (" + VERSION_INTERNAL_REMOTE + ")\n\nChangelog:\n" + changelog + "\n\nWould you like to download/install it now?\n\nPress OK to continue\nPress CLOSE to cancel\n\n(you can disable this notification in the config)", "OK", true);
             customMessageBox.ShowDialog();
 
             if (customMessageBox.Result == DialogResult.OK)

src/MediaDownloader/Clean.bat

@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>Build\MediaDownloader\</OutputPath>
+    <OutputPath>..\..\BUILD\MediaDownloader\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>Build\MediaDownloader\</OutputPath>
+    <OutputPath>..\..\BUILD\MediaDownloader\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -58,6 +58,12 @@
     <Compile Include="Scripts\Data\QueueItem\QueueItemStructure.cs" />
     <Compile Include="Scripts\Media\Downloaders\BulkQueuer.cs" />
     <Compile Include="Scripts\Media\Downloaders\Queuer.cs" />
+    <Compile Include="Scripts\Setup\BootstrapForm\BootstrapForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Scripts\Setup\BootstrapForm\BootstrapForm.Designer.cs">
+      <DependentUpon>BootstrapForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Scripts\Tools\FolderCompressor.cs" />
     <Compile Include="Scripts\Data\Config\ConfigManager.cs" />
     <Compile Include="Scripts\Media\Converters\Converter.cs" />
@@ -81,6 +87,7 @@
     <Compile Include="Init.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Scripts\Tools\Shell.cs" />
+    <Compile Include="Scripts\Tools\Strings.cs" />
     <Compile Include="Updater\UpdateChecker.cs" />
     <Compile Include="Updater\ResourceReader.cs" />
     <Compile Include="Updater\UpdaterSetup.cs" />
@@ -92,6 +99,9 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Scripts\Setup\BootstrapForm\BootstrapForm.resx">
+      <DependentUpon>BootstrapForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Scripts\Tools\CustomMessageBox\CustomMessageBox.resx">
       <DependentUpon>CustomMessageBox.cs</DependentUpon>
     </EmbeddedResource>
@@ -123,6 +133,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="logo.ico" />
+    <None Include="Resources\loading_icon.gif" />
+    <None Include="Resources\checkmark.png" />
+    <None Include="Resources\crossmark.png" />
     <None Include="Resources\banner_hq.png" />
     <None Include="Resources\settings.png" />
     <None Include="Resources\notification.png" />