BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Fix delete directory

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-29 17:14:55 -05:00
parent 81c0aed78c
commit e94d7169e4
3 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/siadrive_api/siaapi.h
View File

@@ -181,6 +181,7 @@ public:
_SiaApiError GetFileTree(std::shared_ptr<_CSiaFileTree>& siaFileTree) const; _SiaApiError GetFileTree(std::shared_ptr<_CSiaFileTree>& siaFileTree) const;
_SiaRenterAllowance GetAllowance() const; _SiaRenterAllowance GetAllowance() const;
_SiaApiError SetAllowance(const _SiaRenterAllowance& renterAllowance); _SiaApiError SetAllowance(const _SiaRenterAllowance& renterAllowance);
_SiaApiError RefreshFileTree( );
}; };
class SIADRIVE_EXPORTABLE _CSiaConsensus : class SIADRIVE_EXPORTABLE _CSiaConsensus :

30
src/siadrive_api/siarenter.cpp
View File

@@ -79,14 +79,11 @@ void CSiaApi::_CSiaRenter::Refresh(const CSiaCurl& siaCurl, CSiaDriveConfig* sia
SetRenewWindow(renewWindow); SetRenewWindow(renewWindow);
SetPeriod(period); SetPeriod(period);
_currentAllowance = { funds, hosts, period, renewWindow }; _currentAllowance = { funds, hosts, period, renewWindow };
CSiaFileTreePtr fileTree(new CSiaFileTree(siaCurl, siaDriveConfig));
if (ApiSuccess(siaCurl.Get(L"/renter/files", result))) if (ApiSuccess(RefreshFileTree()))
{ {
fileTree->BuildTree(result); CSiaFileTreePtr fileTree;
{ GetFileTree(fileTree);
std::lock_guard<std::mutex> l(_fileTreeMutex);
_fileTree = fileTree;
}
auto fileList = fileTree->GetFileList(); auto fileList = fileTree->GetFileList();
if (fileList.size()) if (fileList.size())
@@ -129,6 +126,23 @@ void CSiaApi::_CSiaRenter::Refresh(const CSiaCurl& siaCurl, CSiaDriveConfig* sia
} }
} }
SiaApiError CSiaApi::_CSiaRenter::RefreshFileTree( )
{
SiaApiError ret = SiaApiError::RequestError;
CSiaFileTreePtr tempTree(new CSiaFileTree(GetSiaCurl(), &GetSiaDriveConfig()));
json result;
if (ApiSuccess(GetSiaCurl().Get(L"/renter/files", result)))
{
tempTree->BuildTree(result);
{
std::lock_guard<std::mutex> l(_fileTreeMutex);
_fileTree = tempTree;
}
}
return ret;
}
SiaApiError CSiaApi::_CSiaRenter::FileExists(const SString& siaPath, bool& exists) const SiaApiError CSiaApi::_CSiaRenter::FileExists(const SString& siaPath, bool& exists) const
{ {
CSiaFileTreePtr siaFileTree; CSiaFileTreePtr siaFileTree;

55
src/siadrive_dokan_api/siadokandrive.cpp
View File

@@ -127,12 +127,7 @@ private:
{ {
do do
{ {
CSiaFileTreePtr siaFileTree; RefreshActiveFileTree();
_siaApi->GetRenter()->GetFileTree(siaFileTree);
{
std::lock_guard<std::mutex> l(_fileTreeMutex);
_siaFileTree = siaFileTree;
}
} while (::WaitForSingleObject(_fileListStopEvent, 1000) == WAIT_TIMEOUT); } while (::WaitForSingleObject(_fileListStopEvent, 1000) == WAIT_TIMEOUT);
})); }));
} }
@@ -149,6 +144,21 @@ private:
} }
} }
static void RefreshActiveFileTree(const bool& force = false)
{
if (force)
{
_siaApi->GetRenter()->RefreshFileTree();
}
CSiaFileTreePtr siaFileTree;
_siaApi->GetRenter()->GetFileTree(siaFileTree);
{
std::lock_guard<std::mutex> l(_fileTreeMutex);
_siaFileTree = siaFileTree;
}
}
// Dokan callbacks // Dokan callbacks
private: private:
static NTSTATUS DOKAN_CALLBACK Sia_ZwCreateFile( static NTSTATUS DOKAN_CALLBACK Sia_ZwCreateFile(
@@ -183,7 +193,7 @@ private:
{ {
// When filePath is a directory, needs to change the flag so that the file can // When filePath is a directory, needs to change the flag so that the file can
// be opened. // be opened.
FilePath cacheFilePath(GetCacheLocation(), &fileName[1]); FilePath cacheFilePath(GetCacheLocation(), fileName);
DWORD fileAttr = ::GetFileAttributes(&cacheFilePath[0]); DWORD fileAttr = ::GetFileAttributes(&cacheFilePath[0]);
if ((fileAttr != INVALID_FILE_ATTRIBUTES) && if ((fileAttr != INVALID_FILE_ATTRIBUTES) &&
@@ -211,7 +221,7 @@ private:
} }
else if (creationDisposition == OPEN_ALWAYS) else if (creationDisposition == OPEN_ALWAYS)
{ {
if (cacheFilePath.CreateDirectory()) if (!cacheFilePath.CreateDirectory())
{ {
DWORD error = GetLastError(); DWORD error = GetLastError();
if (error != ERROR_ALREADY_EXISTS) if (error != ERROR_ALREADY_EXISTS)
@@ -228,20 +238,22 @@ private:
!(fileAttr & FILE_ATTRIBUTE_DIRECTORY) && !(fileAttr & FILE_ATTRIBUTE_DIRECTORY) &&
(createOptions & FILE_DIRECTORY_FILE)) (createOptions & FILE_DIRECTORY_FILE))
{ {
return STATUS_NOT_A_DIRECTORY; ret = STATUS_NOT_A_DIRECTORY;
}
// FILE_FLAG_BACKUP_SEMANTICS is required for opening directory handles
HANDLE handle = ::CreateFile(&cacheFilePath[0], genericDesiredAccess, shareAccess, &securityAttrib, OPEN_EXISTING, fileAttributesAndFlags | FILE_FLAG_BACKUP_SEMANTICS, nullptr);
if (handle == INVALID_HANDLE_VALUE)
{
DWORD error = GetLastError();
ret = DokanNtStatusFromWin32(error);
}
else
{
dokanFileInfo->Context = reinterpret_cast<ULONG64>(handle); // save the file handle in Context
} }
else
{
// FILE_FLAG_BACKUP_SEMANTICS is required for opening directory handles
HANDLE handle = ::CreateFile(&cacheFilePath[0], genericDesiredAccess, shareAccess, &securityAttrib, OPEN_EXISTING, fileAttributesAndFlags | FILE_FLAG_BACKUP_SEMANTICS, nullptr);
if (handle == INVALID_HANDLE_VALUE)
{
DWORD error = GetLastError();
ret = DokanNtStatusFromWin32(error);
}
else
{
dokanFileInfo->Context = reinterpret_cast<ULONG64>(handle); // save the file handle in Context
}
}
} }
} }
else // File (cache and/or Sia operation) else // File (cache and/or Sia operation)
@@ -927,6 +939,7 @@ private:
{ {
} }
} }
RefreshActiveFileTree(true);
} }
} }