added:rewrite file choice support

xengine-qyt · xengine-qyt · commit b9e394b9889c · 2023-02-09T10:07:09.000+08:00
diff --git a/XEngine_Source/StorageModule_Config/Config_Define.h b/XEngine_Source/StorageModule_Config/Config_Define.h
@@ -119,6 +119,7 @@ typedef struct
     struct 
     {
         bool bCreateDir;
+        bool bRewrite;
     }st_PermissionFlags;
 }XENGINE_STORAGEBUCKET;
 typedef struct
diff --git a/XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp b/XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp
@@ -354,6 +354,8 @@ BOOL CConfig_Json::Config_Json_LoadBalance(LPCTSTR lpszConfigFile, XENGINE_LBCON
 
 		Json::Value st_JsonPermission = st_JsonBucket[i]["PermissionFlags"];
 		st_Bucket.st_PermissionFlags.bCreateDir = st_JsonPermission["CreateDir"].asBool();
+		st_Bucket.st_PermissionFlags.bRewrite = st_JsonPermission["Rewrite"].asBool();
+
 		pSt_ServerConfig->st_LoadBalance.pStl_ListBucket->push_back(st_Bucket);
 	}
 	return TRUE;
diff --git a/XEngine_Source/StorageModule_Session/Session_Define.h b/XEngine_Source/StorageModule_Session/Session_Define.h
@@ -24,6 +24,7 @@ typedef struct
 	__int64x ullRWLen;                                                    //已经读取(写入)的大小
 	__int64x ullPosStart;                                                 //开始位置
 	__int64x ullPosEnd;                                                   //结束位置
+	BOOL bRewrite;                                                        //是否为覆写
 
 	int nLimit;                                                           //限制工具
 	XHANDLE xhToken;
@@ -331,12 +332,17 @@ extern "C" BOOL Session_UPStroage_Destory();
   类型：整数型
   可空：N
   意思：输入文件大小
- 参数.五：nPosStart
+ 参数.五：bRewrite
+  In/Out：In
+  类型：整数型
+  可空：N
+  意思：是否允许覆写
+ 参数.六：nPosStart
   In/Out：In
   类型：整数型
   可空：Y
   意思：输入起始位置
- 参数.六：nPostEnd
+ 参数.七：nPostEnd
   In/Out：In
   类型：整数型
   可空：Y
@@ -346,7 +352,7 @@ extern "C" BOOL Session_UPStroage_Destory();
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, int nPosStart = 0, int nPostEnd = 0);
+extern "C" BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, BOOL bRewrite, int nPosStart = 0, int nPostEnd = 0);
 /********************************************************************
 函数名称：Session_UPStroage_GetInfo
 函数功能：获取上传客户端信息
diff --git a/XEngine_Source/StorageModule_Session/Session_Error.h b/XEngine_Source/StorageModule_Session/Session_Error.h
@@ -19,4 +19,5 @@
 #define ERROR_STORAGE_MODULE_SESSION_NOTFOUND 0x0010004 
 #define ERROR_STORAGE_MODULE_SESSION_PASSWORD 0x0010005
 #define ERROR_STORAGE_MODULE_SESSION_EMPTY 0x0010006
-#define ERROR_STORAGE_MODULE_SESSION_MAXCONNECT 0x0010007
+#define ERROR_STORAGE_MODULE_SESSION_MAXCONNECT 0x0010007
+#define ERROR_STORAGE_MODULE_SESSION_REWRITE 0x0010008
diff --git a/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp b/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp
@@ -87,12 +87,17 @@ BOOL CSession_UPStroage::Session_UPStroage_Destory()
   类型：整数型
   可空：N
   意思：输入文件大小
- 参数.五：nPosStart
+ 参数.五：bRewrite
+  In/Out：In
+  类型：整数型
+  可空：N
+  意思：是否允许覆写
+ 参数.六：nPosStart
   In/Out：In
   类型：整数型
   可空：Y
   意思：输入起始位置
- 参数.六：nPostEnd
+ 参数.七：nPostEnd
   In/Out：In
   类型：整数型
   可空：Y
@@ -102,7 +107,7 @@ BOOL CSession_UPStroage::Session_UPStroage_Destory()
   意思：是否成功
 备注：
 *********************************************************************/
-BOOL CSession_UPStroage::Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, int nPosStart /* = 0 */, int nPostEnd /* = 0 */)
+BOOL CSession_UPStroage::Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, BOOL bRewrite, int nPosStart /* = 0 */, int nPostEnd /* = 0 */)
 {
 	Session_IsErrorOccur = FALSE;
 
@@ -140,7 +145,7 @@ BOOL CSession_UPStroage::Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTST
 		memset(&st_FStat, '\0', sizeof(struct _tstat64));
 		_tstat64(st_Client.st_StorageInfo.tszFileDir, &st_FStat);
 		st_Client.st_StorageInfo.ullRWLen = st_FStat.st_size;
-
+		//追加打开
 		st_Client.st_StorageInfo.pSt_File = _tfopen(lpszFileDir, _T("rb+"));
 		if (NULL == st_Client.st_StorageInfo.pSt_File)
 		{
@@ -151,7 +156,15 @@ BOOL CSession_UPStroage::Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTST
 		//是不是覆写?
 		if (st_Client.st_StorageInfo.ullRWLen > nPosStart)
 		{
-			//是
+			//是否允许覆写
+			if (!bRewrite)
+			{
+				Session_IsErrorOccur = TRUE;
+				Session_dwErrorCode = ERROR_STORAGE_MODULE_SESSION_REWRITE;
+				fclose(st_Client.st_StorageInfo.pSt_File);
+				return FALSE;
+			}
+			st_Client.st_StorageInfo.bRewrite = TRUE;
 			st_Client.st_StorageInfo.ullRWLen -= (nPostEnd - nPosStart);
 		}
 		fseek(st_Client.st_StorageInfo.pSt_File, nPosStart, SEEK_SET);
diff --git a/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.h b/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.h
@@ -24,7 +24,7 @@ class CSession_UPStroage
 public:
     BOOL Session_UPStroage_Init(int nMaxConnect, BOOL bUPResume = FALSE);
     BOOL Session_UPStroage_Destory();
-    BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, int nPosStart = 0, int nPostEnd = 0);
+    BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, BOOL bRewrite, int nPosStart = 0, int nPostEnd = 0);
     BOOL Session_UPStroage_GetInfo(LPCTSTR lpszClientAddr, SESSION_STORAGEINFO* pSt_StorageInfo);
     BOOL Session_UPStroage_Write(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen);
     BOOL Session_UPStroage_Exist(LPCTSTR lpszClientAddr);
diff --git a/XEngine_Source/StorageModule_Session/pch.cpp b/XEngine_Source/StorageModule_Session/pch.cpp
@@ -96,9 +96,9 @@ extern "C" BOOL Session_UPStroage_Destory()
 {
 	return m_UPStorage.Session_UPStroage_Destory();
 }
-extern "C" BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, int nPosStart, int nPostEnd)
+extern "C" BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, BOOL bRewrite, int nPosStart, int nPostEnd)
 {
-	return m_UPStorage.Session_UPStroage_Insert(lpszClientAddr, lpszBuckKey, lpszFileDir, nFileSize, nPosStart, nPostEnd);
+	return m_UPStorage.Session_UPStroage_Insert(lpszClientAddr, lpszBuckKey, lpszFileDir, nFileSize, bRewrite, nPosStart, nPostEnd);
 }
 extern "C" BOOL Session_UPStroage_GetInfo(LPCTSTR lpszClientAddr, SESSION_STORAGEINFO * pSt_StorageInfo)
 {

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ typedef struct`
`119`	`119`	`struct`
`120`	`120`	`{`
`121`	`121`	`bool bCreateDir;`
	`122`	`+ bool bRewrite;`
`122`	`123`	`}st_PermissionFlags;`
`123`	`124`	`}XENGINE_STORAGEBUCKET;`
`124`	`125`	`typedef struct`
Original file line number	Diff line number	Diff line change
`@@ -354,6 +354,8 @@ BOOL CConfig_Json::Config_Json_LoadBalance(LPCTSTR lpszConfigFile, XENGINE_LBCON`
`354`	`354`
`355`	`355`	`Json::Value st_JsonPermission = st_JsonBucket[i]["PermissionFlags"];`
`356`	`356`	`st_Bucket.st_PermissionFlags.bCreateDir = st_JsonPermission["CreateDir"].asBool();`
	`357`	`+ st_Bucket.st_PermissionFlags.bRewrite = st_JsonPermission["Rewrite"].asBool();`
	`358`	`+`
`357`	`359`	`pSt_ServerConfig->st_LoadBalance.pStl_ListBucket->push_back(st_Bucket);`
`358`	`360`	`}`
`359`	`361`	`return TRUE;`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,9 @@ extern "C" BOOL Session_UPStroage_Destory()`
`96`	`96`	`{`
`97`	`97`	`return m_UPStorage.Session_UPStroage_Destory();`
`98`	`98`	`}`
`99`		`-extern "C" BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, int nPosStart, int nPostEnd)`
	`99`	`+extern "C" BOOL Session_UPStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x nFileSize, BOOL bRewrite, int nPosStart, int nPostEnd)`
`100`	`100`	`{`
`101`		`- return m_UPStorage.Session_UPStroage_Insert(lpszClientAddr, lpszBuckKey, lpszFileDir, nFileSize, nPosStart, nPostEnd);`
	`101`	`+ return m_UPStorage.Session_UPStroage_Insert(lpszClientAddr, lpszBuckKey, lpszFileDir, nFileSize, bRewrite, nPosStart, nPostEnd);`
`102`	`102`	`}`
`103`	`103`	`extern "C" BOOL Session_UPStroage_GetInfo(LPCTSTR lpszClientAddr, SESSION_STORAGEINFO * pSt_StorageInfo)`
`104`	`104`	`{`