chizui/SpineViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #140 from ww-rm/dev/wpf

Browse Source 
v0.16.10
This commit is contained in:
ww-rm
2025-10-29 21:35:34 +08:00
committed by GitHub
parent 8b0ea750d8 b3ba073368
commit 9040e02025
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/dotnet-release.yml vendored
View File

@@ -126,7 +126,8 @@ jobs:
- name: Compress Linux build - name: Compress Linux build
run: | run: |
mkdir -p release mkdir -p release
zip -r "release/${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained.zip" "publish/${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained" cd publish
zip -r "../release/${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained.zip" "${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained"
- name: Upload Linux zip to GitHub Release - name: Upload Linux zip to GitHub Release
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1

1
SpineViewer/App.xaml.cs
View File

@@ -86,6 +86,7 @@ namespace SpineViewer
Encoding = System.Text.Encoding.UTF8, Encoding = System.Text.Encoding.UTF8,
Layout = "${date:format=yyyy-MM-dd HH\\:mm\\:ss} - ${level:uppercase=true} - ${processid} - ${callsite-filename:includeSourcePath=false}:${callsite-linenumber} - ${message}", Layout = "${date:format=yyyy-MM-dd HH\\:mm\\:ss} - ${level:uppercase=true} - ${processid} - ${callsite-filename:includeSourcePath=false}:${callsite-linenumber} - ${message}",
AutoFlush = true, AutoFlush = true,
CreateDirs = true,
FileName = "${basedir}/logs/app.log", FileName = "${basedir}/logs/app.log",
ArchiveFileName = "${basedir}/logs/app.{#}.log", ArchiveFileName = "${basedir}/logs/app.{#}.log",
ArchiveNumbering = NLog.Targets.ArchiveNumberingMode.Rolling, ArchiveNumbering = NLog.Targets.ArchiveNumberingMode.Rolling,

20
SpineViewerCLI/SpineViewerCLI.cs
View File

@@ -5,11 +5,14 @@ using Spine;
using Spine.Exporters; using Spine.Exporters;
using System.CommandLine; using System.CommandLine;
using System.Globalization; using System.Globalization;
using System.Runtime.InteropServices;
namespace SpineViewerCLI namespace SpineViewerCLI
{ {
public static class SpineViewerCLI public static class SpineViewerCLI
{ {
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
public static Option<bool> OptQuiet { get; } = new("--quiet", "-q") public static Option<bool> OptQuiet { get; } = new("--quiet", "-q")
{ {
Description = "Suppress console logging (quiet mode).", Description = "Suppress console logging (quiet mode).",
@@ -33,17 +36,28 @@ namespace SpineViewerCLI
if (!result.GetValue(OptQuiet)) if (!result.GetValue(OptQuiet))
InitializeConsoleLog(); InitializeConsoleLog();
return result.Invoke(); try
{
return result.Invoke();
}
catch (Exception ex)
{
_logger.Trace(ex.ToString());
_logger.Fatal("Failed to execute, {0}", ex.Message);
return -1;
}
} }
private static void InitializeFileLog() private static void InitializeFileLog()
{ {
// XXX: δ֪ԭ<D6AA><D4AD> linux ƽ̨<C6BD><CCA8><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD>
var config = new NLog.Config.LoggingConfiguration(); var config = new NLog.Config.LoggingConfiguration();
var fileTarget = new NLog.Targets.FileTarget("fileTarget") var fileTarget = new NLog.Targets.FileTarget("fileTarget")
{ {
Encoding = System.Text.Encoding.UTF8, Encoding = System.Text.Encoding.UTF8,
Layout = "${date:format=yyyy-MM-dd HH\\:mm\\:ss} - ${level:uppercase=true} - ${processid} - ${callsite-filename:includeSourcePath=false}:${callsite-linenumber} - ${message}", Layout = "${date:format=yyyy-MM-dd HH\\:mm\\:ss} - ${level:uppercase=true} - ${processid} - ${callsite-filename:includeSourcePath=false}:${callsite-linenumber} - ${message}",
AutoFlush = true, AutoFlush = true,
CreateDirs = true,
FileName = "${basedir}/logs/cli.log", FileName = "${basedir}/logs/cli.log",
ArchiveFileName = "${basedir}/logs/cli.{#}.log", ArchiveFileName = "${basedir}/logs/cli.{#}.log",
ArchiveNumbering = NLog.Targets.ArchiveNumberingMode.Rolling, ArchiveNumbering = NLog.Targets.ArchiveNumberingMode.Rolling,
@@ -71,13 +85,15 @@ namespace SpineViewerCLI
DetectOutputRedirected = true, DetectOutputRedirected = true,
}; };
consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Trace", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange));
consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Debug", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange));
consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Info", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange)); consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Info", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange));
consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Warn", NLog.Targets.ConsoleOutputColor.DarkYellow, NLog.Targets.ConsoleOutputColor.NoChange)); consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Warn", NLog.Targets.ConsoleOutputColor.DarkYellow, NLog.Targets.ConsoleOutputColor.NoChange));
consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Error", NLog.Targets.ConsoleOutputColor.Red, NLog.Targets.ConsoleOutputColor.NoChange)); consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Error", NLog.Targets.ConsoleOutputColor.Red, NLog.Targets.ConsoleOutputColor.NoChange));
consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Fatal", NLog.Targets.ConsoleOutputColor.White, NLog.Targets.ConsoleOutputColor.DarkRed)); consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Fatal", NLog.Targets.ConsoleOutputColor.White, NLog.Targets.ConsoleOutputColor.DarkRed));
config.AddTarget(consoleTarget); config.AddTarget(consoleTarget);
config.AddRule(LogLevel.Info, LogLevel.Fatal, consoleTarget); config.AddRule(LogLevel.Trace, LogLevel.Fatal, consoleTarget);
LogManager.Configuration = config; LogManager.Configuration = config;
} }
} }