BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Partial fix for duplicate uploads

Browse Source
This commit is contained in:
Scott E. Graves
2017-04-04 08:32:26 -05:00
parent 7c1c1b46c4
commit 03f93c087c
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/siadrive_api/uploadmanager.h
View File

@@ -21,8 +21,7 @@ public:
NotFound, NotFound,
Queued, Queued,
Uploading, Uploading,
Complete, Complete
Error
}; };
enum class _UploadErrorCode enum class _UploadErrorCode

12
src/siadrive_api/siafiletree.cpp
View File

@@ -81,10 +81,18 @@ std::vector<SString> CSiaApi::_CSiaFileTree::QueryDirectories(SString rootFolder
SString path = ("\\" + FilePath(v->GetSiaPath()).RemoveFileName()).Replace("/", "\\"); SString path = ("\\" + FilePath(v->GetSiaPath()).RemoveFileName()).Replace("/", "\\");
if (path.BeginsWith(rootFolder)) if (path.BeginsWith(rootFolder))
{ {
path = path.SubString(1, rootFolder.Length()); path = (rootFolder == "\\") ? path.SubString(1) : path.SubString(1, rootFolder.Length());
if (path.Length()) if (path.Length())
{ {
auto splitPaths = path.Split('\\');
if (splitPaths.size())
{
path = splitPaths[0];
if (std::find(ret.begin(), ret.end(), path) == ret.end())
{
ret.push_back(path);
}
}
} }
} }
}); });

9
src/siadrive_api/uploadmanager.cpp
View File

@@ -66,9 +66,6 @@ SString CUploadManager::UploadStatusToString(const UploadStatus& uploadStatus)
case UploadStatus::Complete: case UploadStatus::Complete:
return L"Complete"; return L"Complete";
case UploadStatus::Error:
return L"Error";
case UploadStatus::NotFound: case UploadStatus::NotFound:
return L"Not Found"; return L"Not Found";
@@ -271,9 +268,8 @@ UploadError CUploadManager::AddOrUpdate(const SString& siaPath, SString filePath
try try
{ {
SQLite::Statement query(_uploadDatabase, QUERY_UPLOADS_BY_SIA_PATH_AND_STATUS); SQLite::Statement query(_uploadDatabase, QUERY_UPLOADS_BY_SIA_PATH);
query.bind("@sia_path", SString::ToUtf8(siaPath).c_str()); query.bind("@sia_path", SString::ToUtf8(siaPath).c_str());
query.bind("@status", static_cast<unsigned>(UploadStatus::Uploading));
// Check uploading // Check uploading
bool addToDatabase = true; bool addToDatabase = true;
@@ -282,6 +278,7 @@ UploadError CUploadManager::AddOrUpdate(const SString& siaPath, SString filePath
UploadStatus uploadStatus = static_cast<UploadStatus>(static_cast<unsigned>(query.getColumn(query.getColumnIndex("status")))); UploadStatus uploadStatus = static_cast<UploadStatus>(static_cast<unsigned>(query.getColumn(query.getColumnIndex("status"))));
if (uploadStatus == UploadStatus::Uploading) if (uploadStatus == UploadStatus::Uploading)
{ {
// TODO only remove if file changed
addToDatabase = HandleFileRemove(CSiaCurl(GetHostConfig()), siaPath); addToDatabase = HandleFileRemove(CSiaCurl(GetHostConfig()), siaPath);
} }
else if (uploadStatus == UploadStatus::Queued) else if (uploadStatus == UploadStatus::Queued)
@@ -311,7 +308,7 @@ UploadError CUploadManager::AddOrUpdate(const SString& siaPath, SString filePath
} }
catch (SQLite::Exception e) catch (SQLite::Exception e)
{ {
CEventSystem::EventSystem.NotifyEvent(CreateSystemEvent(DatabaseExceptionOccurred("AddOrUpdate(insert)", e))); CEventSystem::EventSystem.NotifyEvent(CreateSystemEvent(DatabaseInsertFailed(siaPath, filePath, e.getErrorStr())));
ret = { UploadErrorCode::DatabaseError, e.getErrorStr() }; ret = { UploadErrorCode::DatabaseError, e.getErrorStr() };
} }
} }