oliverbooth/fdup
1
0
Fork 0
mirror of https://github.com/oliverbooth/fdup.git synced 2024-11-09 23:45:41 +00:00
Code Issues

fix: prevent application break on I/O exception

Browse Source
This commit is contained in:
Oliver Booth 2024-04-16 21:00:02 +01:00
parent a6a8f85ce9
commit 6bcb4abc99
Signed by: oliverbooth
GPG Key ID: E60B570D1B7557B5
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
FindDuplicates/ListCommand.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Diagnostics; using System.Diagnostics;
using System.Security;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using Spectre.Console; using Spectre.Console;
@ -91,11 +92,20 @@ internal sealed class ListCommand : AsyncCommand<ListSettings>
AnsiConsole.MarkupLineInterpolated($"Searching [cyan]{relativePath}[/]"); AnsiConsole.MarkupLineInterpolated($"Searching [cyan]{relativePath}[/]");
if (settings.Recursive) if (settings.Recursive)
{
try
{ {
foreach (DirectoryInfo childDirectory in currentDirectory.EnumerateDirectories()) foreach (DirectoryInfo childDirectory in currentDirectory.EnumerateDirectories())
directoryStack.Push(childDirectory); directoryStack.Push(childDirectory);
} }
catch (Exception ex)
{
AnsiConsole.MarkupLineInterpolated($"[red]Error:[/] {ex.Message}");
}
}
try
{
foreach (FileInfo file in currentDirectory.EnumerateFiles()) foreach (FileInfo file in currentDirectory.EnumerateFiles())
{ {
string relativeFilePath = Path.GetRelativePath(inputDirectory.FullName, file.FullName); string relativeFilePath = Path.GetRelativePath(inputDirectory.FullName, file.FullName);
@ -103,11 +113,18 @@ internal sealed class ListCommand : AsyncCommand<ListSettings>
tasks.Add(Task.Run(() => ProcessFile(file))); tasks.Add(Task.Run(() => ProcessFile(file)));
} }
} }
catch (Exception ex)
{
AnsiConsole.MarkupLineInterpolated($"[red]Error:[/] {ex.Message}");
}
}
} }
private void ProcessFile(FileInfo file) private void ProcessFile(FileInfo file)
{ {
Span<byte> buffer = stackalloc byte[64]; Span<byte> buffer = stackalloc byte[64];
try
{
using FileStream stream = file.OpenRead(); using FileStream stream = file.OpenRead();
using BufferedStream bufferedStream = new BufferedStream(stream, 1048576 /* 1MB */); using BufferedStream bufferedStream = new BufferedStream(stream, 1048576 /* 1MB */);
SHA512.HashData(bufferedStream, buffer); SHA512.HashData(bufferedStream, buffer);
@ -120,6 +137,11 @@ internal sealed class ListCommand : AsyncCommand<ListSettings>
lock (cache) lock (cache)
cache.Add(file); cache.Add(file);
} }
catch (Exception ex)
{
AnsiConsole.MarkupLineInterpolated($"[red]Error:[/] {ex.Message}");
}
}
private static string ByteSpanToString(ReadOnlySpan<byte> buffer) private static string ByteSpanToString(ReadOnlySpan<byte> buffer)
{ {