From b199ee425b64acf277cdc533b55443c4dddd30cf Mon Sep 17 00:00:00 2001 From: "Valeriano A.R" Date: Wed, 11 Nov 2015 01:33:18 +0100 Subject: [PATCH] Mark deleted nodes with the current date --- src/filenode.c | 4 ++++ src/filenodecmp.c | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/filenode.c b/src/filenode.c index 5b50abe..8470d2e 100644 --- a/src/filenode.c +++ b/src/filenode.c @@ -98,6 +98,10 @@ void FileNode_AddChild(FileNode fileNode, FileNode fileNodeChild) { void FileNode_SetStatusRec(FileNode fileNode, FileStatus status) { FileNode fileNodeChild; fileNode->status = status; + if (status == FileStatus_Deleted) { + fileNode->fileTime = Time_GetTime(); + fileNode->flags |= FileFlag_HasTime; + } fileNodeChild = fileNode->child; while (fileNodeChild != NULL) { FileNode_SetStatusRec(fileNodeChild, status); diff --git a/src/filenodecmp.c b/src/filenodecmp.c index 0de45c0..d1810e4 100644 --- a/src/filenodecmp.c +++ b/src/filenodecmp.c @@ -316,15 +316,9 @@ void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight, } else if (fileNodeRight->status == FileStatus_Deleted) { actionFileNodeNew->action = ActionFileCmp_DeleteLeft; - if (fileNodeLeft->status == FileStatus_Deleted) { - actionFileNodeNew->action = ActionFileCmp_Nothing; - } } else if (fileNodeLeft->status == FileStatus_Deleted) { actionFileNodeNew->action = ActionFileCmp_DeleteRight; - if (fileNodeRight->status == FileStatus_Deleted) { - actionFileNodeNew->action = ActionFileCmp_Nothing; - } } else { actionFileNodeNew->action = ActionFileCmp_Nothing; @@ -377,15 +371,9 @@ void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight, } else if (fileNodeRight->status == FileStatus_Deleted) { actionFileNodeNew->action = ActionFileCmp_DeleteLeft; - if (fileNodeLeft->status == FileStatus_Deleted) { - actionFileNodeNew->action = ActionFileCmp_Nothing; - } } else if (fileNodeLeft->status == FileStatus_Deleted) { actionFileNodeNew->action = ActionFileCmp_DeleteRight; - if (fileNodeRight->status == FileStatus_Deleted) { - actionFileNodeNew->action = ActionFileCmp_Nothing; - } } else { actionFileNodeNew->action = ActionFileCmp_Nothing;