RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:48:14 +00:00
Code Issues Activity Actions

sql: Port to Core::Stream

Browse source
This commit is contained in:
Sam Atkins 2022-09-20 11:43:48 +01:00 • committed by Linus Groh
parent f22d7ddd98
commit 4c3d2267db
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Utilities/sql.cpp
View file

@ -11,6 +11,7 @@
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibCore/Stream.h>
#include <LibLine/Editor.h> #include <LibLine/Editor.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <LibSQL/AST/Lexer.h> #include <LibSQL/AST/Lexer.h>
@ -170,30 +171,42 @@ private:
AK::RefPtr<SQL::SQLClient> m_sql_client { nullptr }; AK::RefPtr<SQL::SQLClient> m_sql_client { nullptr };
int m_connection_id { 0 }; int m_connection_id { 0 };
Core::EventLoop m_loop; Core::EventLoop m_loop;
RefPtr<Core::File> m_input_file { nullptr }; OwnPtr<Core::Stream::BufferedFile> m_input_file { nullptr };
bool m_quit_when_files_read { false }; bool m_quit_when_files_read { false };
Vector<String> m_input_file_chain {}; Vector<String> m_input_file_chain {};
Array<u8, PAGE_SIZE> m_buffer {};
Optional<String> get_line() Optional<String> get_line()
{ {
if (!m_input_file && !m_input_file_chain.is_empty()) { if (!m_input_file && !m_input_file_chain.is_empty()) {
auto file_name = m_input_file_chain.take_first(); auto file_name = m_input_file_chain.take_first();
auto file_or_error = Core::File::open(file_name, Core::OpenMode::ReadOnly); auto file_or_error = Core::Stream::File::open(file_name, Core::Stream::OpenMode::Read);
if (file_or_error.is_error()) { if (file_or_error.is_error()) {
warnln("Input file {} could not be opened: {}", file_name, file_or_error.error()); warnln("Input file {} could not be opened: {}", file_name, file_or_error.error());
return {}; return {};
} }
m_input_file = file_or_error.value();
auto buffered_file_or_error = Core::Stream::BufferedFile::create(file_or_error.release_value());
if (buffered_file_or_error.is_error()) {
warnln("Input file {} could not be buffered: {}", file_name, buffered_file_or_error.error());
return {};
}
m_input_file = buffered_file_or_error.release_value();
} }
if (m_input_file) { if (m_input_file) {
auto line = m_input_file->read_line(); auto line = m_input_file->read_line(m_buffer);
if (m_input_file->eof()) { if (line.is_error()) {
warnln("Failed to read line: {}", line.error());
return {};
}
if (m_input_file->is_eof()) {
m_input_file->close(); m_input_file->close();
m_input_file = nullptr; m_input_file = nullptr;
if (m_quit_when_files_read && m_input_file_chain.is_empty()) if (m_quit_when_files_read && m_input_file_chain.is_empty())
return {}; return {};
} }
return line; return line.release_value();
// If the last file is exhausted but m_quit_when_files_read is false // If the last file is exhausted but m_quit_when_files_read is false
// we fall through to the standard reading from the editor behaviour // we fall through to the standard reading from the editor behaviour
} }