fs/AllocatedPath: add method FromUTF8Throw()

src/PlaylistSave.cxx

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

src/fs/AllocatedPath.cxx

@@ -44,6 +44,16 @@ AllocatedPath::FromUTF8(const char *path_utf8)
 }
 
 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::FromUTF8(const char *path_utf8, Error &error)
 {
 	AllocatedPath path = FromUTF8(path_utf8);

src/fs/AllocatedPath.hxx

@@ -157,6 +157,13 @@ public:
 	gcc_pure gcc_nonnull_all
 	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
 	static AllocatedPath FromUTF8(const char *path_utf8, Error &error);
 

src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx

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

src/playlist/plugins/FlacPlaylistPlugin.cxx

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