TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

The file was overwritten when transferring a file that already existed in the downloads folder. With this change we now add " (x)", where x is an incrementing number, starting at 1, using the next non-existing number, to the file name, just before the first dot, or at the end if no dot. This has been applied to the GetDownloadPath method in the platform api.

Browse Source 
PiperOrigin-RevId: 457530287
This commit is contained in:
jfcarroll
2022-06-27 11:44:15 -07:00
committed by Copybara-Service
parent 9ce81d8534
commit 87c76ea235
7 changed files with 410 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/g3/platform.cc
+3 -43
View File
@@ -18,6 +18,7 @@
#include <cstdint>
#include <memory>
#include "file/base/path.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h"
#include "absl/time/time.h"
@@ -60,50 +61,9 @@ namespace api {
std::string ImplementationPlatform::GetDownloadPath(std::string& parent_folder,
std::string& file_name) {
std::string fullPath("/tmp/");
std::string fullPath("/tmp");
// If parent_folder starts with a \\ or /, then strip it
while (!parent_folder.empty() &&
(*parent_folder.begin() == '\\' || *parent_folder.begin() == '/')) {
parent_folder.erase(0, 1);
}
// If parent_folder ends with a \\ or /, then strip it
while (!parent_folder.empty() &&
(*parent_folder.rbegin() == '\\' || *parent_folder.rbegin() == '/')) {
parent_folder.erase(parent_folder.size() - 1);
}
// If file_name starts with a \\, then strip it
while (!file_name.empty() &&
(*file_name.begin() == '\\' || *file_name.begin() == '/')) {
file_name.erase(0, 1);
}
// If file_name ends with a \\, then strip it
while (!file_name.empty() &&
(*file_name.rbegin() == '\\' || *file_name.rbegin() == '/')) {
file_name.erase(file_name.size() - 1);
}
std::stringstream path;
if (parent_folder.empty() && file_name.empty()) {
path << fullPath.c_str();
return path.str();
}
if (parent_folder.empty()) {
path << fullPath.c_str() << "\\" << file_name.c_str();
return path.str();
}
if (file_name.empty()) {
path << fullPath.c_str() << "\\" << parent_folder.c_str();
return path.str();
}
path << fullPath.c_str() << "\\" << parent_folder.c_str() << "\\"
<< file_name.c_str();
return path.str();
return file::JoinPath("/tmp", file_name);
}
OSName ImplementationPlatform::GetCurrentOS() { return OSName::kLinux; }