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

fs/AllocatedPath: add method FromUTF8Throw()

Browse Source
This commit is contained in:
Max Kellermann 2016-04-12 21:20:32 +02:00
parent 6513ff92a7
commit fc3e0dfcd1
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/PlaylistSave.cxx
View File

@ -43,9 +43,8 @@ playlist_print_song(BufferedOutputStream &os, const DetachedSong &song)
: song.GetURI(); : song.GetURI();
try { try {
const auto uri_fs = AllocatedPath::FromUTF8(uri_utf8); const auto uri_fs = AllocatedPath::FromUTF8Throw(uri_utf8);
if (!uri_fs.IsNull()) os.Format("%s\n", NarrowPath(uri_fs).c_str());
os.Format("%s\n", NarrowPath(uri_fs).c_str());
} catch (const std::runtime_error &) { } catch (const std::runtime_error &) {
} }
} }
@ -61,7 +60,7 @@ playlist_print_uri(BufferedOutputStream &os, const char *uri)
? map_uri_fs(uri) ? map_uri_fs(uri)
: :
#endif #endif
AllocatedPath::FromUTF8(uri); AllocatedPath::FromUTF8Throw(uri);
if (!path.IsNull()) if (!path.IsNull())
os.Format("%s\n", NarrowPath(path).c_str()); os.Format("%s\n", NarrowPath(path).c_str());

10
src/fs/AllocatedPath.cxx
View File

@ -43,6 +43,16 @@ AllocatedPath::FromUTF8(const char *path_utf8)
#endif #endif
} }
AllocatedPath
AllocatedPath::FromUTF8Throw(const char *path_utf8)
{
#if defined(HAVE_FS_CHARSET) || defined(WIN32)
return AllocatedPath(::PathFromUTF8(path_utf8));
#else
return FromFS(path_utf8);
#endif
}
AllocatedPath AllocatedPath
AllocatedPath::FromUTF8(const char *path_utf8, Error &error) AllocatedPath::FromUTF8(const char *path_utf8, Error &error)
{ {

7
src/fs/AllocatedPath.hxx
View File

@ -157,6 +157,13 @@ public:
gcc_pure gcc_nonnull_all gcc_pure gcc_nonnull_all
static AllocatedPath FromUTF8(const char *path_utf8); static AllocatedPath FromUTF8(const char *path_utf8);
/**
* Convert a UTF-8 C string to an #AllocatedPath instance.
* Throws a std::runtime_error on error.
*/
gcc_pure gcc_nonnull_all
static AllocatedPath FromUTF8Throw(const char *path_utf8);
gcc_pure gcc_nonnull_all gcc_pure gcc_nonnull_all
static AllocatedPath FromUTF8(const char *path_utf8, Error &error); static AllocatedPath FromUTF8(const char *path_utf8, Error &error);

4
src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
View File

@ -96,9 +96,7 @@ embcue_playlist_open_uri(const char *uri,
/* only local files supported */ /* only local files supported */
return nullptr; return nullptr;
const auto path_fs = AllocatedPath::FromUTF8(uri); const auto path_fs = AllocatedPath::FromUTF8Throw(uri);
if (path_fs.IsNull())
return nullptr;
const auto playlist = new EmbeddedCuePlaylist(); const auto playlist = new EmbeddedCuePlaylist();

4
src/playlist/plugins/FlacPlaylistPlugin.cxx
View File

@ -94,9 +94,7 @@ flac_playlist_open_uri(const char *uri,
/* only local files supported */ /* only local files supported */
return nullptr; return nullptr;
const auto path_fs = AllocatedPath::FromUTF8(uri); const auto path_fs = AllocatedPath::FromUTF8Throw(uri);
if (path_fs.IsNull())
return nullptr;
const NarrowPath narrow_path_fs(path_fs); const NarrowPath narrow_path_fs(path_fs);