Skip to content

Commit 7b698a7

Browse files
committed
Adjusted logging
1 parent c3cce36 commit 7b698a7

5 files changed

Lines changed: 19 additions & 9 deletions

File tree

CompactGUI.Core/Compactor.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,22 @@ public async Task<bool> RunAsync(List<string> filesList, IProgress<CompressionPr
6565
CompactorLog.StartingCompression(_logger, workingDirectory, wofCompressionAlgorithm.ToString(), maxParallelism);
6666
try
6767
{
68-
await Parallel.ForEachAsync(workingFiles, parallelOptions,
68+
await Parallel.ForEachAsync(workingFiles, parallelOptions,
6969
(file, ctx) =>
7070
{
7171
ctx.ThrowIfCancellationRequested();
7272

7373
return new ValueTask(PauseAndProcessFile(file, totalFilesSize, cancellationTokenSource.Token, progressMonitor));
7474
}).ConfigureAwait(false);
7575
}
76-
catch (OperationCanceledException){ return false; }
77-
catch (Exception){ return false; }
76+
catch (OperationCanceledException){
77+
CompactorLog.CompressionCanceled(_logger);
78+
return false;
79+
}
80+
catch (Exception ex){
81+
CompactorLog.CompressionFailed(_logger, ex.Message);
82+
return false;
83+
}
7884
finally { sw.Stop();}
7985

8086

@@ -152,7 +158,6 @@ public void Cancel()
152158
{
153159
Resume();
154160
cancellationTokenSource.Cancel();
155-
CompactorLog.CompressionCanceled(_logger);
156161
}
157162

158163

CompactGUI.Core/Uncompactor.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ await Parallel.ForEachAsync(filesList, parallelOptions,
4141
return new ValueTask(PauseAndProcessFile(file, totalFiles, progressMonitor, cancellationTokenSource.Token));
4242
});
4343
}
44-
catch (OperationCanceledException) { return false; }
44+
catch (OperationCanceledException) {
45+
UncompactorLog.DecompressionCanceled(_logger);
46+
return false;
47+
}
4548
finally { sw.Stop(); }
4649

4750
UncompactorLog.DecompressionCompleted(_logger, Math.Round(sw.Elapsed.TotalSeconds, 3));
@@ -103,7 +106,6 @@ public void Cancel()
103106
{
104107
Resume();
105108
cancellationTokenSource.Cancel();
106-
UncompactorLog.DecompressionCanceled(_logger);
107109
}
108110

109111

CompactGUI.Logging/Core/AnalyserLog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace CompactGUI.Logging.Core;
1010
public static partial class AnalyserLog
1111
{
1212

13-
[LoggerMessage(Level = LogLevel.Information, Message = "Starting analysis of directory: {Directory}")]
13+
[LoggerMessage(Level = LogLevel.Debug, Message = "Starting analysis of directory: {Directory}")]
1414
public static partial void StartingAnalysis(ILogger logger, string directory);
1515

1616
[LoggerMessage(Level = LogLevel.Trace, Message = "Processing file: {FileName}")]

CompactGUI.Logging/Core/CompactorLog.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,7 @@ public static partial class CompactorLog
3434
[LoggerMessage(Level = LogLevel.Information, Message = "Compression completed successfully in {TimeTaken}s.")]
3535
public static partial void CompressionCompleted(ILogger logger, double timeTaken);
3636

37+
[LoggerMessage(Level = LogLevel.Error, Message = "Compression failed with error: {ErrorMessage}")]
38+
public static partial void CompressionFailed(ILogger logger, string errorMessage);
39+
3740
}

CompactGUI.Logging/HomeViewModelLog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public static partial class HomeViewModelLog
1717

1818

1919

20-
[LoggerMessage(Level = LogLevel.Information, Message = "Compressing folder {folderName}.")]
20+
[LoggerMessage(Level = LogLevel.Debug, Message = "Compressing folder {folderName}.")]
2121
public static partial void CompressingFolder(ILogger logger, string folderName);
2222

2323

24-
[LoggerMessage(Level = LogLevel.Information, Message = "Adding folder {folderName} to watcher")]
24+
[LoggerMessage(Level = LogLevel.Debug, Message = "Adding folder {folderName} to watcher")]
2525
public static partial void AddingFolderToWatcher(ILogger logger, string folderName);
2626

2727
[LoggerMessage(Level = LogLevel.Information, Message = "Starting batch compression of {count} folders")]

0 commit comments

Comments
 (0)