From 95502e47f6bb071cab31f4293398ad00d103ad6a Mon Sep 17 00:00:00 2001
From: fangyunzhong <fangyunzhong2@huawei.com>
Date: Wed, 20 Mar 2024 19:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=AF=B9Har=E5=8C=85?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=97=B6=E4=B8=8D=E8=BF=9B=E8=A1=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fangyunzhong <fangyunzhong2@huawei.com>
---
 include/config_parser.h | 4 ++++
 include/file_manager.h  | 2 +-
 include/resource_data.h | 2 +-
 src/file_manager.cpp    | 4 ++--
 src/resource_pack.cpp   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/config_parser.h b/include/config_parser.h
index 2927583..691fe75 100644
--- a/include/config_parser.h
+++ b/include/config_parser.h
@@ -59,6 +59,10 @@ public:
     {
         return dependEntry;
     }
+    bool IsHar()
+    {
+        return moduleType_ == ModuleType::HAR;
+    }
     static void SetUseModule()
     {
         useModule_ = true;
diff --git a/include/file_manager.h b/include/file_manager.h
index ceb7eeb..46c3151 100644
--- a/include/file_manager.h
+++ b/include/file_manager.h
@@ -26,7 +26,7 @@ namespace Global {
 namespace Restool {
 class FileManager : public Singleton<FileManager> {
 public:
-    uint32_t ScanModules(const std::vector<std::string> &inputs, const std::string &output);
+    uint32_t ScanModules(const std::vector<std::string> &inputs, const std::string &output, const bool isHar);
     const std::map<int64_t, std::vector<ResourceItem>> &GetResources() const
     {
         return items_;
diff --git a/include/resource_data.h b/include/resource_data.h
index 377a8ad..3a3cbc3 100644
--- a/include/resource_data.h
+++ b/include/resource_data.h
@@ -39,7 +39,7 @@ const static std::string NEW_LINE_PATH = "\nat ";
 const static std::string LONG_PATH_HEAD = "\\\\?\\";
 const static int32_t VERSION_MAX_LEN = 128;
 const static int32_t INT_TO_BYTES = sizeof(uint32_t);
-static const int8_t RESTOOL_VERSION[VERSION_MAX_LEN] = { "Restool 5.005" };
+static const int8_t RESTOOL_VERSION[VERSION_MAX_LEN] = { "Restool 5.006" };
 const static int32_t TAG_LEN = 4;
 
 enum class KeyType {
diff --git a/src/file_manager.cpp b/src/file_manager.cpp
index b861955..697fa7f 100644
--- a/src/file_manager.cpp
+++ b/src/file_manager.cpp
@@ -29,7 +29,7 @@ namespace OHOS {
 namespace Global {
 namespace Restool {
 using namespace std;
-uint32_t FileManager::ScanModules(const vector<string> &inputs, const string &output)
+uint32_t FileManager::ScanModules(const vector<string> &inputs, const string &output, const bool isHar)
 {
     vector<pair<ResType, string>> noBaseResource;
     for (auto input : inputs) {
@@ -41,7 +41,7 @@ uint32_t FileManager::ScanModules(const vector<string> &inputs, const string &ou
     if (!noBaseResource.empty()) {
         ResourceUtil::PrintWarningMsg(noBaseResource);
     }
-    return ParseReference(output);
+    return isHar ? RESTOOL_SUCCESS : ParseReference(output);
 }
 
 uint32_t FileManager::MergeResourceItem(const map<int64_t, vector<ResourceItem>> &resourceInfos)
diff --git a/src/resource_pack.cpp b/src/resource_pack.cpp
index 31fb068..fc94d34 100644
--- a/src/resource_pack.cpp
+++ b/src/resource_pack.cpp
@@ -325,7 +325,7 @@ uint32_t ResourcePack::ScanResources(const vector<string> &inputs, const string
 {
     auto &fileManager = FileManager::GetInstance();
     fileManager.SetModuleName(moduleName_);
-    if (fileManager.ScanModules(inputs, output) != RESTOOL_SUCCESS) {
+    if (fileManager.ScanModules(inputs, output, configJson_.IsHar()) != RESTOOL_SUCCESS) {
         return RESTOOL_ERROR;
     }
     return RESTOOL_SUCCESS;