diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-04-09 14:23:39 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-04-09 14:23:39 +0300 |
| commit | feb92e0b02d6e429f48cb5c4f3906bccfefd1ca2 (patch) | |
| tree | abe0bffb2f756bb3be90f9acc8d414ce8096866b /src/Networking | |
| parent | 36a8fc55d1a6fdf1b71aac3de590b5fd738991da (diff) | |
Added seqs.volChanges[] to object mode to record file creation etc.
Diffstat (limited to 'src/Networking')
| -rw-r--r-- | src/Networking/FtpResponder.cpp | 2 | ||||
| -rw-r--r-- | src/Networking/HttpResponder.cpp | 7 | ||||
| -rw-r--r-- | src/Networking/UploadingNetworkResponder.cpp | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/Networking/FtpResponder.cpp b/src/Networking/FtpResponder.cpp index 6ac6d4a6..d19ea68a 100644 --- a/src/Networking/FtpResponder.cpp +++ b/src/Networking/FtpResponder.cpp @@ -635,7 +635,7 @@ void FtpResponder::ProcessLine() noexcept String<MaxFilenameLength> location; if (haveFileToMove && MassStorage::CombineName(location.GetRef(), currentDirectory.c_str(), filename) - && MassStorage::Rename(filenameBeingProcessed.c_str(), location.c_str(), false)) + && MassStorage::Rename(filenameBeingProcessed.c_str(), location.c_str(), false, false)) { outBuf->copy("250 Rename successful.\r\n"); } diff --git a/src/Networking/HttpResponder.cpp b/src/Networking/HttpResponder.cpp index bf4e82fb..b259c087 100644 --- a/src/Networking/HttpResponder.cpp +++ b/src/Networking/HttpResponder.cpp @@ -573,11 +573,8 @@ bool HttpResponder::GetJsonResponse(const char* request, OutputBuffer *&response bool success = false; if (oldVal != nullptr && newVal != nullptr) { - if (StringEqualsIgnoreCase(GetKeyValue("deleteexisting"), "yes") && MassStorage::FileExists(oldVal) && MassStorage::FileExists(newVal)) - { - MassStorage::Delete(newVal, false); - } - success = MassStorage::Rename(oldVal, newVal, false); + const bool deleteExisting = StringEqualsIgnoreCase(GetKeyValue("deleteexisting"), "yes"); + success = MassStorage::Rename(oldVal, newVal, deleteExisting, false); } response->printf("{\"err\":%d}", (success) ? 0 : 1); } diff --git a/src/Networking/UploadingNetworkResponder.cpp b/src/Networking/UploadingNetworkResponder.cpp index 4925a1c4..cbc04e8f 100644 --- a/src/Networking/UploadingNetworkResponder.cpp +++ b/src/Networking/UploadingNetworkResponder.cpp @@ -118,11 +118,8 @@ void UploadingNetworkResponder::FinishUpload(uint32_t fileLength, time_t fileLas String<MaxFilenameLength> origFilename; origFilename.catn(uploadFilename, filenameBeingProcessed.GetRef().strlen() - strlen(UPLOAD_EXTENSION)); - // Delete possibly existing files with that name (i.e. prepare "overwrite") - MassStorage::Delete(origFilename.c_str(), true); - // Rename the uploaded file to it's original name - MassStorage::Rename(uploadFilename, origFilename.c_str(), true); + MassStorage::Rename(uploadFilename, origFilename.c_str(), true, true); if (fileLastModified != 0) { |