BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Fixes

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-28 12:41:17 -05:00
parent 0055169dca
commit ffaf818e5f
7 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/siadrive_api/siacommon.h
View File

@@ -5,6 +5,9 @@
#define COMPAT_SIAD_VERSION "1.1.2"
#ifdef _WIN32
// Disable DLL-interface warnings
#pragma warning(disable: 4251)
// Unicode for Win32
#define UNICODE
#define _UNICODE

18
include/siadrive_api/uploadmanager.h
View File

@@ -110,11 +110,11 @@ public:
}
};
class UploadAddedToQueue :
class FileAddedToQueue :
public CEvent
{
public:
UploadAddedToQueue(const SString& siaPath, const SString& filePath, const SString& siaDriveFilePath) :
FileAddedToQueue(const SString& siaPath, const SString& filePath, const SString& siaDriveFilePath) :
_siaPath(siaPath),
_filePath(filePath),
_siaDriveFilePath(siaDriveFilePath)
@@ -123,7 +123,7 @@ public:
}
public:
virtual ~UploadAddedToQueue()
virtual ~FileAddedToQueue()
{
}
@@ -135,12 +135,12 @@ private:
public:
virtual SString GetSingleLineMessage() const override
{
return L"UploadAddedToQueue|SP|" + _siaPath + L"|FP|" + _filePath + "|SFP|" + _siaDriveFilePath;
return L"FileAddedToQueue|SP|" + _siaPath + L"|FP|" + _filePath + "|SFP|" + _siaDriveFilePath;
}
virtual std::shared_ptr<CEvent> Clone() const override
{
return std::shared_ptr<CEvent>(new UploadAddedToQueue(_siaPath, _filePath, _siaDriveFilePath));
return std::shared_ptr<CEvent>(new FileAddedToQueue(_siaPath, _filePath, _siaDriveFilePath));
}
};
@@ -812,7 +812,8 @@ class SIADRIVE_EXPORTABLE DatabaseExceptionOccurred :
public CEvent
{
public:
DatabaseExceptionOccurred(const SQLite::Exception& exception) :
DatabaseExceptionOccurred(const SString& duringOperation, const SQLite::Exception& exception) :
_duringOperation(duringOperation),
_exception(exception)
{
@@ -824,17 +825,18 @@ public:
}
private:
const SString _duringOperation;
const SQLite::Exception _exception;
public:
virtual std::shared_ptr<CEvent> Clone() const override
{
return std::shared_ptr<CEvent>(new DatabaseExceptionOccurred(_exception));
return std::shared_ptr<CEvent>(new DatabaseExceptionOccurred(_duringOperation, _exception));
}
virtual SString GetSingleLineMessage() const override
{
return L"DatabaseExceptionOccurred|MSG|" + SString();// _exception.getErrorStr());
return L"DatabaseExceptionOccurred|MSG|" + SString(_exception.getErrorStr()) + "|OPR|" + _duringOperation;
}
};