VAR/FileSync
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Mark deleted nodes with the current date

Browse Source
This commit is contained in:
Valeriano A.R.
2015-11-11 01:33:18 +01:00
parent 2431d15223
commit b199ee425b
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/filenode.c
View File

@@ -98,6 +98,10 @@ void FileNode_AddChild(FileNode fileNode, FileNode fileNodeChild) {
void FileNode_SetStatusRec(FileNode fileNode, FileStatus status) { void FileNode_SetStatusRec(FileNode fileNode, FileStatus status) {
FileNode fileNodeChild; FileNode fileNodeChild;
fileNode->status = status; fileNode->status = status;
if (status == FileStatus_Deleted) {
fileNode->fileTime = Time_GetTime();
fileNode->flags |= FileFlag_HasTime;
}
fileNodeChild = fileNode->child; fileNodeChild = fileNode->child;
while (fileNodeChild != NULL) { while (fileNodeChild != NULL) {
FileNode_SetStatusRec(fileNodeChild, status); FileNode_SetStatusRec(fileNodeChild, status);

12
src/filenodecmp.c
View File

@@ -316,15 +316,9 @@ void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight,
} }
else if (fileNodeRight->status == FileStatus_Deleted) { else if (fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_DeleteLeft; actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
if (fileNodeLeft->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_Nothing;
}
} }
else if (fileNodeLeft->status == FileStatus_Deleted) { else if (fileNodeLeft->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_DeleteRight; actionFileNodeNew->action = ActionFileCmp_DeleteRight;
if (fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_Nothing;
}
} }
else { else {
actionFileNodeNew->action = ActionFileCmp_Nothing; actionFileNodeNew->action = ActionFileCmp_Nothing;
@@ -377,15 +371,9 @@ void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight,
} }
else if (fileNodeRight->status == FileStatus_Deleted) { else if (fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_DeleteLeft; actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
if (fileNodeLeft->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_Nothing;
}
} }
else if (fileNodeLeft->status == FileStatus_Deleted) { else if (fileNodeLeft->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_DeleteRight; actionFileNodeNew->action = ActionFileCmp_DeleteRight;
if (fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_Nothing;
}
} }
else { else {
actionFileNodeNew->action = ActionFileCmp_Nothing; actionFileNodeNew->action = ActionFileCmp_Nothing;