chore: rename res.loaded -> res.valid

Author: MistEO

source/MaaFramework/API/MaaResource.cpp

@@ -71,7 +71,7 @@ MaaBool MaaResourceLoaded(MaaResourceHandle res)
         return false;
     }
 
-    return res->loaded();
+    return res->valid();
 }
 
 MaaBool MaaResourceSetOption(MaaResourceHandle res, MaaResOption key, MaaOptionValue value, MaaOptionValueSize val_size)

source/MaaFramework/API/MaaTypes.h

@@ -27,7 +27,7 @@ struct MaaResourceAPI : public MaaInstanceSink
     virtual MaaResId post_path(std::filesystem::path path) = 0;
     virtual MaaStatus status(MaaResId res_id) const = 0;
     virtual MaaStatus wait(MaaResId res_id) const = 0;
-    virtual MaaBool loaded() const = 0;
+    virtual MaaBool valid() const = 0;
 
     virtual std::string get_hash() const = 0;
     virtual std::vector<std::string> get_task_list() const = 0;

source/MaaFramework/Instance/InstanceMgr.cpp

@@ -37,8 +37,8 @@ bool InstanceMgr::bind_resource(MaaResourceAPI* resource)
         return false;
     }
 
-    if (!resource->loaded()) {
-        LogWarn << "Resource not loaded";
+    if (!resource->valid()) {
+        LogWarn << "Resource not valid";
     }
 
     if (resource_) {
@@ -72,7 +72,7 @@ bool InstanceMgr::bind_controller(MaaControllerAPI* controller)
 
 bool InstanceMgr::inited() const
 {
-    return resource_ && controller_ && resource_->loaded() && controller_->connected();
+    return resource_ && controller_ && resource_->valid() && controller_->connected();
 }
 
 bool InstanceMgr::set_option(MaaInstOption key, MaaOptionValue value, MaaOptionValueSize val_size)

source/MaaFramework/Resource/PipelineResMgr.cpp

@@ -62,7 +62,7 @@ bool PipelineResMgr::load_all_json(const std::filesystem::path& path)
         return false;
     }
 
-    bool loaded = false;
+    bool valid = false;
 
     std::set<std::string> existing_keys;
     for (auto& entry : std::filesystem::recursive_directory_iterator(path)) {
@@ -89,10 +89,10 @@ bool PipelineResMgr::load_all_json(const std::filesystem::path& path)
             return false;
         }
 
-        loaded = true;
+        valid = true;
     }
 
-    return loaded;
+    return valid;
 }
 
 bool PipelineResMgr::open_and_parse_file(const std::filesystem::path& path, std::set<std::string>& existing_keys)
@@ -416,8 +416,8 @@ bool PipelineResMgr::parse_recognition(const json::value& input, Recognition::Ty
     case Type::Custom:
         out_param = CustomRecognizerParam {};
         return parse_custom_recognition_param(input, std::get<CustomRecognizerParam>(out_param),
-                                             same_type ? std::get<CustomRecognizerParam>(default_param)
-                                                       : CustomRecognizerParam {});
+                                              same_type ? std::get<CustomRecognizerParam>(default_param)
+                                                        : CustomRecognizerParam {});
     default:
         LogError << "Unknown recognition" << VAR(static_cast<int>(out_type));
         return false;
@@ -607,8 +607,8 @@ bool PipelineResMgr::parse_ocrer_param(const json::value& input, MAA_VISION_NS::
 }
 
 bool PipelineResMgr::parse_custom_recognition_param(const json::value& input,
-                                                   MAA_VISION_NS::CustomRecognizerParam& output,
-                                                   const MAA_VISION_NS::CustomRecognizerParam& default_value)
+                                                    MAA_VISION_NS::CustomRecognizerParam& output,
+                                                    const MAA_VISION_NS::CustomRecognizerParam& default_value)
 {
     if (!get_and_check_value(input, "custom_recognition", output.name, default_value.name) &&
         !get_and_check_value(input, "custom_recognizer", output.name, default_value.name)) {

source/MaaFramework/Resource/ResourceMgr.cpp

@@ -39,7 +39,7 @@ MaaResId ResourceMgr::post_path(std::filesystem::path path)
 {
     LogInfo << VAR(path);
 
-    loaded_ = false;
+    valid_ = false;
     hash_cache_.clear();
 
     if (!res_loader_) {
@@ -69,9 +69,9 @@ MaaStatus ResourceMgr::wait(MaaResId res_id) const
     return res_loader_->status(res_id);
 }
 
-MaaBool ResourceMgr::loaded() const
+MaaBool ResourceMgr::valid() const
 {
-    return loaded_;
+    return valid_;
 }
 
 // https://stackoverflow.com/questions/20511347/a-good-hash-function-for-a-vector
@@ -133,12 +133,12 @@ bool ResourceMgr::run_load(typename AsyncRunner<std::filesystem::path>::Id id, s
 
     notifier.notify(MaaMsg_Resource_StartLoading, details);
 
-    loaded_ = load(path);
+    valid_ = load(path);
 
     details.emplace("hash", get_hash());
-    notifier.notify(loaded_ ? MaaMsg_Resource_LoadingCompleted : MaaMsg_Resource_LoadingFailed, details);
+    notifier.notify(valid_ ? MaaMsg_Resource_LoadingCompleted : MaaMsg_Resource_LoadingFailed, details);
 
-    return loaded_;
+    return valid_;
 }
 
 bool ResourceMgr::load(const std::filesystem::path& path)

source/MaaFramework/Resource/ResourceMgr.h

@@ -24,7 +24,7 @@ class ResourceMgr : public MaaResourceAPI
 
     virtual MaaStatus status(MaaResId res_id) const override;
     virtual MaaStatus wait(MaaResId res_id) const override;
-    virtual MaaBool loaded() const override;
+    virtual MaaBool valid() const override;
 
     virtual std::string get_hash() const override;
     virtual std::vector<std::string> get_task_list() const override;
@@ -52,7 +52,7 @@ class ResourceMgr : public MaaResourceAPI
 private:
     std::vector<std::filesystem::path> paths_;
     mutable std::string hash_cache_;
-    std::atomic_bool loaded_ = true;
+    std::atomic_bool valid_ = true;
 
     std::unique_ptr<AsyncRunner<std::filesystem::path>> res_loader_ = nullptr;
     MessageNotifier<MaaResourceCallback> notifier;