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

Better symlink error handling, should fix encoding failing on exFAT drives

Browse Source
This commit is contained in:
N00MKRAD
2021-04-19 21:18:17 +02:00
parent 7c273d318d
commit 4d2f6ebd1f
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Code/Media/FfmpegEncode.cs
View File

@@ -34,8 +34,12 @@ namespace Flowframes.Media
if (Config.GetBool("allowSymlinkEncoding", true) && Symlinks.SymlinksAllowed())
{
inArg = $"-i {Path.GetFileName(framesFile) + Paths.symlinksSuffix}/%{Padding.interpFrames}d.png";
await MakeSymlinks(framesFile, linksDir, Padding.interpFrames);
if(IOUtils.GetAmountOfFiles(linksDir, false) > 1)
inArg = $"-i {Path.GetFileName(framesFile) + Paths.symlinksSuffix}/%{Padding.interpFrames}d.png";
else
Logger.Log("Symlink creation seems to have failed even though SymlinksAllowed was true! Encoding ini with concat demuxer instead.", true);
}
string rate = fps.ToString().Replace(",", ".");
@@ -48,24 +52,34 @@ namespace Flowframes.Media
static async Task MakeSymlinks(string framesFile, string linksDir, int zPad = 8)
{
Directory.CreateDirectory(linksDir);
Stopwatch sw = new Stopwatch(); sw.Restart();
Logger.Log($"Creating symlinks for '{framesFile}'", true);
int counter = 0;
Dictionary<string, string> pathsLinkTarget = new Dictionary<string, string>();
foreach (string line in File.ReadAllLines(framesFile))
try
{
string relTargetPath = line.Remove("file '").Split('\'').FirstOrDefault(); // Relative path in frames file
string absTargetPath = Path.Combine(framesFile.GetParentDir(), relTargetPath); // Full path to frame
string linkPath = Path.Combine(linksDir, counter.ToString().PadLeft(zPad, '0') + Path.GetExtension(relTargetPath));
pathsLinkTarget.Add(linkPath, absTargetPath);
counter++;
}
Directory.CreateDirectory(linksDir);
Stopwatch sw = new Stopwatch();
sw.Restart();
Logger.Log($"Creating symlinks for '{framesFile}' in '{linksDir} with zPadding {zPad}'", true);
await Symlinks.CreateSymlinksParallel(pathsLinkTarget);
int counter = 0;
Dictionary<string, string> pathsLinkTarget = new Dictionary<string, string>();
foreach (string line in File.ReadAllLines(framesFile))
{
string relTargetPath =
line.Remove("file '").Split('\'').FirstOrDefault(); // Relative path in frames file
string absTargetPath = Path.Combine(framesFile.GetParentDir(), relTargetPath); // Full path to frame
string linkPath = Path.Combine(linksDir,
counter.ToString().PadLeft(zPad, '0') + Path.GetExtension(relTargetPath));
pathsLinkTarget.Add(linkPath, absTargetPath);
counter++;
}
await Symlinks.CreateSymlinksParallel(pathsLinkTarget);
}
catch (Exception e)
{
Logger.Log("MakeSymlinks Exception: " + e.Message);
}
}
public static async Task FramesToGifConcat(string framesFile, string outPath, Fraction rate, bool palette, int colors = 64, float resampleFps = -1, LogMode logMode = LogMode.OnlyLastLine)

7
Code/OS/StartupChecks.cs
View File

@@ -56,8 +56,10 @@ namespace Flowframes.OS
bool silent = Config.GetBool("silentDevmodeCheck", true);
string ver = Updater.GetInstalledVer().ToString();
bool symlinksAllowed = Symlinks.SymlinksAllowed();
Logger.Log($"SymlinksAllowed: {symlinksAllowed}", true);
if (!Symlinks.SymlinksAllowed() && Config.Get("askedForDevModeVersion") != ver)
if (!symlinksAllowed && Config.Get("askedForDevModeVersion") != ver)
{
if (!silent)
{
@@ -65,6 +67,8 @@ namespace Flowframes.OS
"This requires administrator privileges once.", "Message");
}
Logger.Log($"Trying to enable dev mode.", true);
string devmodeBatchPath = Path.Combine(Paths.GetDataPath(), "devmode.bat");
File.WriteAllText(devmodeBatchPath, Properties.Resources.devmode);
@@ -94,6 +98,7 @@ namespace Flowframes.OS
"it manually in the Windows 10 Settings:\nSettings -> Update & security -> For developers -> Developer mode.", "Message");
}
Logger.Log("Failed to enable dev mode.", true);
Config.Set("askedForDevModeVersion", ver);
}
else