mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add esp_mail_file_storage_type_univ

This commit is contained in:
Jason2866 2021-06-03 15:37:21 +02:00 committed by GitHub
parent e36aff4eab
commit 7785685ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/lib_div/lib_mail/src/ESP_Mail_Client.cpp
View File

@ -2746,6 +2746,10 @@ bool ESP_Mail_Client::sendAttachments(SMTPSession *smtp, SMTP_Message *msg, cons
else else
{ {
if (att->file.storage_type == esp_mail_file_storage_type_univ) {
} else {
if (!_sdOk && att->file.storage_type == esp_mail_file_storage_type_sd) if (!_sdOk && att->file.storage_type == esp_mail_file_storage_type_sd)
_sdOk = sdTest(); _sdOk = sdTest();
@ -2806,11 +2810,13 @@ bool ESP_Mail_Client::openFileRead(SMTPSession *smtp, SMTP_Message *msg, SMTP_At
filepath += att->file.path; filepath += att->file.path;
} }
if (att->file.storage_type == esp_mail_file_storage_type_sd) if (att->file.storage_type == esp_mail_file_storage_type_sd) {
file_existed = ESP_MAIL_SD_FS.exists(filepath.c_str()); file_existed = ESP_MAIL_SD_FS.exists(filepath.c_str());
else if (att->file.storage_type == esp_mail_file_storage_type_flash) }
else if (att->file.storage_type == esp_mail_file_storage_type_flash) {
} else if (att->file.storage_type == esp_mail_file_storage_type_univ) {
file_existed = ESP_MAIL_FLASH_FS.exists(filepath.c_str()); file_existed = ESP_MAIL_FLASH_FS.exists(filepath.c_str());
}
if (!file_existed) if (!file_existed)
{ {
@ -2822,10 +2828,14 @@ bool ESP_Mail_Client::openFileRead(SMTPSession *smtp, SMTP_Message *msg, SMTP_At
filepath += att->descr.filename; filepath += att->descr.filename;
} }
if (att->file.storage_type == esp_mail_file_storage_type_sd) if (att->file.storage_type == esp_mail_file_storage_type_sd) {
file_existed = ESP_MAIL_SD_FS.exists(filepath.c_str()); file_existed = ESP_MAIL_SD_FS.exists(filepath.c_str());
else if (att->file.storage_type == esp_mail_file_storage_type_flash) }
else if (att->file.storage_type == esp_mail_file_storage_type_flash) {
}
else if (att->file.storage_type == esp_mail_file_storage_type_univ) {
file_existed = ESP_MAIL_FLASH_FS.exists(filepath.c_str()); file_existed = ESP_MAIL_FLASH_FS.exists(filepath.c_str());
}
} }
if (!file_existed) if (!file_existed)
@ -2847,15 +2857,19 @@ bool ESP_Mail_Client::openFileRead(SMTPSession *smtp, SMTP_Message *msg, SMTP_At
buf.clear(); buf.clear();
if (att->file.storage_type == esp_mail_file_storage_type_sd) if (att->file.storage_type == esp_mail_file_storage_type_sd) {
file = ESP_MAIL_SD_FS.open(filepath.c_str(), FILE_READ); file = ESP_MAIL_SD_FS.open(filepath.c_str(), FILE_READ);
else if (att->file.storage_type == esp_mail_file_storage_type_flash) }
else if (att->file.storage_type == esp_mail_file_storage_type_flash) {
}
#if defined(ESP32) #if defined(ESP32)
file = ESP_MAIL_FLASH_FS.open(filepath.c_str(), FILE_READ); //file = ESP_MAIL_FLASH_FS.open(filepath.c_str(), FILE_READ);
#elif defined(ESP8266) #elif defined(ESP8266)
file = ESP_MAIL_FLASH_FS.open(filepath.c_str(), "r"); //file = ESP_MAIL_FLASH_FS.open(filepath.c_str(), "r");
#endif #endif
else if (att->file.storage_type == esp_mail_file_storage_type_univ) {
file = ufsp->open(filepath.c_str(), "r");
}
if (!file) if (!file)
return false; return false;
@ -3018,16 +3032,18 @@ bool ESP_Mail_Client::sendInline(SMTPSession *smtp, SMTP_Message *msg, const std
} }
else else
{ {
if (att->file.storage_type == esp_mail_file_storage_type_univ) {
} else {
if (!_sdOk && att->file.storage_type == esp_mail_file_storage_type_sd) if (!_sdOk && att->file.storage_type == esp_mail_file_storage_type_sd)
_sdOk = sdTest(); _sdOk = sdTest();
if (!_flashOk && att->file.storage_type == esp_mail_file_storage_type_flash) if (!_flashOk && att->file.storage_type == esp_mail_file_storage_type_flash) {
#if defined(ESP32) #if defined(ESP32)
_flashOk = ESP_MAIL_FLASH_FS.begin(FORMAT_FLASH); //_flashOk = ESP_MAIL_FLASH_FS.begin(FORMAT_FLASH);
#elif defined(ESP8266) #elif defined(ESP8266)
_flashOk = ESP_MAIL_FLASH_FS.begin(); //_flashOk = ESP_MAIL_FLASH_FS.begin();
#endif #endif
}
if ((!_sdOk && att->file.storage_type == esp_mail_file_storage_type_sd) || (!_flashOk && att->file.storage_type == esp_mail_file_storage_type_flash)) if ((!_sdOk && att->file.storage_type == esp_mail_file_storage_type_sd) || (!_flashOk && att->file.storage_type == esp_mail_file_storage_type_flash))
{ {
@ -8529,4 +8545,4 @@ void SMTP_Status::empty()
ESP_Mail_Client MailClient = ESP_Mail_Client(); ESP_Mail_Client MailClient = ESP_Mail_Client();
#endif /* ESP_Mail_Client_CPP */ #endif /* ESP_Mail_Client_CPP */