Merge pull request #93 from jackyding2679/win_widechar

Win widechar

Author: jackyding2679

demo/cos_demo.cpp

@@ -655,6 +655,36 @@ void MultiUploadObject(qcloud_cos::CosAPI& cos, const std::string& bucket_name,
             << std::endl;
 }
 
+#ifdef _WIN32
+// 上传宽字符文件
+void MultiUploadObjectWideChar(qcloud_cos::CosAPI& cos,
+                               const std::string& bucket_name) {
+  std::string local_file = "./안녕하십니까.mp4";
+  std::string object_name = "안녕하십니까.mp4";
+  qcloud_cos::MultiUploadObjectReq req(bucket_name, object_name, local_file);
+  req.SetWideCharPath();  // 需要调用该函数
+  req.SetRecvTimeoutInms(1000 * 60);
+  qcloud_cos::MultiUploadObjectResp resp;
+  qcloud_cos::CosResult result = cos.MultiUploadObject(req, &resp);
+
+  if (result.IsSucc()) {
+    std::cout << "MultiUploadObjectWideChar Succ." << std::endl;
+    std::cout << resp.GetLocation() << std::endl;
+    std::cout << resp.GetKey() << std::endl;
+    std::cout << resp.GetBucket() << std::endl;
+    std::cout << resp.GetEtag() << std::endl;
+  } else {
+    std::cout << "MultiUploadObjectWideChar Fail." << std::endl;
+  }
+  std::cout << "===================MultiUploadObjectWideChar==================="
+               "=========="
+            << std::endl;
+  PrintResult(result, resp);
+  std::cout << "========================================================"
+            << std::endl;
+}
+#endif
+
 //限速多线程上传
 void MultiUploadObjectLimitTraffic(qcloud_cos::CosAPI& cos,
                                    const std::string& bucket_name,
@@ -2445,8 +2475,7 @@ int main(int argc, char** argv) {
   // PutObjectByFile(cos, bucket_name, "/中文文件",
   // "/data/sevenyou/temp/seven_0821_10M");
   //// 简单上传(文件), 大文件
-  // PutObjectByFile(cos, bucket_name, "sevenyou_0803_2g",
-  //                "/data/sevenyou/cos-cpp-sdk-26/testdata/seven_2g.tmp");
+  // PutObjectByFile(cos, bucket_name, "test", "./config.json");
 
   // PutObjectByStream(cos, bucket_name);
 
@@ -2766,5 +2795,10 @@ int main(int argc, char** argv) {
   //  GetSnapshot(cos, bucket_name, "1920_1080.mp4", "snapshot.jpg");
   //  GetMediaInfo(cos, bucket_name, "1920_1080.mp4");
   //}
+
+#if defined(_WIN32)
+  // MultiUploadObjectWideChar(cos, bucket_name);
+  system("pause");
+#endif
   return 0;
 }

include/cos_defines.h

@@ -1,5 +1,6 @@
 #ifndef COS_DEFINE_H
 #define COS_DEFINE_H
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 

include/op/object_op.h

@@ -44,10 +44,9 @@ class ObjectOp : public BaseOp {
                        const std::string& bucket_name,
                        const std::string& object_name,
                        const std::string& uploadid,
-                       const std::string& localpath,
                        std::vector<std::string>& already_exist);
 
-  bool CheckSinglePart(const std::string& local_file_path, uint64_t offset,
+  bool CheckSinglePart(const MultiUploadObjectReq& req, uint64_t offset,
                        uint64_t local_part_size, uint64_t size,
                        const std::string& etag);
 

include/request/object_req.h

@@ -9,7 +9,9 @@
 #include <map>
 #include <sstream>
 #include <vector>
-
+#if defined(_WIN32)
+#include <codecvt>
+#endif
 #include "cos_sys_config.h"
 #include "request/base_req.h"
 #include "trsf/transfer_handler.h"
@@ -708,7 +710,12 @@ class MultiUploadObjectReq : public ObjectReq {
   MultiUploadObjectReq(const std::string& bucket_name,
                        const std::string& object_name,
                        const std::string& local_file_path = "")
-      : ObjectReq(bucket_name, object_name) {
+      : ObjectReq(bucket_name, object_name)
+#if defined(_WIN32)
+        ,
+        mb_is_widechar_path(false)
+#endif
+  {
     // 默认使用配置文件配置的分块大小和线程池大小
     m_part_size = CosSysConfig::GetUploadPartSize();
     m_thread_pool_size = CosSysConfig::GetUploadThreadPoolSize();
@@ -829,15 +836,28 @@ class MultiUploadObjectReq : public ObjectReq {
   }
 
   std::string GetUploadID() const { return m_uploadid; }
+#if defined(_WIN32)
+  /// \brief 如果本地文件路径为宽字符（中文，韩文等）,需要调用该函数
+  void SetWideCharPath() { mb_is_widechar_path = true; }
+
+  bool IsWideCharPath() const { return mb_is_widechar_path; }
 
+  std::wstring GetWideCharLocalFilePath() const {
+    std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+    return converter.from_bytes(m_local_file_path);
+  }
+#endif
  private:
   std::string m_local_file_path;
   uint64_t m_part_size;
   int m_thread_pool_size;
   std::map<std::string, std::string> m_xcos_meta;
   bool mb_set_meta;
   std::string m_uploadid;
-};
+#if defined(_WIN32)
+  bool mb_is_widechar_path;  // 标识文件路径是否为宽字符
+#endif
+};  // namespace qcloud_cos
 
 class AbortMultiUploadReq : public ObjectReq {
  public:

include/util/file_util.h

@@ -8,24 +8,29 @@
 
 namespace qcloud_cos {
 
-    class FileUtil {
-    public:
-        //获取文件内容
-        static std::string GetFileContent(const std::string& path);
-
-        //返回文件大小
-        static uint64_t GetFileLen(const std::string& path);
-
-        static bool IsDirectoryExists(const std::string& path);
-
-        static bool IsDirectory(const std::string& path);
+class FileUtil {
+ public:
+  // 获取文件内容
+  static std::string GetFileContent(const std::string& path);
+
+  // 获取文件大小
+  static uint64_t GetFileLen(const std::string& path);
+#if defined(_WIN32)
+  static uint64_t GetFileLen(const std::wstring& path);
+#endif
+  static bool IsDirectoryExists(const std::string& path);
 
-        static std::string GetDirectory(const std::string& path);
+  static bool IsDirectory(const std::string& path);
 
-        static uint64_t GetFileCrc64(const std::string& file);
+  static std::string GetDirectory(const std::string& path);
 
-        static std::string GetFileMd5(const std::string& file);
-    };
-} // namespace qcloud_cos
+  // 获取文件CRC64
+  static uint64_t GetFileCrc64(const std::string& file);
+#if defined(_WIN32)
+  static uint64_t GetFileCrc64(const std::wstring& file);
+#endif
+  static std::string GetFileMd5(const std::string& file);
+};
+}  // namespace qcloud_cos
 
 #endif

src/op/cos_result.cpp

@@ -33,23 +33,18 @@ bool CosResult::ParseFromHttpResponse(
     m_x_cos_trace_id = c_itr->second;
   }
 
+  std::string tmp_body = body;
   rapidxml::xml_document<> doc;
-  char* cstr = new char[body.size() + 1];
-  strcpy(cstr, body.c_str());
-  cstr[body.size()] = '\0';
 
-  if (!StringUtil::StringToXml(cstr, &doc)) {
-    SDK_LOG_INFO("Parse string to xml doc error, xml_body=%s", body.c_str());
-    SetErrorMsg(body);
-    delete[] cstr;
+  if (!StringUtil::StringToXml(&tmp_body[0], &doc)) {
+    SDK_LOG_ERR("Parse string to xml doc error, xml_body=%s", body.c_str());
     return false;
   }
 
   rapidxml::xml_node<>* root = doc.first_node(kErrorRoot.c_str());
   if (NULL == root) {
     // SDK_LOG_INFO("Miss root node=Error, xml_body=%s", body.c_str());
     SetErrorMsg(body);
-    delete[] cstr;
     return false;
   }
 
@@ -73,7 +68,6 @@ bool CosResult::ParseFromHttpResponse(
                    node_name.c_str(), body.c_str());
     }
   }
-  delete[] cstr;
   return true;
 }