Refactor code

KyuubiRan · Jun 26, 2023 · d89919a · d89919a
1 parent 1103450
commit d89919a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Downloader/src/api/Provider.cpp b/Downloader/src/api/Provider.cpp
@@ -11,16 +11,16 @@ Provider::Provider(std::string name, std::string doc, features::downloader::Down
 std::string_view Provider::getDoc() const { return _doc; }
 std::string_view Provider::getName() const { return _name; }
 
-features::downloader::DownloadMirror Provider::GetEnum() const { return _enum; }
+features::downloader::DownloadMirror Provider::getEnum() const { return _enum; }
 
 Provider const *Provider::GetRegisteredByName(std::string name) {
-    auto vec = Provider::GetRegistered();
+    auto &vec = GetRegistered();
     return *std::ranges::find_if(vec, [&name](auto p) { return p->getName() == name; });
 }
 
 Provider const *Provider::GetRegisteredByEnum(features::downloader::DownloadMirror mirror) {
     auto &vec = GetRegistered();
-    return *std::ranges::find_if(vec, [&mirror](auto p) { return p->GetEnum() == mirror; });
+    return *std::ranges::find_if(vec, [&mirror](auto p) { return p->getEnum() == mirror; });
 }
 
 std::vector<const Provider *> Provider::_providers;
@@ -31,6 +31,7 @@ void Provider::UnRegisterAll() {
     for (const auto it : _providers) {
         delete it;
     }
+    _providers.clear();
 }
 
-}; // namespace api
+} // namespace api
diff --git a/Downloader/src/api/Provider.h b/Downloader/src/api/Provider.h
@@ -19,7 +19,7 @@ class Provider {
     std::string_view getDoc() const;
     std::string_view getName() const;
 
-    features::downloader::DownloadMirror GetEnum() const;
+    features::downloader::DownloadMirror getEnum() const;
 
     virtual std::optional<osu::Beatmap> searchBeatmap(const features::downloader::BeatmapInfo &) const = 0;
     virtual bool downloadBeatmap(const osu::Beatmap &) const = 0;
@@ -32,4 +32,4 @@ class Provider {
     static void UnRegisterAll();
 };
 
-}; // namespace api
+} // namespace api