marcogiuntoni/comic-img-compress
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
mgiuntoni
2025-01-23 12:57:06 +01:00
parent 5152a87ffa c6c46775c4
commit 26c1b4124e
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ComicCompress.csproj
+1
View File
@@ -6,6 +6,7 @@
<RootNamespace>ComicCompressor</RootNamespace> <RootNamespace>ComicCompressor</RootNamespace>
<OutputName>ComicCompress</OutputName> <OutputName>ComicCompress</OutputName>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Configurations>Debug;Release;ReleaseWDbg</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
ComicCompress.csproj.user
+3
View File
@@ -9,4 +9,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor> <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWDbg|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
</Project> </Project>
ComicCompress.sln
+1
View File
@@ -13,6 +13,7 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
ReleaseWDbg|Any CPU = ReleaseWDbg|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2625C71D-E4EC-4768-BF04-87AAB364916A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2625C71D-E4EC-4768-BF04-87AAB364916A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Program.cs
+6 -5
View File
@@ -141,13 +141,14 @@ namespace ComicCompressor
Logger.Log(progVersion, LogLevel.Verbose, true); Logger.Log(progVersion, LogLevel.Verbose, true);
var progress = new Progress<ProgressInfo>( p => Logger.Log(p.ToString(), LogLevel.Verbose, true) ); //var progress = new Progress<ProgressInfo>( p => Logger.Log(p.ToString(), LogLevel.Verbose, true) );
FFmpeg.SetExecutablesPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)); //FFmpeg.SetExecutablesPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location));
FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official,progress); //FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official,progress);
//FFmpeg.SetExecutablesPath (Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FFmpeg")); //==//FFmpeg.SetExecutablesPath (Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FFmpeg"));
Logger.Log(FFmpeg.ExecutablesPath, LogLevel.Verbose, true);
//Logger.Log(FFmpeg.ExecutablesPath, LogLevel.Verbose, true);
IList<string> files = new FileParser().ListAllFiles(Input, Recursive); IList<string> files = new FileParser().ListAllFiles(Input, Recursive);
Properties/launchSettings.json
+2 -1
View File
@@ -26,7 +26,8 @@
}, },
"DEV_UFF": { "DEV_UFF": {
"commandName": "Project", "commandName": "Project",
"commandLineArgs": "-i \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_IN\" -o \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_OUT\" -r -s -j -a -n" "commandLineArgs": "-i \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_IN\" -o \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_OUT\" -r -s -j -a -n",
"nativeDebugging": true
}, },
"DEV_HOME": { "DEV_HOME": {
"commandName": "Project", "commandName": "Project",