Skip to content

Commit 57dbab5

Browse files
committed
refactoring
1 parent c9fca5c commit 57dbab5

File tree

13 files changed

+752
-661
lines changed

13 files changed

+752
-661
lines changed

src/cloud_storage/CloudStorage.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* 2025-01-25
2+
* 2025-01-27
33
*
44
* The MIT License (MIT)
55
* Copyright (c) 2025 K. Suwatchai (Mobizt)
@@ -574,9 +574,9 @@ class CloudStorage
574574
sData->request.val[reqns::header] += FPSTR("X-Upload-Content-Type: ");
575575
sData->request.val[reqns::header] += request.mime;
576576
sData->request.val[reqns::header] += "\r\n";
577-
request.aClient->setFileContentLength(sData, 0, "X-Upload-Content-Length");
578-
request.aClient->setContentType(sData, "application/json; charset=UTF-8");
579-
request.aClient->setContentLength(sData, request.options->payload.length());
577+
sData->request.setFileContentLength(0, "X-Upload-Content-Length");
578+
sData->request.setContentType("application/json; charset=UTF-8");
579+
sData->request.setContentLength(request.options->payload.length());
580580

581581
sData->request.file_data.resumable.setSize(sData->request.file_data.file_size ? sData->request.file_data.file_size : sData->request.file_data.data_size);
582582
sData->request.file_data.resumable.updateRange();
@@ -585,8 +585,8 @@ class CloudStorage
585585
else
586586
{
587587
if (request.mime.length())
588-
request.aClient->setContentType(sData, request.mime);
589-
request.aClient->setFileContentLength(sData, 0);
588+
sData->request.setContentType(request.mime);
589+
sData->request.setFileContentLength(0);
590590
}
591591

592592
if (sData->request.file_data.filename.length() > 0 && sData->request.file_data.file_size == 0)
@@ -601,7 +601,7 @@ class CloudStorage
601601
else if (request.options->payload.length())
602602
{
603603
sData->request.val[reqns::payload] = request.options->payload;
604-
request.aClient->setContentLength(sData, request.options->payload.length());
604+
sData->request.setContentLength(request.options->payload.length());
605605
}
606606

607607
if (request.cb)

src/core/AppBase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* 2025-01-25
2+
* 2025-01-27
33
*
44
* The MIT License (MIT)
55
* Copyright (c) 2025 K. Suwatchai (Mobizt)
@@ -53,7 +53,7 @@ class AppBase
5353
void newRequestBase(AsyncClientClass *aClient, async_data *sData, const String &url, const String &path, const String &extras, reqns::http_request_method method, const slot_options_t &options, const String &uid) { aClient->newRequest(sData, url, path, extras, method, options, uid); }
5454
void setAuthTsBase(AsyncClientClass *aClient, uint32_t ts) { aClient->auth_ts = ts; }
5555
void addRemoveClientVecBase(AsyncClientClass *aClient, uint32_t cvec_addr, bool add) { aClient->addRemoveClientVec(cvec_addr, add); }
56-
void setContentLengthBase(AsyncClientClass *aClient, async_data *sData, size_t len) { aClient->setContentLength(sData, len); }
56+
void setContentLengthBase(AsyncClientClass *aClient, async_data *sData, size_t len) { sData->request.setContentLength(len); }
5757
void handleRemoveBase(AsyncClientClass *aClient) { aClient->handleRemove(); }
5858
void removeSlotBase(AsyncClientClass *aClient, uint8_t slot, bool sse = true) { aClient->removeSlot(slot, sse); }
5959
size_t slotCountBase(AsyncClientClass *aClient) { return aClient->sVec.size(); }

0 commit comments

Comments
 (0)