Skip to content

Commit f657d9d

Browse files
committed
Speedup Core.Compactor.BuildWorkingFilesList() by reusing FileInfo instances from Analyser.
- Remove debug code from last commit in MainViewModel
1 parent f13ab30 commit f657d9d

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

CompactGUI.Core/Analyser.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Public Class Analyser
6767
End If
6868
Dim cLevel As CompressionAlgorithm = If(compSize = unCompSize, CompressionAlgorithm.NO_COMPRESSION, DetectCompression(fInfo))
6969

70-
Return New AnalysedFileDetails With {.FileName = file, .CompressedSize = compSize, .UncompressedSize = unCompSize, .CompressionMode = cLevel}
70+
Return New AnalysedFileDetails With {.FileName = file, .CompressedSize = compSize, .UncompressedSize = unCompSize, .CompressionMode = cLevel, .FileInfo = fInfo}
7171
Catch ex As IOException
7272
Debug.WriteLine($"Error analysing file {file}: {ex.Message}")
7373
Return Nothing

CompactGUI.Core/Compactor.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Public Class Compactor : Implements IDisposable
113113
Dim ret = Await ax.AnalyseFolder(Nothing)
114114

115115
Parallel.ForEach(ax.FileCompressionDetailsList, Sub(fl)
116-
Dim ft = New FileInfo(fl.FileName)
116+
Dim ft = fl.FileInfo
117117
If Not _excludedFileTypes.Contains(ft.Extension) AndAlso ft.Length > clusterSize AndAlso fl.CompressionMode <> _WOFCompressionLevel Then _filesList.Add(fl.FileName)
118118
End Sub)
119119

CompactGUI.Core/SharedObjects.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Public UncompressedSize As Long
55
Public CompressedSize As Long
66
Public CompressionMode As CompressionAlgorithm
7-
7+
Public FileInfo As IO.FileInfo
88
End Class
99

1010

CompactGUI/ViewModels/MainViewModel.vb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,6 @@ Public Class MainViewModel : Inherits ObservableObject
106106
End Sub
107107

108108
Private Async Function UpdateWatcherAndState(containsCompressedFiles As Boolean, Analyser As Core.Analyser) As Task
109-
ActiveFolder.PoorlyCompressedFiles = Await Analyser.GetPoorlyCompressedExtensions()
110-
111-
For Each ix In ActiveFolder.PoorlyCompressedFiles
112-
Debug.WriteLine(" " & ix.extension & ": " & ix.totalFiles)
113-
Next
114109

115110
If containsCompressedFiles OrElse ActiveFolder.IsFreshlyCompressed Then
116111
State = "FolderCompressedResults"

0 commit comments

Comments
 (0)