Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format: fix error reporting with wide strings

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-11 00:59:24 +01:00
parent 25ac152b0d
commit 50bfec9646
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/format.cpp
View File

@@ -29,9 +29,12 @@ template <typename CharT> using string = std::basic_string<CharT>;
template <typename CharT> using iterator = typename std::basic_string<CharT>::const_iterator; template <typename CharT> using iterator = typename std::basic_string<CharT>::const_iterator;
template <typename CharT> using expressions = std::vector<Format::Expression<CharT>>; template <typename CharT> using expressions = std::vector<Format::Expression<CharT>>;
std::string invalidCharacter(char c) template <typename CharT>
std::string invalidCharacter(CharT c)
{ {
return "invalid character '" + boost::lexical_cast<std::string>(c) + "'"; return "invalid character '"
+ convertString<char, CharT>::apply(boost::lexical_cast<string<CharT>>(c))
+ "'";
} }
template <typename CharT> template <typename CharT>

18
src/format.h
View File

@@ -21,12 +21,12 @@
#ifndef NCMPCPP_HAVE_FORMAT_H #ifndef NCMPCPP_HAVE_FORMAT_H
#define NCMPCPP_HAVE_FORMAT_H #define NCMPCPP_HAVE_FORMAT_H
#include <boost/locale/encoding_utf.hpp>
#include <boost/variant.hpp> #include <boost/variant.hpp>
#include "menu.h" #include "menu.h"
#include "song.h" #include "song.h"
#include "strbuffer.h" #include "strbuffer.h"
#include "utility/functional.h"
#include "utility/wide_string.h" #include "utility/wide_string.h"
namespace Format { namespace Format {
@@ -125,7 +125,7 @@ struct Printer: boost::static_visitor<bool>
StringT tags; StringT tags;
if (m_song != nullptr) if (m_song != nullptr)
{ {
tags = convertString<std::is_same<char, CharT>::value, std::string>::apply( tags = convertString<CharT, char>::apply(
m_song->getTags(st.function()) m_song->getTags(st.function())
); );
} }
@@ -177,20 +177,6 @@ struct Printer: boost::static_visitor<bool>
} }
private: private:
// convert string to appropriate type
template <bool AreSame, typename ValueT>
struct convertString {
static const StringT &apply(const ValueT &s) {
return s;
}
};
template <typename ValueT>
struct convertString<false, ValueT> {
static StringT apply(const ValueT &s) {
return boost::locale::conv::utf_to_utf<CharT>(s);
}
};
// generic version for streams (buffers, menus) // generic version for streams (buffers, menus)
template <typename ValueT, typename OutputStreamT> template <typename ValueT, typename OutputStreamT>
struct output_ { struct output_ {

20
src/utility/functional.h
View File

@@ -21,6 +21,7 @@
#ifndef NCMPCPP_UTILITY_FUNCTIONAL_H #ifndef NCMPCPP_UTILITY_FUNCTIONAL_H
#define NCMPCPP_UTILITY_FUNCTIONAL_H #define NCMPCPP_UTILITY_FUNCTIONAL_H
#include <boost/locale/encoding_utf.hpp>
#include <utility> #include <utility>
// identity function object // identity function object
@@ -34,4 +35,23 @@ struct id_
} }
}; };
// convert string to appropriate type
template <typename TargetT, typename SourceT>
struct convertString
{
static std::basic_string<TargetT> apply(const std::basic_string<SourceT> &s)
{
return boost::locale::conv::utf_to_utf<TargetT>(s);
}
};
template <typename TargetT>
struct convertString<TargetT, TargetT>
{
static const std::basic_string<TargetT> &apply(const std::basic_string<TargetT> &s)
{
return s;
}
};
#endif // NCMPCPP_UTILITY_FUNCTIONAL_H #endif // NCMPCPP_UTILITY_FUNCTIONAL_H