From 68dff9c24cc25353c48345f69c08abe049b94ccd Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sat, 8 Feb 2025 17:03:02 -0700 Subject: [PATCH] Nuget Pack net8 --- .vscode/launch.json | 4 +- .vscode/read-me.md | 1 + .vscode/settings.json | 1 + .vscode/tasks.json | 96 +++++++++++++++++++ Compare/.vscode/read-me.md | 1 + Compare/AA.Compare.csproj | 23 +++-- Distance/.vscode/read-me.md | 1 + Distance/AA.Distance.csproj | 93 +++++++++--------- Face/.vscode/read-me.md | 1 + Face/AA.Face.csproj | 89 +++++++++-------- FaceRecognitionDotNet/.vscode/read-me.md | 1 + .../AA.FaceRecognitionDotNet.csproj | 2 +- Metadata/.vscode/read-me.md | 1 + Metadata/AA.Metadata.csproj | 87 +++++++++-------- People/.vscode/read-me.md | 1 + People/AA.People.csproj | 89 +++++++++-------- Rename/.vscode/read-me.md | 1 + Rename/AA.Rename.csproj | 29 ++++-- Rename/Models/RenameSettings.cs | 1 + Rename/Rename.cs | 14 ++- Shared/.vscode/read-me.md | 1 + Shared/AA.Shared.csproj | 76 ++++++++------- 22 files changed, 381 insertions(+), 232 deletions(-) create mode 100644 .vscode/read-me.md create mode 100644 Compare/.vscode/read-me.md create mode 100644 Distance/.vscode/read-me.md create mode 100644 Face/.vscode/read-me.md create mode 100644 FaceRecognitionDotNet/.vscode/read-me.md create mode 100644 Metadata/.vscode/read-me.md create mode 100644 People/.vscode/read-me.md create mode 100644 Rename/.vscode/read-me.md create mode 100644 Shared/.vscode/read-me.md diff --git a/.vscode/launch.json b/.vscode/launch.json index 5407333..389be88 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "Build-Rename", - "program": "${workspaceFolder}/Rename/bin/Debug/net9.0/win-x64/AA.Rename.dll", + "program": "${workspaceFolder}/Rename/bin/Debug/net8.0/win-x64/AA.Rename.dll", "args": [ "s" ], @@ -23,7 +23,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "Build-Compare", - "program": "${workspaceFolder}/Compare/bin/Debug/net9.0/win-x64/AA.Compare.dll", + "program": "${workspaceFolder}/Compare/bin/Debug/net8.0/win-x64/AA.Compare.dll", "args": [ "s" ], diff --git a/.vscode/read-me.md b/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/.vscode/settings.json b/.vscode/settings.json index 5f67ab0..0409940 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,6 +40,7 @@ "Rects", "resnet", "Serilog", + "snupkg", "Subfile", "Subfiles", "Syncthing", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 75b670f..ee783ff 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -123,6 +123,102 @@ ], "problemMatcher": "$msCompile" }, + { + "label": "Pack-Compare", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/Compare/AA.Compare.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-Distance", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/Distance/AA.Distance.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-Face", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/Face/AA.Face.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-Face-Recognition-DotNet", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-Metadata", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/Metadata/AA.Metadata.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-People", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/People/AA.People.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-Rename", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/Rename/AA.Rename.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Pack-Shared", + "command": "dotnet", + "type": "process", + "args": [ + "pack", + "${workspaceFolder}/Shared/AA.Shared.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, { "label": "Format-Compare-Whitespaces", "command": "dotnet", diff --git a/Compare/.vscode/read-me.md b/Compare/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/Compare/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/Compare/AA.Compare.csproj b/Compare/AA.Compare.csproj index 688f68c..5cd7124 100644 --- a/Compare/AA.Compare.csproj +++ b/Compare/AA.Compare.csproj @@ -1,20 +1,22 @@ - + enable enable Exe win-x64 - net9.0 + net8.0 770b6ae3-266e-4d5f-970a-173709b064de Phares.View.by.Distance.Compare - false - 9.0.100.0 - Mike Phares + 8.0.112.0 Phares + Mike Phares true + read-me.md snupkg + false + MIT true @@ -34,10 +36,13 @@ - - - - + + + + + + + diff --git a/Distance/.vscode/read-me.md b/Distance/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/Distance/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/Distance/AA.Distance.csproj b/Distance/AA.Distance.csproj index 67ab276..103ab42 100644 --- a/Distance/AA.Distance.csproj +++ b/Distance/AA.Distance.csproj @@ -1,46 +1,51 @@ - - enable - enable - library - win-x64 - net9.0 - - - Phares.AA.Distance - false - 9.0.100.0 - Mike Phares - Phares - true - snupkg - - - true - true - true - - - Windows - - - OSX - - - Linux - - - - - - - - - - - - - - - + + enable + enable + library + win-x64 + net8.0 + + + Phares.AA.Distance + 8.0.112.0 + Phares + Mike Phares + true + read-me.md + snupkg + false + MIT + + + true + true + true + + + Windows + + + OSX + + + Linux + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Face/.vscode/read-me.md b/Face/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/Face/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/Face/AA.Face.csproj b/Face/AA.Face.csproj index 624b872..ec8a4df 100644 --- a/Face/AA.Face.csproj +++ b/Face/AA.Face.csproj @@ -1,44 +1,49 @@ - - enable - enable - library - win-x64 - net9.0 - - - Phares.AA.Face - false - 9.0.100.0 - Mike Phares - Phares - true - snupkg - - - true - true - true - - - Windows - - - OSX - - - Linux - - - - - - - - - - - - - + + enable + enable + library + win-x64 + net8.0 + + + Phares.AA.Face + 8.0.112.0 + Phares + Mike Phares + true + read-me.md + snupkg + false + MIT + + + true + true + true + + + Windows + + + OSX + + + Linux + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FaceRecognitionDotNet/.vscode/read-me.md b/FaceRecognitionDotNet/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/FaceRecognitionDotNet/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj b/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj index 96036da..c2a260b 100644 --- a/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj +++ b/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj @@ -4,7 +4,7 @@ enable library win-x64 - net9.0 + net8.0 Phares.AA.FaceRecognitionDotNet diff --git a/Metadata/.vscode/read-me.md b/Metadata/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/Metadata/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/Metadata/AA.Metadata.csproj b/Metadata/AA.Metadata.csproj index 1c92f92..0c4b2ed 100644 --- a/Metadata/AA.Metadata.csproj +++ b/Metadata/AA.Metadata.csproj @@ -1,43 +1,48 @@ - - enable - enable - library - win-x64 - net9.0 - - - Phares.AA.Metadata - false - 9.0.100.0 - Mike Phares - Phares - true - snupkg - - - true - true - true - - - Windows - - - OSX - - - Linux - - - - - - - - - - - - + + enable + enable + library + win-x64 + net8.0 + + + Phares.AA.Metadata + 8.0.112.0 + Phares + Mike Phares + true + read-me.md + snupkg + false + MIT + + + true + true + true + + + Windows + + + OSX + + + Linux + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/People/.vscode/read-me.md b/People/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/People/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/People/AA.People.csproj b/People/AA.People.csproj index 24a8e4b..26b1ae1 100644 --- a/People/AA.People.csproj +++ b/People/AA.People.csproj @@ -1,44 +1,49 @@ - - enable - enable - library - win-x64 - net9.0 - - - Phares.AA.People - false - 9.0.100.0 - Mike Phares - Phares - true - snupkg - - - true - true - true - - - Windows - - - OSX - - - Linux - - - - - - - - - - - - - + + enable + enable + library + win-x64 + net8.0 + + + Phares.AA.People + 8.0.112.0 + Phares + Mike Phares + true + read-me.md + snupkg + false + MIT + + + true + true + true + + + Windows + + + OSX + + + Linux + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Rename/.vscode/read-me.md b/Rename/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/Rename/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/Rename/AA.Rename.csproj b/Rename/AA.Rename.csproj index 86664b3..6f5f6d1 100644 --- a/Rename/AA.Rename.csproj +++ b/Rename/AA.Rename.csproj @@ -1,21 +1,23 @@ - + enable enable Exe win-x64 - net9.0 + net8.0 fa0fa59b-afe4-4960-9afc-18fcbc7fb41b 843db3e1-e18f-4cba-8b00-967529a32635 Phares.View.by.Distance.Rename - false - 9.0.100.0 - Mike Phares + 8.0.112.0 Phares + Mike Phares true + read-me.md snupkg + false + MIT true @@ -35,12 +37,19 @@ - - - - - + + + + + + + + + + + + diff --git a/Rename/Models/RenameSettings.cs b/Rename/Models/RenameSettings.cs index 64c6fcc..1aa84cc 100644 --- a/Rename/Models/RenameSettings.cs +++ b/Rename/Models/RenameSettings.cs @@ -12,6 +12,7 @@ public record RenameSettings(string Company, bool InPlaceMoveDirectory, bool InPlaceWithOriginalName, int MaxDegreeOfParallelism, + int MaxMilliSecondsPerCall, bool OnlySaveIdentifiersToDisk, string RelativePropertyCollectionFile, bool RequireRootDirectoryExists, diff --git a/Rename/Rename.cs b/Rename/Rename.cs index fee649b..27edd07 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -59,7 +59,7 @@ public partial class Rename : IRename, IDisposable try { CommandTask commandTask = Cli.Wrap("L:/Git/ffmpeg-2024-10-02-git-358fdf3083-full_build/bin/ffmpeg.exe") - .WithArguments(new[] { "-i", filePath.FullName, "-vf", "select=eq(n\\,0)", "-q:v", "1", $"{filePath.Name}-%4d.jpg" }) + .WithArguments(["-i", filePath.FullName, "-vf", "select=eq(n\\,0)", "-q:v", "1", $"{filePath.Name}-%4d.jpg"]) .WithWorkingDirectory(filePath.DirectoryFullPath) .ExecuteAsync(); commandTask.Task.Wait(); @@ -165,13 +165,14 @@ public partial class Rename : IRename, IDisposable } } - private List GetRecordACollection(ILogger? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection ids, IEnumerable files, A_Metadata metadata) + private List GetRecordACollection(ILogger? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection ids, IEnumerable files, A_Metadata metadata) { List results = []; int index = -1; RecordA recordA; FileInfo fileInfo; FilePath filePath; + TimeSpan timeSpan; string directoryName; ExifDirectory exifDirectory; List sidecarFiles; @@ -243,6 +244,9 @@ public partial class Rename : IRename, IDisposable recordA = new(exifDirectory, fastForwardMovingPictureExpertsGroupUsed, fileInfo, filePath, new(sidecarFiles)); results.Add(recordA); } + timeSpan = new(DateTime.Now.Ticks - ticks); + if (timeSpan.TotalMilliseconds > appSettings.RenameSettings.MaxMilliSecondsPerCall) + break; } return results; } @@ -268,7 +272,7 @@ public partial class Rename : IRename, IDisposable return results.AsReadOnly(); } - private ReadOnlyCollection GetRecordBCollection(ILogger? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection ids, DirectoryInfo directoryInfo) + private ReadOnlyCollection GetRecordBCollection(ILogger? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection ids, DirectoryInfo directoryInfo) { ReadOnlyCollection results; RecordA recordA; @@ -279,7 +283,7 @@ public partial class Rename : IRename, IDisposable int filesCount = appSettingsMaxDegreeOfParallelism == 1 ? files.Count() : 123000; _ProgressBar = new(filesCount, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }); if (appSettingsMaxDegreeOfParallelism == 1) - recordACollection.AddRange(GetRecordACollection(logger, appSettings, rename, ids, files, metadata)); + recordACollection.AddRange(GetRecordACollection(logger, appSettings, rename, ticks, ids, files, metadata)); else { List distinct = []; @@ -548,7 +552,7 @@ public partial class Rename : IRename, IDisposable _ = IPath.DeleteEmptyDirectories(appSettings.ResultSettings.RootDirectory); DirectoryInfo directoryInfo = new(Path.GetFullPath(appSettings.ResultSettings.RootDirectory)); logger?.LogInformation("{Ticks} {RootDirectory}", ticks, directoryInfo.FullName); - ReadOnlyCollection recordBCollection = GetRecordBCollection(logger, appSettings, rename, ids, directoryInfo); + ReadOnlyCollection recordBCollection = GetRecordBCollection(logger, appSettings, rename, ticks, ids, directoryInfo); SaveIdentifiersToDisk(ticks, appSettings, recordBCollection); if (appSettings.RenameSettings.InPlace || appSettings.RenameSettings.InPlaceWithOriginalName) { diff --git a/Shared/.vscode/read-me.md b/Shared/.vscode/read-me.md new file mode 100644 index 0000000..bbb628c --- /dev/null +++ b/Shared/.vscode/read-me.md @@ -0,0 +1 @@ +# Read Me diff --git a/Shared/AA.Shared.csproj b/Shared/AA.Shared.csproj index 57b2b76..be3ce6d 100644 --- a/Shared/AA.Shared.csproj +++ b/Shared/AA.Shared.csproj @@ -1,38 +1,42 @@ - - enable - enable - win-x64;linux-x64 - net9.0 - - - Phares.AA.Shared - false - 9.0.100.0 - Mike Phares - Phares - true - snupkg - - - true - true - true - - - Windows - - - OSX - - - Linux - - - - - - - - + + enable + enable + win-x64;linux-x64 + net8.0 + + + Phares.AA.Shared + 8.1.112.0 + Phares + Mike Phares + true + read-me.md + snupkg + false + MIT + + + true + true + true + + + Windows + + + OSX + + + Linux + + + + + + + + + + \ No newline at end of file