From 5791f51cccea1d4e5365456c8da89dbac0dd3ec0 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Fri, 28 Feb 2025 12:39:48 +0100
Subject: improve error handling (#289)

* clearer errors
* quicker abort
* handle deleted local files
* simplify parallellwork error handling
* don't finish progress on destructor - gives wrong impression
* graceful ctrl-c handling
---
 src/zenutil/chunkedcontent.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/zenutil/chunkedcontent.cpp')

diff --git a/src/zenutil/chunkedcontent.cpp b/src/zenutil/chunkedcontent.cpp
index a41b71972..6dc2a20d8 100644
--- a/src/zenutil/chunkedcontent.cpp
+++ b/src/zenutil/chunkedcontent.cpp
@@ -92,7 +92,8 @@ namespace {
 					   tsl::robin_map<IoHash, uint32_t, IoHash::Hasher>& RawHashToSequenceRawHashIndex,
 					   RwLock&											 Lock,
 					   const std::filesystem::path&						 FolderPath,
-					   uint32_t											 PathIndex)
+					   uint32_t											 PathIndex,
+					   std::atomic<bool>&								 AbortFlag)
 	{
 		const uint64_t				 RawSize = OutChunkedContent.RawSizes[PathIndex];
 		const std::filesystem::path& Path	 = OutChunkedContent.Paths[PathIndex];
@@ -105,7 +106,7 @@ namespace {
 		{
 			ChunkedInfoWithSource Chunked;
 			const bool			  DidChunking =
-				InChunkingController.ProcessFile((FolderPath / Path).make_preferred(), RawSize, Chunked, Stats.BytesHashed);
+				InChunkingController.ProcessFile((FolderPath / Path).make_preferred(), RawSize, Chunked, Stats.BytesHashed, AbortFlag);
 			if (DidChunking)
 			{
 				Lock.WithExclusiveLock([&]() {
@@ -753,15 +754,13 @@ ChunkFolderContent(ChunkingStatistics&												 Stats,
 													 RawHashToSequenceRawHashIndex,
 													 Lock,
 													 RootPath,
-													 PathIndex);
+													 PathIndex,
+													 AbortFlag);
 						Lock.WithExclusiveLock([&]() { Result.RawHashes[PathIndex] = RawHash; });
 						Stats.FilesProcessed++;
 					}
 				},
-				[&, PathIndex](const std::exception& Ex, std::atomic<bool>& AbortFlag) {
-					ZEN_CONSOLE("Failed scanning file {}. Reason: {}", Result.Paths[PathIndex], Ex.what());
-					AbortFlag = true;
-				});
+				Work.DefaultErrorFunction());
 		}
 
 		Work.Wait(UpdateInteralMS, [&](bool IsAborted, std::ptrdiff_t PendingWork) {
-- 
cgit v1.2.3