Skip to content

Commit

Permalink
Speedup Core.Compactor.BuildWorkingFilesList() by reusing FileInfo in…
Browse files Browse the repository at this point in the history
…stances from Analyser.

- Remove debug code from last commit in MainViewModel
  • Loading branch information
Iridium-IO committed Jul 1, 2024
1 parent f13ab30 commit f657d9d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CompactGUI.Core/Analyser.vb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Public Class Analyser
End If
Dim cLevel As CompressionAlgorithm = If(compSize = unCompSize, CompressionAlgorithm.NO_COMPRESSION, DetectCompression(fInfo))

Return New AnalysedFileDetails With {.FileName = file, .CompressedSize = compSize, .UncompressedSize = unCompSize, .CompressionMode = cLevel}
Return New AnalysedFileDetails With {.FileName = file, .CompressedSize = compSize, .UncompressedSize = unCompSize, .CompressionMode = cLevel, .FileInfo = fInfo}
Catch ex As IOException
Debug.WriteLine($"Error analysing file {file}: {ex.Message}")
Return Nothing
Expand Down
2 changes: 1 addition & 1 deletion CompactGUI.Core/Compactor.vb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Public Class Compactor : Implements IDisposable
Dim ret = Await ax.AnalyseFolder(Nothing)

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

Expand Down
2 changes: 1 addition & 1 deletion CompactGUI.Core/SharedObjects.vb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Public UncompressedSize As Long
Public CompressedSize As Long
Public CompressionMode As CompressionAlgorithm

Public FileInfo As IO.FileInfo
End Class


Expand Down
5 changes: 0 additions & 5 deletions CompactGUI/ViewModels/MainViewModel.vb
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ Public Class MainViewModel : Inherits ObservableObject
End Sub

Private Async Function UpdateWatcherAndState(containsCompressedFiles As Boolean, Analyser As Core.Analyser) As Task
ActiveFolder.PoorlyCompressedFiles = Await Analyser.GetPoorlyCompressedExtensions()

For Each ix In ActiveFolder.PoorlyCompressedFiles
Debug.WriteLine(" " & ix.extension & ": " & ix.totalFiles)
Next

If containsCompressedFiles OrElse ActiveFolder.IsFreshlyCompressed Then
State = "FolderCompressedResults"
Expand Down

0 comments on commit f657d9d

Please sign in to comment.