RPJosh
/
Pocketbook-Nextcloud-Client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if downloaded status still is true or files have been removed locally

master
JuanJakobo 2022-09-09 10:13:06 +02:00
parent b14f87c5a7
commit 0852280c82
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/handler/eventHandler.cpp
View File

@ -602,6 +602,7 @@ void EventHandler::downloadFolder(vector<WebDAVItem> &items, int itemID)
UpdateProgressbar(("Syncing folder" + path).c_str(), 0); UpdateProgressbar(("Syncing folder" + path).c_str(), 0);
tempItems = _webDAV.getDataStructure(path); tempItems = _webDAV.getDataStructure(path);
items.at(itemID).state = FileState::IDOWNLOADED; items.at(itemID).state = FileState::IDOWNLOADED;
_sqllite.updateState(items.at(itemID).path,items.at(itemID).state);
updateItems(tempItems); updateItems(tempItems);
break; break;
} }
@ -639,10 +640,7 @@ void EventHandler::downloadFolder(vector<WebDAVItem> &items, int itemID)
getLocalFileStructure(tempItems); getLocalFileStructure(tempItems);
//first item of the vector is the root path itself //first item of the vector is the root path itself
for (size_t i = 1; i < tempItems.size(); i++) for (size_t i = 1; i < tempItems.size(); i++)
{
Log::writeInfoLog("Item: " + tempItems.at(i).path);
downloadFolder(tempItems, i); downloadFolder(tempItems, i);
}
} }
//compare if file is in DB //compare if file is in DB
@ -659,7 +657,6 @@ void EventHandler::downloadFolder(vector<WebDAVItem> &items, int itemID)
case FileState::IOUTSYNCED: case FileState::IOUTSYNCED:
case FileState::ICLOUD: case FileState::ICLOUD:
{ {
Log::writeInfoLog("outsynced");
//TODO both direction //TODO both direction
//1. check etag --> if is differnt, cloud has been updated //1. check etag --> if is differnt, cloud has been updated
//2. check modification date and file size locally --> if is different, local has been updated //2. check modification date and file size locally --> if is different, local has been updated
@ -719,6 +716,32 @@ void EventHandler::startDownload()
_webDAVView->reDrawCurrentEntry(); _webDAVView->reDrawCurrentEntry();
} }
bool EventHandler::checkIfIsDownloaded(vector<WebDAVItem> &items, int itemID)
{
if (iv_access(items.at(itemID).localPath.c_str(), W_OK) != 0)
{
items.at(itemID).state = FileState::IOUTSYNCED;
_sqllite.updateState(items.at(itemID).path,items.at(itemID).state);
return false;
}
if (items.at(itemID).type == Itemtype::IFOLDER)
{
vector<WebDAVItem> tempItems = _sqllite.getItemsChildren(items.at(itemID).path);
//first item of the vector is the root path itself
for (size_t i = 1; i < tempItems.size(); i++)
{
if(!checkIfIsDownloaded(tempItems, i))
{
items.at(itemID).state = FileState::IOUTSYNCED;
_sqllite.updateState(items.at(itemID).path,items.at(itemID).state);
return false;
}
}
}
return true;
}
void EventHandler::updateItems(vector<WebDAVItem> &items) void EventHandler::updateItems(vector<WebDAVItem> &items)
{ {
for(auto &item : items) for(auto &item : items)
@ -735,20 +758,23 @@ void EventHandler::updateItems(vector<WebDAVItem> &items)
} }
else else
{ {
if (iv_access(item.localPath.c_str(), W_OK) != 0) if(item.state == FileState::IDOWNLOADED)
{ {
//TODO here if status is downloadad try aginst the DB all kids vector<WebDAVItem> currentItems = _sqllite.getItemsChildren(item.path);
if(items.at(0).state != FileState::IDOWNLOADED) if(!checkIfIsDownloaded(currentItems,0))
items.at(0).state = FileState::IOUTSYNCED; item.state = FileState::IOUTSYNCED;
iv_mkdir(item.localPath.c_str(), 0777);
} }
if (iv_access(item.localPath.c_str(), W_OK) != 0)
iv_mkdir(item.localPath.c_str(), 0777);
} }
if (_sqllite.getEtag(item.path).compare(item.etag) != 0) if (_sqllite.getEtag(item.path).compare(item.etag) != 0)
item.state = (item.state == FileState::ISYNCED || item.state == FileState::IDOWNLOADED) ? FileState::IOUTSYNCED : FileState::ICLOUD; item.state = (item.state == FileState::ISYNCED || item.state == FileState::IDOWNLOADED) ? FileState::IOUTSYNCED : FileState::ICLOUD;
} }
if(items.at(0).state != FileState::IDOWNLOADED) if(items.at(0).state != FileState::IDOWNLOADED)
{
items.at(0).state = FileState::ISYNCED; items.at(0).state = FileState::ISYNCED;
}
_sqllite.saveItemsChildren(items); _sqllite.saveItemsChildren(items);
//TODO sync delete when not parentPath existend --> "select * from metadata where parentPath NOT IN (Select //TODO sync delete when not parentPath existend --> "select * from metadata where parentPath NOT IN (Select

2
src/handler/eventHandler.h
View File

@ -126,6 +126,8 @@ private:
void startDownload(); void startDownload();
bool checkIfIsDownloaded(std::vector<WebDAVItem> &items, int itemID);
void updateItems(std::vector<WebDAVItem> &items); void updateItems(std::vector<WebDAVItem> &items);
void drawWebDAVItems(std::vector<WebDAVItem> &items); void drawWebDAVItems(std::vector<WebDAVItem> &items);