mirror of
https://github.com/riegera2412/UVtools.git
synced 2026-07-11 11:02:32 +02:00
8e4995a6a5
- **UVtoolsCmd:**
- **print-properties:**
- (Change) `-b`, `--base` option to `-a`, `-all` to indicate all properties and sub-properties, now defaults to only show base properties
- (Add) `-r`, `--range` option to prints only the matching layer(s) index(es) in a range
- (Add) `-i`, `--indexes` option to prints only the matching layer(s) index(es)
- (Add) Command: `set-properties <input-file> <property=value> Set properties in a file or to it layers with new values`
- (Add) Command: `print-issues <input-file> Detect and print issues in a file`
- (Add) New option to the `run` command: `-p, --property <property=value> Set a property with a new value (Compatible with operations only)`
- (Remove) Command: `print-layers` as it has been moved to `print-properties`, use `-r :` to obtain same result as default on `print-layers`
- **Issues:**
- (Fix) Issues groups with only one issue was displaying the wrong area value
- (Fix) Volume incorrectly calculated, resulting in a high value for group of issues
- (Fix) Incorrect calculation of the bounding rectangle for a group of issues
- **Repair layers:**
- (Add) Switch to opt between "Re-detect the selected issues before repair" and "Use and repair the previous detected issues" (Default)
- (Improvement) Do not allow to run the tool if there are no detected issues when the option "Use and repair the previous detected issues" is selected
- (Improvement) Linux: Recompile libcvextern.so on a older system to be able to run on both older and newest system (#603)
- (Upgrade) .NET from 6.0.10 to 6.0.11
218 lines
6.0 KiB
C#
218 lines
6.0 KiB
C#
/*
|
|
* GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* Version 3, 19 November 2007
|
|
* Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
* Everyone is permitted to copy and distribute verbatim copies
|
|
* of this license document, but changing it is not allowed.
|
|
*/
|
|
|
|
using System;
|
|
using System.CommandLine;
|
|
using System.Diagnostics;
|
|
using System.Globalization;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using UVtools.Cmd.Symbols;
|
|
using UVtools.Core;
|
|
using UVtools.Core.FileFormats;
|
|
using UVtools.Core.Operations;
|
|
|
|
namespace UVtools.Cmd;
|
|
|
|
internal class Program
|
|
{
|
|
internal const string EndOperationText = "Done in {0:F2}s";
|
|
internal static OperationProgress Progress { get; } = new();
|
|
internal static Stopwatch StopWatch { get; } = new();
|
|
internal static bool Quiet { get; private set; }
|
|
internal static bool NoProgress { get; private set; }
|
|
|
|
internal static string[] Args { get; private set; } = null!;
|
|
|
|
public static async Task<int> Main(params string[] args)
|
|
{
|
|
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
|
|
Args = args;
|
|
|
|
var rootCommand = new RootCommand("MSLA/DLP, file analysis, repair, conversion and manipulation")
|
|
{
|
|
SetPropertiesCommand.CreateCommand(),
|
|
RunCommand.CreateCommand(),
|
|
ConvertCommand.CreateCommand(),
|
|
ExtractCommand.CreateCommand(),
|
|
CopyParametersCommand.CreateCommand(),
|
|
SetThumbnailCommand.CreateCommand(),
|
|
|
|
PrintIssuesCommand.CreateCommand(),
|
|
PrintPropertiesCommand.CreateCommand(),
|
|
//PrintLayersCommand.CreateCommand(),
|
|
PrintGCodeCommand.CreateCommand(),
|
|
PrintMachinesCommand.CreateCommand(),
|
|
|
|
GlobalOptions.QuietOption,
|
|
GlobalOptions.NoProgressOption,
|
|
new Option<bool>("--core-version", "Show core version information"),
|
|
};
|
|
|
|
//rootCommand.SetHandler(() => { });
|
|
|
|
HandleGlobals();
|
|
await rootCommand.InvokeAsync(args);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
internal static void HandleGlobals()
|
|
{
|
|
foreach (var arg in Args)
|
|
{
|
|
bool found = false;
|
|
if (GlobalOptions.QuietOption.Aliases.Any(alias => arg == alias))
|
|
{
|
|
Quiet = true;
|
|
found = true;
|
|
}
|
|
|
|
if(found) continue;
|
|
|
|
if (GlobalOptions.NoProgressOption.Aliases.Any(alias => arg == alias))
|
|
{
|
|
NoProgress = true;
|
|
found = true;
|
|
}
|
|
|
|
if (found) continue;
|
|
|
|
if (arg == "--core-version")
|
|
{
|
|
Console.WriteLine(About.VersionStr);
|
|
Environment.Exit(0);
|
|
}
|
|
}
|
|
}
|
|
|
|
internal static FileFormat OpenInputFile(FileInfo inputFile, FileFormat.FileDecodeType decodeType = FileFormat.FileDecodeType.Full)
|
|
{
|
|
return ProgressBarWork($"Opening file {inputFile.Name}", () =>
|
|
{
|
|
var slicerFile = FileFormat.Open(inputFile.FullName, decodeType, Progress);
|
|
if (slicerFile is null)
|
|
{
|
|
throw new IOException($"Invalid file: {inputFile.Name}");
|
|
}
|
|
|
|
return slicerFile;
|
|
});
|
|
}
|
|
|
|
internal static void SaveFile(FileFormat slicerFile, FileInfo? outputFile) => SaveFile(slicerFile, outputFile?.FullName);
|
|
|
|
internal static void SaveFile(FileFormat slicerFile, string? outputFile = null)
|
|
{
|
|
var fileName = outputFile is null ? slicerFile.Filename : Path.GetFileName(outputFile);
|
|
ProgressBarWork($"Saving file {fileName}", () =>
|
|
{
|
|
slicerFile.SaveAs(outputFile, Progress);
|
|
});
|
|
}
|
|
|
|
#region ProgressBar
|
|
|
|
internal static T ProgressBarWork<T>(string title, Func<T> action)
|
|
{
|
|
T result;
|
|
Progress.Title = title;
|
|
|
|
StopWatch.Restart();
|
|
Write($"{title}: ");
|
|
if (Quiet || NoProgress)
|
|
{
|
|
result = action.Invoke();
|
|
}
|
|
else
|
|
{
|
|
using var progressBar = new ProgressBar();
|
|
result = action.Invoke();
|
|
}
|
|
StopWatch.Stop();
|
|
|
|
|
|
WriteLine(string.Format(EndOperationText, StopWatch.ElapsedMilliseconds / 1000.0));
|
|
return result;
|
|
}
|
|
|
|
internal static void ProgressBarWork(string title, Action action)
|
|
{
|
|
ProgressBarWork(title, () =>
|
|
{
|
|
action.Invoke();
|
|
return true;
|
|
});
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Write to console methods
|
|
internal static void Write(object? obj)
|
|
{
|
|
if (Quiet) return;
|
|
Console.Write(obj);
|
|
}
|
|
|
|
internal static void WriteLine(object? obj)
|
|
{
|
|
if (Quiet) return;
|
|
Console.WriteLine(obj);
|
|
}
|
|
|
|
internal static void WriteWarning(object? obj)
|
|
{
|
|
if (Quiet) return;
|
|
Console.ForegroundColor = ConsoleColor.Yellow;
|
|
Console.Write(obj);
|
|
Console.ResetColor();
|
|
}
|
|
|
|
internal static void WriteLineWarning(object? obj)
|
|
{
|
|
if (Quiet) return;
|
|
|
|
Console.ForegroundColor = ConsoleColor.Yellow;
|
|
Console.WriteLine(obj);
|
|
Console.ResetColor();
|
|
}
|
|
|
|
internal static void WriteError(object? obj, bool exit = false)
|
|
{
|
|
if (Quiet)
|
|
{
|
|
if (exit) Environment.Exit(-1);
|
|
return;
|
|
}
|
|
Console.ForegroundColor = ConsoleColor.Red;
|
|
Console.Write(obj);
|
|
Console.ResetColor();
|
|
if (exit) Environment.Exit(-1);
|
|
}
|
|
|
|
internal static void WriteLineError(object? obj, bool exit = true, bool prependError = true)
|
|
{
|
|
if (Quiet)
|
|
{
|
|
if (exit) Environment.Exit(-1);
|
|
return;
|
|
}
|
|
|
|
var str = obj?.ToString();
|
|
if(str is not null && prependError && !str.StartsWith("Error:")) str = $"Error: {str}";
|
|
|
|
Console.ForegroundColor = ConsoleColor.Red;
|
|
Console.WriteLine(str);
|
|
Console.ResetColor();
|
|
if (exit) Environment.Exit(-1);
|
|
}
|
|
#endregion
|
|
} |