From 183b054695ef1c63ae9c4fbb1e6423de229cefb0 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Mon, 12 Sep 2022 21:06:25 +0100 Subject: [PATCH] SoundPlayer: Port M3UParser to Core::Stream Also make the path parameter a StringView, since that's what gets passed in. --- Userland/Applications/SoundPlayer/M3UParser.cpp | 9 ++++----- Userland/Applications/SoundPlayer/M3UParser.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Userland/Applications/SoundPlayer/M3UParser.cpp b/Userland/Applications/SoundPlayer/M3UParser.cpp index a09a40caa5..8f8a066d30 100644 --- a/Userland/Applications/SoundPlayer/M3UParser.cpp +++ b/Userland/Applications/SoundPlayer/M3UParser.cpp @@ -9,17 +9,16 @@ #include #include #include -#include +#include M3UParser::M3UParser() { } -NonnullOwnPtr M3UParser::from_file(const String path) +NonnullOwnPtr M3UParser::from_file(StringView path) { - auto file_result = Core::File::open(path, Core::OpenMode::ReadOnly); - VERIFY(!file_result.is_error()); - auto contents = file_result.value()->read_all(); + auto file_result = Core::Stream::File::open(path, Core::Stream::OpenMode::Read).release_value_but_fixme_should_propagate_errors(); + auto contents = file_result->read_all().release_value_but_fixme_should_propagate_errors(); auto use_utf8 = path.ends_with(".m3u8"sv, CaseSensitivity::CaseInsensitive); return from_memory(String { contents, NoChomp }, use_utf8); } diff --git a/Userland/Applications/SoundPlayer/M3UParser.h b/Userland/Applications/SoundPlayer/M3UParser.h index 31d3a7d71e..6965fe8fb3 100644 --- a/Userland/Applications/SoundPlayer/M3UParser.h +++ b/Userland/Applications/SoundPlayer/M3UParser.h @@ -32,7 +32,7 @@ struct M3UEntry { class M3UParser { public: - static NonnullOwnPtr from_file(String path); + static NonnullOwnPtr from_file(StringView path); static NonnullOwnPtr from_memory(String const& m3u_contents, bool utf8); NonnullOwnPtr> parse(bool include_extended_info);