modify:Wrapped function to get folder size

Author: xengine-qyt

XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp

@@ -406,4 +406,52 @@ bool CAPIHelp_Api::APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCH
 		}
 	}
 	return bRet;
+}
+/********************************************************************
+函数名称：APIHelp_Api_GetDIRSize
+函数功能：获得目录大小
+ 参数.一：lpszDIRStr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要操作s的目录
+ 参数.二：pInt_DIRSize
+  In/Out：Out
+  类型：整数型指针
+  可空：N
+  意思：输出得到的目录大小
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+bool CAPIHelp_Api::APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSize)
+{
+	int nListCount = 0;
+	int nPathType = 0;
+	__int64u nDirCount = 0;   //当前目录大小
+	XCHAR** ppListFile;
+	XCHAR tszFilePath[MAX_PATH] = {};
+	
+	_tcsxcpy(tszFilePath, lpszDIRStr);
+	BaseLib_OperatorString_GetPath(tszFilePath, &nPathType);
+	//判断是绝对路径还是相对路径
+	if (1 == nPathType)
+	{
+		_tcsxcat(tszFilePath, _X("\\*"));
+	}
+	else if (2 == nPathType)
+	{
+		_tcsxcat(tszFilePath, _X("/*"));
+	}
+	SystemApi_File_EnumFile(tszFilePath, &ppListFile, &nListCount, true, 1);
+	for (int i = 0; i < nListCount; i++)
+	{
+		struct _xtstat st_FStat;
+		_xtstat(ppListFile[i], &st_FStat);
+		nDirCount += st_FStat.st_size;
+	}
+	BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
+	*pInt_DIRSize = nDirCount;
+	return true;
 }

XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.h

@@ -24,6 +24,7 @@ class CAPIHelp_Api
 	bool APIHelp_Api_GetIPInfo(LPCXSTR lpszMsgBuffer, int nMsgLen, XENGINE_IPADDRINFO* pSt_IPAddrInfo);
 	bool APIHelp_Api_UrlParse(XCHAR*** ppptszList, int nListCount, XCHAR* ptszFileName, XCHAR* ptszKeyName);
 	bool APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCHAR* ptszBoundStr);
+	bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSize);
 protected:
 private:
 };

XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h

@@ -308,4 +308,23 @@ extern "C" bool APIHelp_Api_UrlParse(XCHAR*** ppptszList, int nListCount, XCHAR*
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCHAR* ptszBoundStr);
+extern "C" bool APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCHAR* ptszBoundStr);
+/********************************************************************
+函数名称：APIHelp_Api_GetDIRSize
+函数功能：获得目录大小
+ 参数.一：lpszDIRStr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要操作s的目录
+ 参数.二：pInt_DIRSize
+  In/Out：Out
+  类型：整数型指针
+  可空：N
+  意思：输出得到的目录大小
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSize);

XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp

@@ -318,36 +318,8 @@ bool CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUC
 				//处理优先级
 				if (stl_ListIterator->nLevel == nLastLevel)
 				{
-					int nListCount = 0;
 					__int64u nDirCount = 0;   //当前目录大小
-					XCHAR** ppListFile;
-					//处理路径是否有通配符
-					XCHAR tszFilePath[MAX_PATH];
-					memset(tszFilePath, '\0', MAX_PATH);
-
-					_tcsxcpy(tszFilePath, pSt_StorageBucket->tszFilePath);
-					if (tszFilePath[_tcsxlen(tszFilePath) - 1] != '*')
-					{
-						int nPathType = 0;
-						BaseLib_OperatorString_GetPath(tszFilePath, &nPathType);
-						//判断是绝对路径还是相对路径
-						if (1 == nPathType)
-						{
-							_tcsxcat(tszFilePath, _X("\\*"));
-						}
-						else if (2 == nPathType)
-						{
-							_tcsxcat(tszFilePath, _X("/*"));
-						}
-					}
-					SystemApi_File_EnumFile(tszFilePath, &ppListFile, &nListCount, true, 1);
-					for (int j = 0; j < nListCount; j++)
-					{
-						struct _xtstat st_FStat;
-						_xtstat(ppListFile[j], &st_FStat);
-						nDirCount += st_FStat.st_size;
-					}
-					BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
+					APIHelp_Api_GetDIRSize(pSt_StorageBucket->tszFilePath, &nDirCount);
 					//如果当前目录大小大于设定的大小.那么忽略
 					if (nDirCount >= APIHelp_Distributed_GetSize(stl_ListIterator->tszBuckSize))
 					{
@@ -427,7 +399,6 @@ bool CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUC
 			return false;
 		}
 	}
-
 	return true;
 }
 /********************************************************************

XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h

@@ -13,6 +13,7 @@
 #define ERROR_STORAGE_MODULE_APIHELP_PARAMENT 0x0030001               //参数错误
 #define ERROR_STORAGE_MODULE_APIHELP_PARSE 0x0030002                  //解析失败
 #define ERROR_STORAGE_MODULE_APIHELP_NOTFOUND 0x0030003               //没有找到
+#define ERROR_STORAGE_MODULE_APIHELP_DISABLE 0x0030004                //被禁用
 #define ERROR_STORAGE_MODULE_APIHELP_NOTAUTH 0x0030010                //没有验证信息
 #define ERROR_STORAGE_MODULE_APIHELP_NOTSUPPORT 0x0030011             //不支持
 #define ERROR_STORAGE_MODULE_APIHELP_NOTLENGTH 0x0030012              //没有长度信息

XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.def

@@ -14,4 +14,5 @@ EXPORTS
 	APIHelp_Api_VerHash
 	APIHelp_Api_GetIPInfo
 	APIHelp_Api_UrlParse
-	APIHelp_Api_Boundary
+	APIHelp_Api_Boundary
+	APIHelp_Api_GetDIRSize

XEngine_Source/StorageModule_APIHelp/pch.cpp

@@ -77,4 +77,8 @@ extern "C" bool APIHelp_Api_UrlParse(XCHAR * **ppptszList, int nListCount, XCHAR
 extern "C" bool APIHelp_Api_Boundary(XCHAR * **ppptszList, int nListCount, XCHAR * ptszBoundStr)
 {
 	return m_APIHelp.APIHelp_Api_Boundary(ppptszList, nListCount, ptszBoundStr);
+}
+extern "C" bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u * pInt_DIRSize)
+{
+	return m_APIHelp.APIHelp_Api_GetDIRSize(lpszDIRStr, pInt_DIRSize);
 }

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -201,6 +201,7 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
 			return false;
 		}
 	}
+	
 	int nPathType = 0;
 	_xstprintf(tszFileDir, _X("%s/%s"), st_StorageBucket.tszFilePath, tszFileName);
 	BaseLib_OperatorString_GetPath(tszFileDir, &nPathType);