mirror/opustags
1
0
Fork 0
mirror of https://github.com/fmang/opustags.git synced 2024-11-10 07:27:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

convert tags to and from the user locale

Browse Source
This commit is contained in:
Frédéric Mangano-Tarumi 2018-12-09 12:18:17 -05:00
parent bb548f51d3
commit cc3bb6397d
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cli.cc
View File

@ -133,14 +133,34 @@ ot::status ot::parse_options(int argc, char** argv, ot::options& opt)
*/
void ot::print_comments(const std::list<std::string>& comments, FILE* output)
{
static ot::encoding_converter from_utf8("UTF-8", "//TRANSLIT");
std::string local;
bool info_lost = false;
bool bad_comments = false;
for (const std::string& comment : comments) {
fwrite(comment.data(), 1, comment.size(), output);
puts("");
ot::status rc = from_utf8(comment, local);
if (rc == ot::st::information_lost) {
info_lost = true;
} else if (rc != ot::st::ok) {
bad_comments = true;
continue;
}
fwrite(local.data(), 1, local.size(), output);
putchar('\n');
}
if (info_lost)
fputs("warning: Some tags have been transliterated to your system encoding.\n", stderr);
if (bad_comments)
fputs("warning: Some tags are not properly encoded and have not been displayed.\n", stderr);
}
/**
* \todo Report errors to the caller, so the program exits with a failure instead of skipping tags.
* This could wait until we throw ot::status instead of returning them.
*/
std::list<std::string> ot::read_comments(FILE* input)
{
static ot::encoding_converter to_utf8("", "UTF-8");
std::list<std::string> comments;
char* line = nullptr;
size_t buflen = 0;
@ -154,7 +174,12 @@ std::list<std::string> ot::read_comments(FILE* input)
fputs("warning: skipping malformed tag\n", stderr);
continue;
}
comments.emplace_back(line, nread);
std::string utf8;
ot::status rc = to_utf8(line, nread, utf8);
if (rc == ot::st::ok)
comments.emplace_back(std::move(utf8));
else
fprintf(stderr, "warning: Skipping tag with UTF-8 conversion error: %s\n", rc.message.c_str());
}
free(line);
return comments;

3
src/opustags.cc
View File

@ -7,12 +7,15 @@
#include <opustags.h>
#include <locale.h>
/**
* Main function of the opustags binary.
*
* Does practically nothing but call the cli module.
*/
int main(int argc, char** argv) {
setlocale(LC_ALL, "");
ot::options opt;
ot::status rc = ot::parse_options(argc, argv, opt);
if (rc == ot::st::ok)