smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Paths in the error are put in single quotes

This commit is contained in:
Veloman Yunkan 2024-03-05 19:40:34 +04:00 committed by Matthieu Gautier
parent 0168764f4c
commit 068555de38
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/name_mapper.cpp
View File

@ -47,11 +47,11 @@ void HumanReadableNameMapper::mapName(const Library& library, std::string name,
} else { } else {
const auto& currentBook = library.getBookById(bookId); const auto& currentBook = library.getBookById(bookId);
auto alreadyPresentPath = library.getBookById(m_nameToId[name]).getPath(); auto alreadyPresentPath = library.getBookById(m_nameToId[name]).getPath();
std::cerr << "Path collision: " << alreadyPresentPath std::cerr << "Path collision: '" << alreadyPresentPath
<< " and " << currentBook.getPath() << "' and '" << currentBook.getPath()
<< " can't share the same URL path '" << name << "'." << "' can't share the same URL path '" << name << "'."
<< " Therefore, only " << alreadyPresentPath << " Therefore, only '" << alreadyPresentPath
<< " will be served." << std::endl; << "' will be served." << std::endl;
} }
} }

18
test/name_mapper.cpp
View File

@ -63,19 +63,19 @@ public:
const std::string ZERO_FOUR_NAME_CONFLICT_MSG = const std::string ZERO_FOUR_NAME_CONFLICT_MSG =
"Path collision: /data/zero_four_2021-10.zim and" "Path collision: '/data/zero_four_2021-10.zim' and"
" /data/zero_four_2021-11.zim can't share the same URL path 'zero_four'." " '/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"; " Therefore, only '/data/zero_four_2021-10.zim' will be served.\n";
const std::string ZERO_SIX_NAME_CONFLICT_MSG = const std::string ZERO_SIX_NAME_CONFLICT_MSG =
"Path collision: /data/zërô + SIX.zim and " "Path collision: '/data/zërô + SIX.zim' and "
"/data/zero_plus_six.zim can't share the same URL path 'zero_plus_six'." "'/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"; " Therefore, only '/data/zërô + SIX.zim' will be served.\n";
const std::string ZERO_SEVEN_NAME_CONFLICT_MSG = const std::string ZERO_SEVEN_NAME_CONFLICT_MSG =
"Path collision: /data/subdir/zero_seven.zim and" "Path collision: '/data/subdir/zero_seven.zim' and"
" /data/zero_seven.zim can't share the same URL path 'zero_seven'." " '/data/zero_seven.zim' can't share the same URL path 'zero_seven'."
" Therefore, only /data/subdir/zero_seven.zim will be served.\n"; " Therefore, only '/data/subdir/zero_seven.zim' will be served.\n";
// Name conflicts in the default mode (without the --nodatealiases is off // Name conflicts in the default mode (without the --nodatealiases is off
const std::string DEFAULT_NAME_CONFLICTS = ZERO_SIX_NAME_CONFLICT_MSG const std::string DEFAULT_NAME_CONFLICTS = ZERO_SIX_NAME_CONFLICT_MSG