BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Fixed debug build

Browse Source 
Added renter upload db
This commit is contained in:
Scott E. Graves
2017-02-19 21:26:05 -06:00
parent 22d9e0f46b
commit 65f177ef39
8 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rd-party/SRombauts-SQLiteCpp-f69986a/build/SQLiteCpp.vcxproj vendored
View File

@@ -136,6 +136,7 @@
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat>
</DebugInformationFormat> </DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SQLITE_ENABLE_COLUMN_METADATA;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SQLITE_ENABLE_COLUMN_METADATA;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -165,6 +166,7 @@
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat>
</DebugInformationFormat> </DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SQLITE_ENABLE_COLUMN_METADATA;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SQLITE_ENABLE_COLUMN_METADATA;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>

1
SiaDrive.Api/SiaDriveConfig.cpp
View File

@@ -22,6 +22,7 @@ CSiaDriveConfig::~CSiaDriveConfig()
void CSiaDriveConfig::LoadDefaults() void CSiaDriveConfig::LoadDefaults()
{ {
SetUI_Main_TabIndex(0); SetUI_Main_TabIndex(0);
SetRenter_UploadDbFilePath("./Config/renter_upload.db3");
} }
void CSiaDriveConfig::Load( ) void CSiaDriveConfig::Load( )

1
SiaDrive.Api/SiaDriveConfig.h
View File

@@ -16,6 +16,7 @@ public:
Property(String, FilePath, public, private) Property(String, FilePath, public, private)
JProperty(std::uint8_t, UI_Main_TabIndex, public, private, _configDocument) JProperty(std::uint8_t, UI_Main_TabIndex, public, private, _configDocument)
JProperty(std::string, Renter_UploadDbFilePath, public, private, _configDocument)
private: private:
json _configDocument; json _configDocument;

5
SiaDrive.Api/UploadManager.cpp
View File

@@ -1,10 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "UploadManager.h" #include "UploadManager.h"
#include "SiaDriveConfig.h"
using namespace Sia::Api; using namespace Sia::Api;
CUploadManager::CUploadManager(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig) : CUploadManager::CUploadManager(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig) :
CAutoThread(siaCurl, siaDriveConfig) CAutoThread(siaCurl, siaDriveConfig),
_uploadDatabase(siaDriveConfig->GetRenter_UploadDbFilePath(), SQLite::OPEN_CREATE | SQLite::OPEN_READWRITE)
{ {
StartAutoThread(); StartAutoThread();
} }

4
SiaDrive.Api/UploadManager.h
View File

@@ -1,5 +1,6 @@
#pragma once #pragma once
#include "AutoThread.h" #include "AutoThread.h"
#include "SQLiteCpp/Database.h"
NS_BEGIN(Sia) NS_BEGIN(Sia)
NS_BEGIN(Api) NS_BEGIN(Api)
@@ -13,6 +14,9 @@ public:
public: public:
virtual ~CUploadManager(); virtual ~CUploadManager();
private:
SQLite::Database _uploadDatabase;
protected: protected:
virtual void AutoThreadCallback(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig) override; virtual void AutoThreadCallback(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig) override;
}; };

8
SiaDrive.Dokan.Api/SiaDrive.Dokan.Api.vcxproj
View File

@@ -92,7 +92,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;WIN32;_WINDOWS;_DEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;WIN32;_WINDOWS;_DEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@@ -116,7 +116,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;_WINDOWS;_DEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;_WINDOWS;_DEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@@ -142,7 +142,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;WIN32;_WINDOWS;NDEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;WIN32;_WINDOWS;NDEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@@ -170,7 +170,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;_WINDOWS;NDEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;TTMATH_NOASM;_WINDOWS;NDEBUG;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\Dokan Library-1.0.2\include;..\SiaDrive.Api;..\3rd-party\ttmath-0.9.3</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

8
SiaDrive/SiaDrive.vcxproj
View File

@@ -92,7 +92,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TTMATH_NOASM;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@@ -117,7 +117,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TTMATH_NOASM;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api\</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@@ -142,7 +142,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>TTMATH_NOASM;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@@ -171,7 +171,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>TTMATH_NOASM;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\SiaDrive.Api\</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

8
UnitTests/UnitTests.vcxproj
View File

@@ -90,7 +90,7 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
@@ -106,7 +106,7 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
@@ -122,7 +122,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
@@ -142,7 +142,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>