loose chunk filtering bug when using wildcards (#654)

* fix filtering of loose chunks when downloading with a filter
add tests

* changelog

* move InlineRemoveUnusedHashes

* remove extra braces

1 files changed, 8 insertions, 14 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 14686a173..fcda6e809 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -1267,22 +1267,13 @@ namespace {
 				if (!DeletedPaths.empty())
 				{
 					OutRemoteContent = DeletePathsFromChunkedContent(OutRemoteContent, DeletedPaths);
-
-					tsl::robin_set<IoHash, IoHash::Hasher> UsedLooseChunkHashes;
-					UsedLooseChunkHashes.insert(OutRemoteContent.RawHashes.begin(), OutRemoteContent.RawHashes.end());
-					for (auto It = OutLooseChunkHashes.begin(); It != OutLooseChunkHashes.end();)
-					{
-						if (!UsedLooseChunkHashes.contains(*It))
-						{
-							It = OutLooseChunkHashes.erase(It);
-						}
-						else
-						{
-							It++;
-						}
-					}
+					InlineRemoveUnusedHashes(OutLooseChunkHashes, OutRemoteContent.ChunkedContent.ChunkHashes);
 				}
 			}
+
+#if ZEN_BUILD_DEBUG
+			ValidateChunkedFolderContent(OutRemoteContent, OutBlockDescriptions, OutLooseChunkHashes);
+#endif	// ZEN_BUILD_DEBUG
 		};
 
 		OutPartContents.resize(1);
@@ -1846,6 +1837,9 @@ namespace {
 											   Options.IncludeWildcards,
 											   Options.ExcludeWildcards,
 											   LocalFolderContent);
+#if ZEN_BUILD_DEBUG
+				ValidateChunkedFolderContent(LocalContent, {}, LocalContent.ChunkedContent.ChunkHashes);
+#endif	// ZEN_BUILD_DEBUG
 			}
 			else
 			{