Skip to content

Commit

Permalink
To new DeveCoolLib which also includes hiding optimizer window
Browse files Browse the repository at this point in the history
  • Loading branch information
devedse committed Apr 27, 2021
1 parent c3ec3cc commit ca35fdf
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ private async Task OptimizeFileTest(string fileName, ImageOptimizationLevel imag

var config = new DeveImageOptimizerConfiguration()
{
HideFileOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
HideOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
CallOptimizationToolsDirectlyInsteadOfThroughFileOptimizer = false,
LogLevel = 4,
ImageOptimizationLevel = imageOptimizationLevel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@ private async Task OptimizeFileTest(string fileName, ImageOptimizationLevel imag

var configFileOptimizer = new DeveImageOptimizerConfiguration()
{
HideFileOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
HideOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
CallOptimizationToolsDirectlyInsteadOfThroughFileOptimizer = true,
LogLevel = 4,
ImageOptimizationLevel = imageOptimizationLevel
};
var configNew = new DeveImageOptimizerConfiguration()
{
HideFileOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
HideOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
CallOptimizationToolsDirectlyInsteadOfThroughFileOptimizer = false,
LogLevel = 4,
ImageOptimizationLevel = imageOptimizationLevel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ private async Task OptimizeFileTest(string fileName, ImageOptimizationLevel imag

var config = new DeveImageOptimizerConfiguration()
{
HideFileOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
HideOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
CallOptimizationToolsDirectlyInsteadOfThroughFileOptimizer = true,
LogLevel = 4,
ImageOptimizationLevel = imageOptimizationLevel
Expand Down
2 changes: 1 addition & 1 deletion DeveImageOptimizer.Tests/TestHelpers/ConfigCreator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static DeveImageOptimizerConfiguration CreateTestConfig(bool parallel, Im
FileOptimizerPath = fileOptimizerPath,
MaxDegreeOfParallelism = 8,
ExecuteImageOptimizationParallel = parallel,
HideFileOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
HideOptimizerWindow = !TestConstants.ShouldShowFileOptimizerWindow,
LogLevel = 4,
ImageOptimizationLevel = imageOptimizationLevel,
CallOptimizationToolsDirectlyInsteadOfThroughFileOptimizer = true
Expand Down
2 changes: 1 addition & 1 deletion DeveImageOptimizer/DeveImageOptimizer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DeveCoolLib" Version="1.0.504" />
<PackageReference Include="DeveCoolLib" Version="1.0.505" />
<PackageReference Include="ExifLibNet" Version="2.1.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class DeveImageOptimizerConfiguration
public string FileOptimizerPath { get; set; } = Environment.GetEnvironmentVariable("FILEOPTIMIZERPATH") ?? $"C:{s}Program Files{s}FileOptimizer{s}FileOptimizer64.exe";
public string TempDirectory { get; set; } = FolderHelperMethods.TempDirectory;

public bool HideFileOptimizerWindow { get; set; } = true;
public bool HideOptimizerWindow { get; set; } = true;

public string FailedFilesDirectory { get; set; } = FolderHelperMethods.FailedFilesDirectory;
public bool SaveFailedFiles { get; set; } = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public async Task OptimizeFile(OptimizableFile file)
// args = $"/NoWindow {args}";
//}
var processStartInfo = new ProcessStartInfo(Configuration.FileOptimizerPath, $" {args} \"{tempFilePath}\"");
if (Configuration.HideFileOptimizerWindow)
if (Configuration.HideOptimizerWindow)
{
processStartInfo.WindowStyle = ProcessWindowStyle.Hidden;
processStartInfo.UseShellExecute = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public async Task<ImageOptimizationStepResult> Run(DeveImageOptimizerConfigurati

Console.WriteLine($"Executing: {psi.FileName} {psi.Arguments}");

var processResult = await ProcessRunner.RunAsync(psi, configuration.ForwardOptimizerToolLogsToConsole);
var processResult = await ProcessRunner.RunAsync(psi, configuration.ForwardOptimizerToolLogsToConsole, configuration.HideOptimizerWindow);

return new ImageOptimizationStepResult(processResult, usesTempFile ? tempFilePath : inputFile);
}
Expand Down

0 comments on commit ca35fdf

Please sign in to comment.