diff --git a/3rd-party/SRombauts-SQLiteCpp-f69986a/build/SQLiteCpp.vcxproj b/3rd-party/SRombauts-SQLiteCpp-f69986a/build/SQLiteCpp.vcxproj
index 75e4a9a..0db754f 100644
--- a/3rd-party/SRombauts-SQLiteCpp-f69986a/build/SQLiteCpp.vcxproj
+++ b/3rd-party/SRombauts-SQLiteCpp-f69986a/build/SQLiteCpp.vcxproj
@@ -136,6 +136,7 @@
$(IntDir)
+ MultiThreadedDebugDLL
_CRT_SECURE_NO_WARNINGS;SQLITE_ENABLE_COLUMN_METADATA;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)
@@ -165,6 +166,7 @@
$(IntDir)
+ MultiThreadedDebugDLL
_CRT_SECURE_NO_WARNINGS;SQLITE_ENABLE_COLUMN_METADATA;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)
diff --git a/SiaDrive.Api/SiaDriveConfig.cpp b/SiaDrive.Api/SiaDriveConfig.cpp
index beaabe2..f8ae942 100644
--- a/SiaDrive.Api/SiaDriveConfig.cpp
+++ b/SiaDrive.Api/SiaDriveConfig.cpp
@@ -22,6 +22,7 @@ CSiaDriveConfig::~CSiaDriveConfig()
void CSiaDriveConfig::LoadDefaults()
{
SetUI_Main_TabIndex(0);
+ SetRenter_UploadDbFilePath("./Config/renter_upload.db3");
}
void CSiaDriveConfig::Load( )
diff --git a/SiaDrive.Api/SiaDriveConfig.h b/SiaDrive.Api/SiaDriveConfig.h
index 55e5a47..952f549 100644
--- a/SiaDrive.Api/SiaDriveConfig.h
+++ b/SiaDrive.Api/SiaDriveConfig.h
@@ -16,6 +16,7 @@ public:
Property(String, FilePath, public, private)
JProperty(std::uint8_t, UI_Main_TabIndex, public, private, _configDocument)
+ JProperty(std::string, Renter_UploadDbFilePath, public, private, _configDocument)
private:
json _configDocument;
diff --git a/SiaDrive.Api/UploadManager.cpp b/SiaDrive.Api/UploadManager.cpp
index 268f6f2..06573ac 100644
--- a/SiaDrive.Api/UploadManager.cpp
+++ b/SiaDrive.Api/UploadManager.cpp
@@ -1,10 +1,11 @@
#include "stdafx.h"
#include "UploadManager.h"
-
+#include "SiaDriveConfig.h"
using namespace Sia::Api;
CUploadManager::CUploadManager(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig) :
- CAutoThread(siaCurl, siaDriveConfig)
+ CAutoThread(siaCurl, siaDriveConfig),
+ _uploadDatabase(siaDriveConfig->GetRenter_UploadDbFilePath(), SQLite::OPEN_CREATE | SQLite::OPEN_READWRITE)
{
StartAutoThread();
}
diff --git a/SiaDrive.Api/UploadManager.h b/SiaDrive.Api/UploadManager.h
index fe3e462..7b3183f 100644
--- a/SiaDrive.Api/UploadManager.h
+++ b/SiaDrive.Api/UploadManager.h
@@ -1,5 +1,6 @@
#pragma once
#include "AutoThread.h"
+#include "SQLiteCpp/Database.h"
NS_BEGIN(Sia)
NS_BEGIN(Api)
@@ -13,6 +14,9 @@ public:
public:
virtual ~CUploadManager();
+private:
+ SQLite::Database _uploadDatabase;
+
protected:
virtual void AutoThreadCallback(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig) override;
};
diff --git a/SiaDrive.Dokan.Api/SiaDrive.Dokan.Api.vcxproj b/SiaDrive.Dokan.Api/SiaDrive.Dokan.Api.vcxproj
index 74f6127..9b3051e 100644
--- a/SiaDrive.Dokan.Api/SiaDrive.Dokan.Api.vcxproj
+++ b/SiaDrive.Dokan.Api/SiaDrive.Dokan.Api.vcxproj
@@ -92,7 +92,7 @@
Disabled
CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;WIN32;_WINDOWS;_DEBUG;_AFXEXT;%(PreprocessorDefinitions)
true
- ..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
Windows
@@ -116,7 +116,7 @@
Disabled
CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;_WINDOWS;_DEBUG;_AFXEXT;%(PreprocessorDefinitions)
true
- ..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
Windows
@@ -142,7 +142,7 @@
true
CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;WIN32;_WINDOWS;NDEBUG;_AFXEXT;%(PreprocessorDefinitions)
true
- ..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
Windows
@@ -170,7 +170,7 @@
true
CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;_WINDOWS;NDEBUG;_AFXEXT;%(PreprocessorDefinitions)
true
- ..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3
Windows
diff --git a/SiaDrive/SiaDrive.vcxproj b/SiaDrive/SiaDrive.vcxproj
index 9109697..8fbed51 100644
--- a/SiaDrive/SiaDrive.vcxproj
+++ b/SiaDrive/SiaDrive.vcxproj
@@ -92,7 +92,7 @@
Disabled
TTMATH_NOASM;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)
true
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;%(AdditionalIncludeDirectories)
+ ..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api;%(AdditionalIncludeDirectories)
Windows
@@ -117,7 +117,7 @@
Disabled
TTMATH_NOASM;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)
true
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api\
+ ..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api\
Windows
@@ -142,7 +142,7 @@
true
TTMATH_NOASM;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)
true
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;%(AdditionalIncludeDirectories)
+ ..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api;%(AdditionalIncludeDirectories)
Windows
@@ -171,7 +171,7 @@
true
TTMATH_NOASM;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)
true
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api\
+ ..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api\
Windows
diff --git a/UnitTests/UnitTests.vcxproj b/UnitTests/UnitTests.vcxproj
index 841f870..8c864df 100644
--- a/UnitTests/UnitTests.vcxproj
+++ b/UnitTests/UnitTests.vcxproj
@@ -90,7 +90,7 @@
Use
Level3
Disabled
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
TTMATH_NOASM;WIN32;_DEBUG;%(PreprocessorDefinitions)
true
@@ -106,7 +106,7 @@
Use
Level3
Disabled
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
TTMATH_NOASM;_DEBUG;%(PreprocessorDefinitions)
true
@@ -122,7 +122,7 @@
MaxSpeed
true
true
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
TTMATH_NOASM;WIN32;NDEBUG;%(PreprocessorDefinitions)
true
@@ -142,7 +142,7 @@
MaxSpeed
true
true
- ..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
+ ..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
TTMATH_NOASM;NDEBUG;%(PreprocessorDefinitions)
true