mewin/mijin2
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.mewin.de/mewin/mijin2

Browse Source
This commit is contained in:
Patrick Wuttke 2025-09-22 21:42:51 +02:00
commit 9ae424e968
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/mijin/util/string.hpp
View File

@ -1021,7 +1021,12 @@ bool convertStringType(const TFrom* strFrom, std::basic_string<TTo, TToTraits, T
return convertStringType(std::basic_string_view<TFrom>(strFrom), outString); return convertStringType(std::basic_string_view<TFrom>(strFrom), outString);
} }
template<typename TChar, typename TTraits, typename TAlloc = MIJIN_DEFAULT_ALLOCATOR<TChar>> struct StringQuoteOptions
{
bool replaceNewlines = false;
};
template<StringQuoteOptions options = {}, typename TChar, typename TTraits, typename TAlloc = MIJIN_DEFAULT_ALLOCATOR<TChar>>
std::basic_string<TChar, TTraits, TAlloc> quoted(std::basic_string_view<TChar, TTraits> input) std::basic_string<TChar, TTraits, TAlloc> quoted(std::basic_string_view<TChar, TTraits> input)
{ {
std::basic_string<TChar, TTraits> result; std::basic_string<TChar, TTraits> result;
@ -1029,8 +1034,28 @@ std::basic_string<TChar, TTraits, TAlloc> quoted(std::basic_string_view<TChar, T
result.push_back(TChar('"')); result.push_back(TChar('"'));
for (const TChar chr : input) for (const TChar chr : input)
{ {
if (chr == TChar('"') || chr == TChar('\\')) { switch (chr)
{
case TChar('"'):
case TChar('\\'):
result.push_back(TChar('\\')); result.push_back(TChar('\\'));
break;
case TChar('\n'):
if constexpr (options.replaceNewlines)
{
result.push_back(TChar('\\'));
result.push_back(TChar('n'));
continue;
}
break;
case TChar('\r'):
if constexpr (options.replaceNewlines)
{
result.push_back(TChar('\\'));
result.push_back(TChar('r'));
continue;
}
break;
} }
result.push_back(chr); result.push_back(chr);
} }
@ -1038,10 +1063,10 @@ std::basic_string<TChar, TTraits, TAlloc> quoted(std::basic_string_view<TChar, T
return result; return result;
} }
template<typename TChar, typename TTraits, typename TAlloc> template<StringQuoteOptions options = {}, typename TChar, typename TTraits, typename TAlloc>
std::basic_string<TChar, TTraits, TAlloc> quoted(const std::basic_string<TChar, TTraits, TAlloc>& input) std::basic_string<TChar, TTraits, TAlloc> quoted(const std::basic_string<TChar, TTraits, TAlloc>& input)
{ {
return quoted<TChar, TTraits, TAlloc>(std::basic_string_view(input)); return quoted<options, TChar, TTraits, TAlloc>(std::basic_string_view(input));
} }
} // namespace mijin } // namespace mijin

2
source/mijin/virtual_filesystem/filesystem.hpp
View File

@ -80,7 +80,7 @@ class FileSystemAdapter
public: public:
virtual ~FileSystemAdapter() = default; virtual ~FileSystemAdapter() = default;
[[deprecated("Will be removed ASAP")]] [[deprecated("Will be removed ASAP, use getKnownFolder(KnownFolder::USER_HOME) from platform/folders.hpp instead.")]]
[[nodiscard]] virtual fs::path getHomeFolder() { return {}; } // TODO: get rid of this ... [[nodiscard]] virtual fs::path getHomeFolder() { return {}; } // TODO: get rid of this ...
[[nodiscard]] virtual std::vector<FileInfo> listFiles(const fs::path& folder) = 0; [[nodiscard]] virtual std::vector<FileInfo> listFiles(const fs::path& folder) = 0;
[[nodiscard]] virtual FileInfo getFileInfo(const fs::path& file) = 0; [[nodiscard]] virtual FileInfo getFileInfo(const fs::path& file) = 0;

2
source/mijin/virtual_filesystem/relative.hpp
View File

@ -97,7 +97,7 @@ fs::path RelativeFileSystemAdapter<TWrapped>::appendPath(const fs::path& other)
else { else {
combinedPath /= other; combinedPath /= other;
} }
return combinedPath; return combinedPath.lexically_normal();
} }
namespace vfs_pipe namespace vfs_pipe