Skip to content

Commit 6aaee4c

Browse files
committed
Added HomeViewModel logs
1 parent 5157311 commit 6aaee4c

2 files changed

Lines changed: 33 additions & 4 deletions

File tree

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,31 @@
1-
namespace CompactGUI.Logging;
1+
using Microsoft.Extensions.Logging;
2+
3+
namespace CompactGUI.Logging;
24

35
public static partial class HomeViewModelLog
46
{
57

8+
[LoggerMessage(Level = LogLevel.Information,Message = "Loading folders from {FolderPaths}")]
9+
public static partial void AddingFolders(ILogger logger, IEnumerable<string> folderPaths);
10+
11+
[LoggerMessage(Level = LogLevel.Warning, Message = "Invalid folders found: {InvalidFolders} with messages {messages}")]
12+
public static partial void InvalidFolders(ILogger logger, List<string> invalidFolders, IEnumerable<String> messages);
13+
14+
15+
[LoggerMessage(Level = LogLevel.Information, Message = "Getting estimated compression for {FolderPath} with uncompressed size {uncompressedSize}.")]
16+
public static partial void GettingEstimatedCompression(ILogger logger, string folderPath, long uncompressedSize);
17+
18+
19+
20+
[LoggerMessage(Level = LogLevel.Information, Message = "Compressing folder {folderName}.")]
21+
public static partial void CompressingFolder(ILogger logger, string folderName);
22+
23+
24+
[LoggerMessage(Level = LogLevel.Information, Message = "Adding folder {folderName} to watcher")]
25+
public static partial void AddingFolderToWatcher(ILogger logger, string folderName);
26+
27+
[LoggerMessage(Level = LogLevel.Information, Message = "Starting batch compression of {count} folders")]
28+
public static partial void StartingBatchCompression(ILogger logger, int count);
629

730

831
}

CompactGUI/ViewModels/HomeViewModel.vb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Imports CommunityToolkit.Mvvm.Input
77
Imports CommunityToolkit.Mvvm.Messaging
88

99
Imports CompactGUI.Core.SharedMethods
10+
Imports CompactGUI.Logging
1011

1112
Imports Microsoft.Extensions.Logging
1213

@@ -97,11 +98,14 @@ Partial Public Class HomeViewModel : Inherits ObservableObject : Implements IRec
9798

9899
Public Async Function AddFoldersAsync(folderPaths As IEnumerable(Of String)) As Task
99100

101+
HomeViewModelLog.AddingFolders(_logger, folderPaths)
102+
100103
Dim invalidFolders = GetInvalidFolders(folderPaths.ToArray)
101104
Dim validFolders = folderPaths.Except(invalidFolders.InvalidFolders)
102105

103106
If invalidFolders.InvalidFolders.Count > 0 Then
104-
107+
'TODO: Move this logger check to the snackbarService class?
108+
HomeViewModelLog.InvalidFolders(_logger, invalidFolders.InvalidFolders, invalidFolders.InvalidMessages.Select(Function(x) GetFolderVerificationMessage(x)))
105109
_snackbarService.ShowInvalidFoldersMessage(invalidFolders.InvalidFolders, invalidFolders.InvalidMessages)
106110
End If
107111

@@ -124,6 +128,7 @@ Partial Public Class HomeViewModel : Inherits ObservableObject : Implements IRec
124128
Await CType(newFolder, SteamFolder).GetWikiResults()
125129
Else
126130
If SettingsHandler.AppSettings.EstimateCompressionForNonSteamFolders Then
131+
HomeViewModelLog.GettingEstimatedCompression(_logger, newFolder.FolderName, newFolder.UncompressedBytes)
127132
Await newFolder.GetEstimatedCompression()
128133
End If
129134

@@ -205,10 +210,11 @@ Partial Public Class HomeViewModel : Inherits ObservableObject : Implements IRec
205210
Core.SharedMethods.PreventSleep()
206211
Dim tasks As New List(Of Task)()
207212
Dim foldersToCompress = Folders.Where(Function(f) f.FolderActionState = ActionState.Idle).ToList
213+
HomeViewModelLog.StartingBatchCompression(_logger, foldersToCompress.Count)
208214
For Each folder In foldersToCompress
209215
If folder.FolderActionState = ActionState.Idle Then
210216
Await Task.Run(Async Function()
211-
System.Diagnostics.Debug.WriteLine("Compressing " & folder.FolderName)
217+
HomeViewModelLog.CompressingFolder(_logger, folder.FolderName)
212218
Dim ret = Await folder.CompressFolder()
213219
Dim analysis = Await folder.AnalyseFolderAsync
214220

@@ -241,7 +247,7 @@ Partial Public Class HomeViewModel : Inherits ObservableObject : Implements IRec
241247

242248

243249
Public Sub AddOrUpdateFolderWatcher(folder As CompressableFolder)
244-
System.Diagnostics.Debug.WriteLine("Adding folder to watcher: " & folder.FolderName)
250+
HomeViewModelLog.AddingFolderToWatcher(_logger, folder.FolderName)
245251

246252
Dim newWatched = New Watcher.WatchedFolder
247253
newWatched.Folder = folder.FolderName

0 commit comments

Comments
 (0)