From 318c6c88c9bade3daba2d25c4fbcebe0e03ad617 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 18 Sep 2024 20:05:50 +1000
Subject: [PATCH] cleanup

---
 src/Verify/Verifier/InnerVerifier.cs | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Verify/Verifier/InnerVerifier.cs b/src/Verify/Verifier/InnerVerifier.cs
index 28ff74c8fd..cbd58c8efd 100644
--- a/src/Verify/Verifier/InnerVerifier.cs
+++ b/src/Verify/Verifier/InnerVerifier.cs
@@ -196,19 +196,33 @@ void InitForFileConvention(Namer namer, string typeAndMethod, string receivedPar
 
         getFileNames = target =>
         {
-            var suffix = target.Name is null ? "" : $"#{target.Name}";
+            if (target.Name is null)
+            {
+                return new(
+                    target.Extension,
+                    $"{pathPrefixReceived}.received.{target.Extension}",
+                    $"{pathPrefixVerified}.verified.{target.Extension}");
+            }
+
             return new(
                 target.Extension,
-                $"{pathPrefixReceived}{suffix}.received.{target.Extension}",
-                $"{pathPrefixVerified}{suffix}.verified.{target.Extension}");
+                $"{pathPrefixReceived}#{target.Name}.received.{target.Extension}",
+                $"{pathPrefixVerified}#{target.Name}.verified.{target.Extension}");
         };
         getIndexedFileNames = (target, index) =>
         {
-            var suffix = target.Name is null ? $"#{index}" : $"#{target.Name}.{index}";
+            if (target.Name is null)
+            {
+                return new(
+                    target.Extension,
+                    $"{pathPrefixReceived}#{index}.received.{target.Extension}",
+                    $"{pathPrefixVerified}#{index}.verified.{target.Extension}");
+            }
+
             return new(
                 target.Extension,
-                $"{pathPrefixReceived}{suffix}.received.{target.Extension}",
-                $"{pathPrefixVerified}{suffix}.verified.{target.Extension}");
+                $"{pathPrefixReceived}#{target.Name}.{index}.received.{target.Extension}",
+                $"{pathPrefixVerified}#{target.Name}.{index}.verified.{target.Extension}");
         };
 
         MatchingFileFinder.DeleteReceived(receivedPrefix, directory);