From f3f6e51f71802aba46d516bcf664bced872e2f2c Mon Sep 17 00:00:00 2001 From: MouriNaruto Date: Wed, 10 Jul 2024 23:58:34 +0800 Subject: [PATCH] Simplify the definition. --- NanaGet/NanaGetCore.h | 4 ++-- NanaGet/TaskItem.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NanaGet/NanaGetCore.h b/NanaGet/NanaGetCore.h index d05a6a5..82e2be4 100644 --- a/NanaGet/NanaGetCore.h +++ b/NanaGet/NanaGetCore.h @@ -74,14 +74,14 @@ namespace NanaGet struct Aria2TaskInformation { std::string Gid; - NanaGet::Aria2::DownloadStatus Status; + Aria2::DownloadStatus Status; std::uint64_t TotalLength; std::uint64_t CompletedLength; std::uint64_t DownloadSpeed; std::uint64_t UploadSpeed; std::string InfoHash; std::string Dir; - std::vector Files; + std::vector Files; std::string FriendlyName; }; diff --git a/NanaGet/TaskItem.cpp b/NanaGet/TaskItem.cpp index 56b8572..467824c 100644 --- a/NanaGet/TaskItem.cpp +++ b/NanaGet/TaskItem.cpp @@ -42,9 +42,9 @@ namespace winrt::NanaGet::implementation hstring Result; std::set Uris; - for (NanaGet::Aria2::FileInformation const& File : Information.Files) + for (Aria2::FileInformation const& File : Information.Files) { - for (NanaGet::Aria2::UriInformation const& Item : File.Uris) + for (Aria2::UriInformation const& Item : File.Uris) { Uris.emplace(winrt::to_hstring(Item.Uri)); } @@ -62,22 +62,22 @@ namespace winrt::NanaGet::implementation switch (Information.Status) { - case NanaGet::Aria2::DownloadStatus::Active: + case Aria2::DownloadStatus::Active: this->Status.Value = TaskStatus::Active; break; - case NanaGet::Aria2::DownloadStatus::Waiting: + case Aria2::DownloadStatus::Waiting: this->Status.Value = TaskStatus::Waiting; break; - case NanaGet::Aria2::DownloadStatus::Paused: + case Aria2::DownloadStatus::Paused: this->Status.Value = TaskStatus::Paused; break; - case NanaGet::Aria2::DownloadStatus::Error: + case Aria2::DownloadStatus::Error: this->Status.Value = TaskStatus::Error; break; - case NanaGet::Aria2::DownloadStatus::Complete: + case Aria2::DownloadStatus::Complete: this->Status.Value = TaskStatus::Complete; break; - case NanaGet::Aria2::DownloadStatus::Removed: + case Aria2::DownloadStatus::Removed: this->Status.Value = TaskStatus::Removed; break; default: