BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Upload manager changes

Browse Source
This commit is contained in:
Scott E. Graves
2017-02-25 13:30:10 -06:00
parent dbdde8b996
commit 15088ed088
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SiaDrive.Api/UploadManager.cpp
View File

@@ -213,7 +213,7 @@ void CUploadManager::AutoThreadCallback(const CSiaCurl& siaCurl, CSiaDriveConfig
else if (uploadStatus == UploadStatus::Modified)
{
// TODO Delete from Sia first
SET_STATUS(UploadStatus::Modified, UploadModifiedInQueue, ModifyUploadStatusFailed)
SET_STATUS(UploadStatus::Queued, ModifiedUploadQueued, ModifyUploadStatusFailed)
}
else if ((*it)->GetUploadProgress() >= 100)
{
@@ -335,7 +335,7 @@ UploadError CUploadManager::AddOrUpdate(const String& siaPath, String filePath)
CEventSystem::EventSystem.NotifyEvent(CreateSystemEvent(ExistingUploadFound(siaPath, filePath, uploadStatus)));
if (uploadStatus == UploadStatus::Uploading)
{
// set to modified
SET_STATUS(UploadStatus::Modified, UploadModifiedInQueue, ModifyUploadStatusFailed)
}
}
else

32
SiaDrive.Api/UploadManager.h
View File

@@ -141,6 +141,38 @@ public:
}
};
class ModifiedUploadQueued :
public CEvent
{
public:
ModifiedUploadQueued(const String& siaPath, const String& filePath) :
_siaPath(siaPath),
_filePath(filePath)
{
}
public:
virtual ~ModifiedUploadQueued()
{
}
private:
const String _siaPath;
const String _filePath;
public:
virtual String GetSingleLineMessage() const override
{
return L"ModifiedUploadQueued|SP|" + _siaPath + L"|FP|" + _filePath;
}
virtual std::shared_ptr<CEvent> Clone() const override
{
return std::shared_ptr<CEvent>(new ModifiedUploadQueued(_siaPath, _filePath));
}
};
class UploadComplete :
public CEvent
{