Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2025-12-14 15:37:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TryDeleteIfExistsAsync, fixed Settings rendering, remove legacy stuff

Browse Source
This commit is contained in:
N00MKRAD
2024-09-25 14:08:26 +02:00
parent 61a65d592f
commit f40896c12b
13 changed files with 99 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CodeLegacy/Data/Implementations.cs
View File

@@ -9,8 +9,8 @@ namespace Flowframes.Data
public enum Ai
{
RifeCuda,
RifeNcnn,
RifeNcnnVs,
RifeNcnn,
FlavrCuda,
DainNcnn,
XvfiCuda,
@@ -85,8 +85,8 @@ namespace Flowframes.Data
private static readonly Dictionary<Ai, AiInfo> AiLookup = new Dictionary<Ai, AiInfo>
{
{ Ai.RifeCuda, rifeCuda },
{ Ai.RifeNcnn, rifeNcnn },
{ Ai.RifeNcnnVs, rifeNcnnVs },
{ Ai.RifeNcnn, rifeNcnn },
{ Ai.FlavrCuda, flavrCuda },
{ Ai.DainNcnn, dainNcnn },
{ Ai.XvfiCuda, xvfiCuda },

45
CodeLegacy/Flowframes.csproj
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props" Condition="Exists('packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props')" />
<Import Project="packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props" Condition="Exists('packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props')" />
<Import Project="packages\ILRepack.2.0.34\build\ILRepack.props" Condition="Exists('packages\ILRepack.2.0.34\build\ILRepack.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -87,9 +88,6 @@
<Reference Include="CircularProgressBar, Version=2.8.0.16, Culture=neutral, PublicKeyToken=310fd07b25df79b3, processorArchitecture=MSIL">
<HintPath>packages\CircularProgressBar.2.8.0.16\lib\net40\CircularProgressBar.dll</HintPath>
</Reference>
<Reference Include="Costura, Version=5.8.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>packages\Costura.Fody.5.8.0-alpha0098\lib\netstandard1.0\Costura.dll</HintPath>
</Reference>
<Reference Include="Crc32.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=dc0b95cf99bf4e99, processorArchitecture=MSIL">
<HintPath>packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll</HintPath>
</Reference>
@@ -106,13 +104,23 @@
<Reference Include="HTAlt.Standart, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\HTAlt.Standart.0.1.6\lib\netstandard2.0\HTAlt.Standart.dll</HintPath>
</Reference>
<Reference Include="Magick.NET-Q8-AnyCPU, Version=13.10.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>packages\Magick.NET-Q8-AnyCPU.13.10.0\lib\netstandard20\Magick.NET-Q8-AnyCPU.dll</HintPath>
<Reference Include="Magick.NET-Q8-x64, Version=13.10.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
<HintPath>packages\Magick.NET-Q8-x64.13.10.0\lib\netstandard20\Magick.NET-Q8-x64.dll</HintPath>
</Reference>
<Reference Include="Magick.NET.Core, Version=13.10.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>packages\Magick.NET.Core.13.10.0\lib\netstandard20\Magick.NET.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Build.Framework.15.9.20\lib\net46\Microsoft.Build.Framework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Build.Utilities.Core.15.9.20\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.16.30\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
<Private>True</Private>
@@ -150,7 +158,11 @@
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
<Private>True</Private>
@@ -579,6 +591,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="FlowframesLogo2021.ico" />
<None Include="Resources\baseline_restart_alt_white_48dp_40px.png" />
<None Include="Resources\baseline_settings_white_48dp_40px.png" />
<None Include="Resources\baseline_queue_white_48dp_40px.png" />
<None Include="Resources\baseline_system_update_alt_white_48dp_40px.png" />
@@ -626,13 +639,19 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('packages\Fody.6.8.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.8.1\build\Fody.targets'))" />
<Error Condition="!Exists('packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props'))" />
<Error Condition="!Exists('packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets'))" />
<Error Condition="!Exists('packages\Magick.NET-Q8-AnyCPU.13.10.0\build\netstandard20\Magick.NET-Q8-AnyCPU.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Magick.NET-Q8-AnyCPU.13.10.0\build\netstandard20\Magick.NET-Q8-AnyCPU.targets'))" />
<Error Condition="!Exists('packages\ILRepack.2.0.34\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.2.0.34\build\ILRepack.props'))" />
<Error Condition="!Exists('packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props'))" />
<Error Condition="!Exists('packages\Magick.NET-Q8-x64.13.10.0\build\netstandard20\Magick.NET-Q8-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Magick.NET-Q8-x64.13.10.0\build\netstandard20\Magick.NET-Q8-x64.targets'))" />
</Target>
<Target Name="ILRepack" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
<PropertyGroup>
<WorkingDirectory>$(MSBuildThisFileDirectory)bin\x64\Release</WorkingDirectory>
</PropertyGroup>
<ItemGroup>
<RepackAssemblies Include="$(WorkingDirectory)\*.dll" Exclude="$(WorkingDirectory)\*Native*.dll" />
</ItemGroup>
<ILRepack OutputType="$(OutputType)" MainAssembly="$(AssemblyName).exe" OutputAssembly="$(AssemblyName).exe" InputAssemblies="@(RepackAssemblies)" WilcardInputAssemblies="true" WorkingDirectory="$(WorkingDirectory)" />
</Target>
<Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="packages\Fody.6.8.1\build\Fody.targets" Condition="Exists('packages\Fody.6.8.1\build\Fody.targets')" />
<Import Project="packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets')" />
<Import Project="packages\Magick.NET-Q8-AnyCPU.13.10.0\build\netstandard20\Magick.NET-Q8-AnyCPU.targets" Condition="Exists('packages\Magick.NET-Q8-AnyCPU.13.10.0\build\netstandard20\Magick.NET-Q8-AnyCPU.targets')" />
<Import Project="packages\Magick.NET-Q8-x64.13.10.0\build\netstandard20\Magick.NET-Q8-x64.targets" Condition="Exists('packages\Magick.NET-Q8-x64.13.10.0\build\netstandard20\Magick.NET-Q8-x64.targets')" />
</Project>

53
CodeLegacy/Forms/SettingsForm.Designer.cs generated
View File

@@ -38,9 +38,6 @@
this.custOutDir = new System.Windows.Forms.TextBox();
this.outFolderLoc = new System.Windows.Forms.ComboBox();
this.label78 = new System.Windows.Forms.Label();
this.label77 = new System.Windows.Forms.Label();
this.disablePreview = new System.Windows.Forms.CheckBox();
this.label76 = new System.Windows.Forms.Label();
this.modelDownloaderBtn = new HTAlt.WinForms.HTButton();
this.exportNamePatternLoop = new System.Windows.Forms.TextBox();
this.label69 = new System.Windows.Forms.Label();
@@ -191,6 +188,7 @@
this.settingsTabList.Name = "settingsTabList";
this.settingsTabList.Size = new System.Drawing.Size(920, 427);
this.settingsTabList.TabIndex = 0;
this.settingsTabList.SelectedIndexChanged += new System.EventHandler(this.settingsTabList_SelectedIndexChanged);
//
// generalTab
//
@@ -201,9 +199,6 @@
this.generalTab.Controls.Add(this.custOutDir);
this.generalTab.Controls.Add(this.outFolderLoc);
this.generalTab.Controls.Add(this.label78);
this.generalTab.Controls.Add(this.label77);
this.generalTab.Controls.Add(this.disablePreview);
this.generalTab.Controls.Add(this.label76);
this.generalTab.Controls.Add(this.modelDownloaderBtn);
this.generalTab.Controls.Add(this.exportNamePatternLoop);
this.generalTab.Controls.Add(this.label69);
@@ -236,7 +231,7 @@
this.btnResetHwEnc.FlatAppearance.BorderSize = 0;
this.btnResetHwEnc.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetHwEnc.ForeColor = System.Drawing.Color.White;
this.btnResetHwEnc.Location = new System.Drawing.Point(280, 245);
this.btnResetHwEnc.Location = new System.Drawing.Point(280, 215);
this.btnResetHwEnc.Name = "btnResetHwEnc";
this.btnResetHwEnc.Size = new System.Drawing.Size(206, 23);
this.btnResetHwEnc.TabIndex = 95;
@@ -247,7 +242,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(10, 250);
this.label10.Location = new System.Drawing.Point(10, 220);
this.label10.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(186, 13);
@@ -303,43 +298,13 @@
this.label78.TabIndex = 90;
this.label78.Text = "Default Output Location";
//
// label77
//
this.label77.AutoSize = true;
this.label77.ForeColor = System.Drawing.Color.Silver;
this.label77.Location = new System.Drawing.Point(308, 190);
this.label77.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label77.Name = "label77";
this.label77.Size = new System.Drawing.Size(270, 13);
this.label77.TabIndex = 89;
this.label77.Text = "You need to restart the application to apply this change.";
//
// disablePreview
//
this.disablePreview.AutoSize = true;
this.disablePreview.Location = new System.Drawing.Point(280, 190);
this.disablePreview.Name = "disablePreview";
this.disablePreview.Size = new System.Drawing.Size(15, 14);
this.disablePreview.TabIndex = 88;
this.disablePreview.UseVisualStyleBackColor = true;
//
// label76
//
this.label76.AutoSize = true;
this.label76.Location = new System.Drawing.Point(10, 190);
this.label76.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label76.Name = "label76";
this.label76.Size = new System.Drawing.Size(105, 13);
this.label76.TabIndex = 87;
this.label76.Text = "Disable Preview Tab";
//
// modelDownloaderBtn
//
this.modelDownloaderBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.modelDownloaderBtn.FlatAppearance.BorderSize = 0;
this.modelDownloaderBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.modelDownloaderBtn.ForeColor = System.Drawing.Color.White;
this.modelDownloaderBtn.Location = new System.Drawing.Point(492, 215);
this.modelDownloaderBtn.Location = new System.Drawing.Point(492, 185);
this.modelDownloaderBtn.Name = "modelDownloaderBtn";
this.modelDownloaderBtn.Size = new System.Drawing.Size(206, 23);
this.modelDownloaderBtn.TabIndex = 86;
@@ -414,7 +379,7 @@
this.clearModelCacheBtn.FlatAppearance.BorderSize = 0;
this.clearModelCacheBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.clearModelCacheBtn.ForeColor = System.Drawing.Color.White;
this.clearModelCacheBtn.Location = new System.Drawing.Point(280, 215);
this.clearModelCacheBtn.Location = new System.Drawing.Point(280, 185);
this.clearModelCacheBtn.Name = "clearModelCacheBtn";
this.clearModelCacheBtn.Size = new System.Drawing.Size(206, 23);
this.clearModelCacheBtn.TabIndex = 79;
@@ -425,7 +390,7 @@
// label64
//
this.label64.AutoSize = true;
this.label64.Location = new System.Drawing.Point(10, 220);
this.label64.Location = new System.Drawing.Point(10, 190);
this.label64.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label64.Name = "label64";
this.label64.Size = new System.Drawing.Size(165, 13);
@@ -1788,13 +1753,12 @@
// resetBtn
//
this.resetBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.resetBtn.ButtonImage = global::Flowframes.Properties.Resources.baseline_restart_alt_white_48dp;
this.resetBtn.ButtonImage = global::Flowframes.Properties.Resources.baseline_restart_alt_white_48dp_40px;
this.resetBtn.DrawImage = true;
this.resetBtn.FlatAppearance.BorderSize = 0;
this.resetBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.resetBtn.ForeColor = System.Drawing.Color.White;
this.resetBtn.ImageIndex = 0;
this.resetBtn.ImageSizeMode = HTAlt.WinForms.HTButton.ButtonImageSizeMode.Zoom;
this.resetBtn.Location = new System.Drawing.Point(889, 12);
this.resetBtn.Name = "resetBtn";
this.resetBtn.Size = new System.Drawing.Size(40, 40);
@@ -1964,9 +1928,6 @@
private System.Windows.Forms.Label label58;
private System.Windows.Forms.Panel autoEncBlockPanel;
private HTAlt.WinForms.HTButton resetBtn;
private System.Windows.Forms.CheckBox disablePreview;
private System.Windows.Forms.Label label76;
private System.Windows.Forms.Label label77;
private HTAlt.WinForms.HTButton custOutDirBrowseBtn;
private System.Windows.Forms.TextBox custOutDir;
private System.Windows.Forms.ComboBox outFolderLoc;

14
CodeLegacy/Forms/SettingsForm.cs
View File

@@ -87,7 +87,6 @@ namespace Flowframes.Forms
ConfigParser.SaveGuiElement(keepTempFolder);
ConfigParser.SaveGuiElement(exportNamePattern);
ConfigParser.SaveGuiElement(exportNamePatternLoop);
ConfigParser.SaveGuiElement(disablePreview);
// Interpolation
ConfigParser.SaveGuiElement(keepAudio);
ConfigParser.SaveGuiElement(keepSubs);
@@ -134,7 +133,6 @@ namespace Flowframes.Forms
ConfigParser.LoadGuiElement(keepTempFolder);
ConfigParser.LoadGuiElement(exportNamePattern);
ConfigParser.LoadGuiElement(exportNamePatternLoop);
ConfigParser.LoadGuiElement(disablePreview);
// Interpolation
ConfigParser.LoadGuiElement(keepAudio);
ConfigParser.LoadGuiElement(keepSubs);
@@ -250,5 +248,17 @@ namespace Flowframes.Forms
Close();
Program.mainForm.ResetOutputUi();
}
private bool _sizeFixApplied = false;
private void settingsTabList_SelectedIndexChanged(object sender, EventArgs e)
{
if (!_sizeFixApplied)
{
Size = new Size(Width + 1, Height + 1);
Size = new Size(Width - 1, Height - 1);
_sizeFixApplied = true;
}
}
}
}

8
CodeLegacy/Forms/SettingsForm.resx
View File

@@ -117,6 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="pictureBox2.ToolTip" xml:space="preserve">
<value>If this is enabled together with Auto-Encode, a backup video will be created from already encoded chunks, after each chunk has finished encoding.
This causes a minimal CPU load but requires lots of storage bandwidth - It's only recommended to use this on SSDs for longer videos.</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -135,10 +139,6 @@
The loop suffix gets added if the output gets looped. You can use the following placeholders:
[LOOPS] for how many times it was looped
[PLAYS] for how many times it plays (includes first play, so it's LOOPS+1)</value>
</data>
<data name="pictureBox2.ToolTip" xml:space="preserve">
<value>If this is enabled together with Auto-Encode, a backup video will be created from already encoded chunks, after each chunk has finished encoding.
This causes a minimal CPU load but requires lots of storage bandwidth - It's only recommended to use this on SSDs for longer videos.</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

9
CodeLegacy/IO/IoUtils.cs
View File

@@ -436,8 +436,8 @@ namespace Flowframes.IO
}
path = renamedPath;
return await TryDeleteIfExistsAsync(path);
TryDeleteIfExists(path);
return true;
}
catch (Exception e)
{
@@ -446,8 +446,7 @@ namespace Flowframes.IO
if (retries > 0)
{
await Task.Delay(2000);
retries -= 1;
return await TryDeleteIfExistsAsync(path, retries);
return await TryDeleteIfExistsAsync(path, retries - 1);
}
else
{
@@ -459,7 +458,7 @@ namespace Flowframes.IO
/// <summary>
/// Delete a path if it exists. Works for files and directories. Returns success status.
/// </summary>
public static bool TryDeleteIfExists(string path) // Returns true if no exception occurs
public static bool TryDeleteIfExists(string path) // Returns true if no exception occurs
{
try
{

24
CodeLegacy/Main/Interpolate.cs
View File

@@ -122,7 +122,7 @@ namespace Flowframes
if (Config.GetBool(Config.Key.scnDetect) && !currentSettings.ai.Piped)
{
Program.mainForm.SetStatus("Extracting scenes from video...");
await FfmpegExtract.ExtractSceneChanges(currentSettings.inPath, Path.Combine(currentSettings.tempFolder, Paths.scenesDir), currentSettings.inFpsDetected, currentSettings.inputIsFrames, currentSettings.framesExt);
await FfmpegExtract.ExtractSceneChanges(currentSettings.inPath, Path.Combine(currentSettings.tempFolder, Paths.scenesDir), new Fraction(), currentSettings.inputIsFrames, currentSettings.framesExt);
}
if (!currentSettings.inputIsFrames) // Extract if input is video, import if image sequence
@@ -272,17 +272,19 @@ namespace Flowframes
if (!currentSettings.stepByStep && !Config.GetBool(Config.Key.keepTempFolder))
{
if (!BatchProcessing.busy && IoUtils.GetAmountOfFiles(Path.Combine(currentSettings.tempFolder, Paths.resumeDir), true) > 0)
{
DialogResult dialogResult = UiUtils.ShowMessageBox($"Delete the temp folder (Yes) or keep it for resuming later (No)?", "Delete temporary files?", MessageBoxButtons.YesNo);
Task.Run(async () => { await IoUtils.TryDeleteIfExistsAsync(currentSettings.tempFolder); });
if (dialogResult == DialogResult.Yes)
Task.Run(async () => { await IoUtils.TryDeleteIfExistsAsync(currentSettings.tempFolder); });
}
else
{
Task.Run(async () => { await IoUtils.TryDeleteIfExistsAsync(currentSettings.tempFolder); });
}
// if (!BatchProcessing.busy && IoUtils.GetAmountOfFiles(Path.Combine(currentSettings.tempFolder, Paths.resumeDir), true) > 0)
// {
// DialogResult dialogResult = UiUtils.ShowMessageBox($"Delete the temp folder (Yes) or keep it for resuming later (No)?", "Delete temporary files?", MessageBoxButtons.YesNo);
//
// if (dialogResult == DialogResult.Yes)
// Task.Run(async () => { await IoUtils.TryDeleteIfExistsAsync(currentSettings.tempFolder); });
// }
// else
// {
// Task.Run(async () => { await IoUtils.TryDeleteIfExistsAsync(currentSettings.tempFolder); });
// }
}
AutoEncode.busy = false;

4
CodeLegacy/Program.cs
View File

@@ -127,7 +127,9 @@ namespace Flowframes
}
IoUtils.GetFilesSorted(Paths.GetPkgPath(), false, "*.log*").ToList().ForEach(x => IoUtils.TryDeleteIfExists(x));
IoUtils.GetFilesSorted(Path.Combine(Environment.ExpandEnvironmentVariables("%LOCALAPPDATA%"), "CrashDumps"), false, "rife*.exe.*.dmp").ToList().ForEach(x => IoUtils.TryDeleteIfExists(x));
string crashDumpsDir = Path.Combine(Environment.ExpandEnvironmentVariables("%LOCALAPPDATA%"), "CrashDumps");
IoUtils.GetFilesSorted(crashDumpsDir, false, "rife*.exe.*.dmp").ToList().ForEach(x => IoUtils.TryDeleteIfExists(x));
IoUtils.GetFilesSorted(crashDumpsDir, false, "flowframes*.exe.*.dmp").ToList().ForEach(x => IoUtils.TryDeleteIfExists(x));
}
catch (Exception e)
{

10
CodeLegacy/Properties/Resources.Designer.cs generated
View File

@@ -210,6 +210,16 @@ namespace Flowframes.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap baseline_restart_alt_white_48dp_40px {
get {
object obj = ResourceManager.GetObject("baseline_restart_alt_white_48dp_40px", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

7
CodeLegacy/Properties/Resources.resx
View File

@@ -184,6 +184,9 @@
<data name="baseline_queue_white_48dp_40px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\baseline_queue_white_48dp_40px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="baseline_settings_white_48dp_40px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\baseline_settings_white_48dp_40px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="baseline_restart_alt_white_48dp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\baseline_restart_alt_white_48dp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -220,7 +223,7 @@
<data name="baseline_system_update_alt_white_48dp_40px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\baseline_system_update_alt_white_48dp_40px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="baseline_settings_white_48dp_40px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\baseline_settings_white_48dp_40px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="baseline_restart_alt_white_48dp_40px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\baseline_restart_alt_white_48dp_40px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
CodeLegacy/Resources/baseline_restart_alt_white_48dp_40px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 855 B

10
CodeLegacy/packages.config
View File

@@ -3,16 +3,19 @@
<package id="AdamsLair.WinForms" version="1.1.18" targetFramework="net472" />
<package id="AdamsLair.WinForms.PopupControl" version="1.0.1" targetFramework="net472" />
<package id="CircularProgressBar" version="2.8.0.16" targetFramework="net472" />
<package id="Costura.Fody" version="5.8.0-alpha0098" targetFramework="net472" developmentDependency="true" />
<package id="Crc32.NET" version="1.2.0" targetFramework="net472" />
<package id="CyotekTabList" version="2.2.0" targetFramework="net472" />
<package id="diskdetector-net" version="0.3.2" targetFramework="net472" />
<package id="Fody" version="6.8.1" targetFramework="net472" developmentDependency="true" />
<package id="HTAlt.Standart" version="0.1.6" targetFramework="net472" />
<package id="HTAlt.WinForms" version="0.1.6" targetFramework="net472" />
<package id="ILRepack" version="2.0.34" targetFramework="net472" developmentDependency="true" />
<package id="ILRepack.MSBuild.Task" version="2.0.13" targetFramework="net472" />
<package id="Magick.NET.Core" version="13.10.0" targetFramework="net472" />
<package id="Magick.NET-Q8-AnyCPU" version="13.10.0" targetFramework="net472" />
<package id="Magick.NET-Q8-x64" version="13.10.0" targetFramework="net472" />
<package id="Microsoft.Build.Framework" version="15.9.20" targetFramework="net472" />
<package id="Microsoft.Build.Utilities.Core" version="15.9.20" targetFramework="net472" />
<package id="Microsoft.NETCore.Platforms" version="8.0.0-preview.7.23375.6" targetFramework="net472" />
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.16.30" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
<package id="Microsoft-WindowsAPICodePack-Core" version="1.1.5" targetFramework="net472" />
<package id="Microsoft-WindowsAPICodePack-Shell" version="1.1.5" targetFramework="net472" />
@@ -25,6 +28,7 @@
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
<package id="System.Console" version="4.3.1" targetFramework="net472" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
<package id="System.Diagnostics.DiagnosticSource" version="9.0.0-preview.7.24405.7" targetFramework="net472" />

BIN
Media/baseline_restart_alt_white_48dp_40px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 855 B