From b1d3f67c4d915cf20fc225c26525dd5686d9562f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 9 Jan 2024 17:15:35 +0300
Subject: implements #3946 for ICQ

---
 protocols/ICQ-WIM/src/proto.cpp | 61 ++++++++++++++++++-----------------------
 protocols/ICQ-WIM/src/proto.h   |  1 -
 2 files changed, 27 insertions(+), 35 deletions(-)

(limited to 'protocols')

diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index 78fbc046e6..2e2d866938 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -242,32 +242,13 @@ void CIcqProto::OnEventDeleted(MCONTACT hContact, MEVENT hEvent)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-void CIcqProto::OnFileRecv(MHttpResponse *pReply, AsyncHttpRequest *pReq)
+static void __cdecl DownloadCallack(size_t iProgress, void *pParam)
 {
-	if (pReply->resultCode != 200)
-		return;
-
-	auto *ofd = (OFDTHREAD *)pReq->pUserInfo;
-	debugLogW(L"Saving to [%s]", ofd->wszPath.c_str());
-	int fileId = _wopen(ofd->wszPath, _O_BINARY | _O_CREAT | _O_TRUNC | _O_WRONLY, _S_IREAD | _S_IWRITE);
-	if (fileId == -1) {
-		debugLogW(L"Cannot open [%s] for writing", ofd->wszPath.c_str());
-		return;
-	}
-
-	int cbWritten = _write(fileId, pReply->body, pReply->body.GetLength());
-	_close(fileId);
-	if (cbWritten != pReply->body.GetLength()) {
-		debugLogW(L"Error writing data into [%s]: %d instead of %d", ofd->wszPath.c_str(), cbWritten, pReply->body.GetLength());
-		return;
-	}
+	auto *ofd = (OFDTHREAD *)pParam;
 
 	DBVARIANT dbv = { DBVT_DWORD };
-	dbv.dVal = cbWritten;
+	dbv.dVal = unsigned(iProgress);
 	db_event_setJson(ofd->hDbEvent, "ft", &dbv);
-
-	ofd->Finish();
-	delete ofd;
 }
 
 void __cdecl CIcqProto::OfflineFileThread(void *pParam)
@@ -282,19 +263,31 @@ void __cdecl CIcqProto::OfflineFileThread(void *pParam)
 		if (fileText2url(blob.getUrl(), &wszUrl)) {
 			if (auto *pFileInfo = RetrieveFileInfo(dbei.hContact, wszUrl)) {
 				if (!ofd->bCopy) {
-					auto *pReq = new AsyncHttpRequest(CONN_NONE, REQUEST_GET, pFileInfo->szUrl, &CIcqProto::OnFileRecv);
-					pReq->pUserInfo = ofd;
-					pReq->AddHeader("Sec-Fetch-User", "?1");
-					pReq->AddHeader("Sec-Fetch-Site", "cross-site");
-					pReq->AddHeader("Sec-Fetch-Mode", "navigate");
-					pReq->AddHeader("Accept-Encoding", "gzip");
-					Push(pReq);
-					return; // ofd is used inside CIcqProto::OnFileRecv, don't remove it
+					MHttpRequest nlhr(REQUEST_GET);
+					nlhr.m_szUrl = pFileInfo->szUrl;
+					nlhr.AddHeader("Sec-Fetch-User", "?1");
+					nlhr.AddHeader("Sec-Fetch-Site", "cross-site");
+					nlhr.AddHeader("Sec-Fetch-Mode", "navigate");
+					nlhr.AddHeader("Accept-Encoding", "gzip");
+
+					debugLogW(L"Saving to [%s]", ofd->wszPath.c_str());
+					NLHR_PTR reply(Netlib_DownloadFile(m_hNetlibUser, &nlhr, ofd->wszPath, DownloadCallack, ofd));
+					if (reply && reply->resultCode == 200) {
+						struct _stat st;
+						_wstat(ofd->wszPath, &st);
+
+						DBVARIANT dbv = { DBVT_DWORD };
+						dbv.dVal = st.st_size;
+						db_event_setJson(ofd->hDbEvent, "ft", &dbv);
+
+						ofd->Finish();
+					}				
+				}
+				else {
+					ofd->wszPath.Empty();
+					ofd->wszPath.Append(_A2T(pFileInfo->szUrl));
+					ofd->pCallback->Invoke(*ofd);
 				}
-
-				ofd->wszPath.Empty();
-				ofd->wszPath.Append(_A2T(pFileInfo->szUrl));
-				ofd->pCallback->Invoke(*ofd);
 			}
 		}
 	}
diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h
index 9bf4661ca7..dfb75d78a3 100644
--- a/protocols/ICQ-WIM/src/proto.h
+++ b/protocols/ICQ-WIM/src/proto.h
@@ -274,7 +274,6 @@ class CIcqProto : public PROTO<CIcqProto>
 	void          OnFileContinue(MHttpResponse *pReply, AsyncHttpRequest *pReq);
 	void          OnFileInit(MHttpResponse *pReply, AsyncHttpRequest *pReq);
 	void          OnFileInfo(MHttpResponse *pReply, AsyncHttpRequest *pReq);
-	void          OnFileRecv(MHttpResponse *pReply, AsyncHttpRequest *pReq);
 	void          OnGenToken(MHttpResponse *pReply, AsyncHttpRequest *pReq);
 	void          OnGetChatInfo(MHttpResponse *pReply, AsyncHttpRequest *pReq);
 	void          OnGetPatches(MHttpResponse *pReply, AsyncHttpRequest *pReq);
-- 
cgit v1.2.3