Paths in the error are put in single quotes

kiwix · Mar 6, 2024 · 068555d · 068555d
1 parent 0168764
commit 068555d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/name_mapper.cpp b/src/name_mapper.cpp
@@ -47,11 +47,11 @@ void HumanReadableNameMapper::mapName(const Library& library, std::string name,
   } else {
     const auto& currentBook = library.getBookById(bookId);
     auto alreadyPresentPath = library.getBookById(m_nameToId[name]).getPath();
-    std::cerr << "Path collision: " << alreadyPresentPath
-              << " and " << currentBook.getPath()
-              << " can't share the same URL path '" << name << "'."
-              << " Therefore, only " << alreadyPresentPath
-              << " will be served." << std::endl;
+    std::cerr << "Path collision: '" << alreadyPresentPath
+              << "' and '" << currentBook.getPath()
+              << "' can't share the same URL path '" << name << "'."
+              << " Therefore, only '" << alreadyPresentPath
+              << "' will be served." << std::endl;
   }
 }
 

diff --git a/test/name_mapper.cpp b/test/name_mapper.cpp
@@ -63,19 +63,19 @@ class CapturedStderr
 
 
 const std::string ZERO_FOUR_NAME_CONFLICT_MSG =
-    "Path collision: /data/zero_four_2021-10.zim and"
-    " /data/zero_four_2021-11.zim can't share the same URL path 'zero_four'."
-    " Therefore, only /data/zero_four_2021-10.zim will be served.\n";
+    "Path collision: '/data/zero_four_2021-10.zim' and"
+    " '/data/zero_four_2021-11.zim' can't share the same URL path 'zero_four'."
+    " Therefore, only '/data/zero_four_2021-10.zim' will be served.\n";
 
 const std::string ZERO_SIX_NAME_CONFLICT_MSG =
-    "Path collision: /data/zërô + SIX.zim and "
-    "/data/zero_plus_six.zim can't share the same URL path 'zero_plus_six'."
-    " Therefore, only /data/zërô + SIX.zim will be served.\n";
+    "Path collision: '/data/zërô + SIX.zim' and "
+    "'/data/zero_plus_six.zim' can't share the same URL path 'zero_plus_six'."
+    " Therefore, only '/data/zërô + SIX.zim' will be served.\n";
 
 const std::string ZERO_SEVEN_NAME_CONFLICT_MSG =
-    "Path collision: /data/subdir/zero_seven.zim and"
-    " /data/zero_seven.zim can't share the same URL path 'zero_seven'."
-    " Therefore, only /data/subdir/zero_seven.zim will be served.\n";
+    "Path collision: '/data/subdir/zero_seven.zim' and"
+    " '/data/zero_seven.zim' can't share the same URL path 'zero_seven'."
+    " Therefore, only '/data/subdir/zero_seven.zim' will be served.\n";
 
 // Name conflicts in the default mode (without the --nodatealiases is off
 const std::string DEFAULT_NAME_CONFLICTS = ZERO_SIX_NAME_CONFLICT_MSG