From 11d32517c2f6f538209c893c6b0b24572fba1a36 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Fri, 3 Feb 2023 21:43:55 +0800 Subject: feat: change the log style in source files --- src/core/thread/FileReadTask.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/core/thread/FileReadTask.cpp') diff --git a/src/core/thread/FileReadTask.cpp b/src/core/thread/FileReadTask.cpp index 3a235390..1ac23a89 100644 --- a/src/core/thread/FileReadTask.cpp +++ b/src/core/thread/FileReadTask.cpp @@ -26,8 +26,6 @@ #include "core/thread/FileReadTask.h" -#include - namespace GpgFrontend::UI { FileReadTask::FileReadTask(std::string path) { @@ -48,18 +46,18 @@ void FileReadTask::Run() { SetFinishAfterRun(false); if (is_regular_file(read_file_path_)) { - LOG(INFO) << "read open file" << read_file_path_; + SPDLOG_INFO("read open file: {}", read_file_path_.u8string()); target_file_.setFileName( QString::fromStdString(read_file_path_.u8string())); target_file_.open(QIODevice::ReadOnly); if (!(target_file_.isOpen() && target_file_.isReadable())) { - LOG(ERROR) << "file not open or not readable"; + SPDLOG_ERROR("file not open or not readable"); if (target_file_.isOpen()) target_file_.close(); return; } - LOG(INFO) << "started reading" << read_file_path_; + SPDLOG_INFO("started reading: {}", read_file_path_.u8string()); read_bytes(); } else { emit SignalFileBytesReadEnd(); @@ -70,10 +68,10 @@ void FileReadTask::read_bytes() { QByteArray read_buffer; if (!target_file_.atEnd() && (read_buffer = target_file_.read(buffer_size_)).size() > 0) { - LOG(INFO) << "read bytes" << read_buffer.size(); + SPDLOG_INFO("read bytes: {}", read_buffer.size()); emit SignalFileBytesRead(std::move(read_buffer)); } else { - LOG(INFO) << "read bytes end"; + SPDLOG_INFO("read bytes end"); emit SignalFileBytesReadEnd(); // finish task emit SignalTaskFinished(); @@ -81,7 +79,7 @@ void FileReadTask::read_bytes() { } FileReadTask::~FileReadTask() { - LOG(INFO) << "close file" << read_file_path_; + SPDLOG_INFO("close file: {}", read_file_path_.u8string()); if (target_file_.isOpen()) target_file_.close(); } -- cgit v1.2.3 From 6a75817c85b0d4a97cea82ad2331736cff9913cf Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 11 Feb 2023 22:10:09 +0800 Subject: fix: reduce info level logs --- src/core/thread/FileReadTask.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/thread/FileReadTask.cpp') diff --git a/src/core/thread/FileReadTask.cpp b/src/core/thread/FileReadTask.cpp index 1ac23a89..0f7d11c3 100644 --- a/src/core/thread/FileReadTask.cpp +++ b/src/core/thread/FileReadTask.cpp @@ -46,7 +46,7 @@ void FileReadTask::Run() { SetFinishAfterRun(false); if (is_regular_file(read_file_path_)) { - SPDLOG_INFO("read open file: {}", read_file_path_.u8string()); + SPDLOG_DEBUG("read open file: {}", read_file_path_.u8string()); target_file_.setFileName( QString::fromStdString(read_file_path_.u8string())); @@ -57,7 +57,7 @@ void FileReadTask::Run() { if (target_file_.isOpen()) target_file_.close(); return; } - SPDLOG_INFO("started reading: {}", read_file_path_.u8string()); + SPDLOG_DEBUG("started reading: {}", read_file_path_.u8string()); read_bytes(); } else { emit SignalFileBytesReadEnd(); @@ -68,10 +68,10 @@ void FileReadTask::read_bytes() { QByteArray read_buffer; if (!target_file_.atEnd() && (read_buffer = target_file_.read(buffer_size_)).size() > 0) { - SPDLOG_INFO("read bytes: {}", read_buffer.size()); + SPDLOG_DEBUG("read bytes: {}", read_buffer.size()); emit SignalFileBytesRead(std::move(read_buffer)); } else { - SPDLOG_INFO("read bytes end"); + SPDLOG_DEBUG("read bytes end"); emit SignalFileBytesReadEnd(); // finish task emit SignalTaskFinished(); @@ -79,7 +79,7 @@ void FileReadTask::read_bytes() { } FileReadTask::~FileReadTask() { - SPDLOG_INFO("close file: {}", read_file_path_.u8string()); + SPDLOG_DEBUG("close file: {}", read_file_path_.u8string()); if (target_file_.isOpen()) target_file_.close(); } -- cgit v1.2.3 From da1004ab71c382bde8af2b584e693426227abe0e Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 18 Feb 2023 03:08:53 +0800 Subject: feat: improve task execute system --- src/core/thread/FileReadTask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/thread/FileReadTask.cpp') diff --git a/src/core/thread/FileReadTask.cpp b/src/core/thread/FileReadTask.cpp index 0f7d11c3..0888e029 100644 --- a/src/core/thread/FileReadTask.cpp +++ b/src/core/thread/FileReadTask.cpp @@ -28,7 +28,7 @@ namespace GpgFrontend::UI { -FileReadTask::FileReadTask(std::string path) { +FileReadTask::FileReadTask(std::string path) : Task("file_read_task") { connect(this, &FileReadTask::SignalFileBytesReadNext, this, &FileReadTask::read_bytes); -- cgit v1.2.3 From 3b062240c399bc7fb24fde3442db407386c17161 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 18 Feb 2023 19:12:03 +0800 Subject: fix: improve the task execution model --- src/core/thread/FileReadTask.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/thread/FileReadTask.cpp') diff --git a/src/core/thread/FileReadTask.cpp b/src/core/thread/FileReadTask.cpp index 0888e029..73954d28 100644 --- a/src/core/thread/FileReadTask.cpp +++ b/src/core/thread/FileReadTask.cpp @@ -73,8 +73,8 @@ void FileReadTask::read_bytes() { } else { SPDLOG_DEBUG("read bytes end"); emit SignalFileBytesReadEnd(); - // finish task - emit SignalTaskFinished(); + // announce finish task + emit SignalTaskRunnableEnd(0); } } -- cgit v1.2.3