oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Path: add method ToUTF8Throw()

Browse Source
This commit is contained in:
Max Kellermann
2018-07-18 16:30:46 +02:00
parent f87265a4d5
commit 32290d5eb8
10 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/plugins/LocalStorage.cxx
View File

@@ -51,7 +51,7 @@ class LocalStorage final : public Storage {
public:
explicit LocalStorage(Path _base_fs)
:base_fs(_base_fs), base_utf8(base_fs.ToUTF8()) {
:base_fs(_base_fs), base_utf8(base_fs.ToUTF8Throw()) {
assert(!base_fs.IsNull());
assert(!base_utf8.empty());
}
@@ -162,11 +162,11 @@ LocalDirectoryReader::Read() noexcept
if (SkipNameFS(name_fs.c_str()))
continue;
name_utf8 = name_fs.ToUTF8();
if (name_utf8.empty())
continue;
return name_utf8.c_str();
try {
name_utf8 = name_fs.ToUTF8Throw();
return name_utf8.c_str();
} catch (...) {
}
}
return nullptr;

11
src/storage/plugins/NfsStorage.cxx
View File

@@ -378,14 +378,13 @@ NfsListDirectoryOperation::CollectEntries(struct nfsdir *dir)
if (SkipNameFS(name_fs.c_str()))
continue;
std::string name_utf8 = name_fs.ToUTF8();
if (name_utf8.empty())
try {
entries.emplace_front(name_fs.ToUTF8Throw());
Copy(entries.front().info, *ent);
} catch (...) {
/* ignore files whose name cannot be converted
to UTF-8 */
continue;
entries.emplace_front(std::move(name_utf8));
Copy(entries.front().info, *ent);
}
}
}