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

FileNode: Add Undeleted state. This fixes test_MoveToSubdirAndRestore.

Browse Source
This commit is contained in:
Valeriano A.R.
2018-05-05 22:18:37 +02:00
parent b4608dfcac
commit 90de728726
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/actionfilenodesync.c
View File

@@ -2,12 +2,12 @@
#include <stdlib.h>
#include <string.h>
#include "util.h"
#include "crc.h"
#include "fileutil.h"
#include "filenode.h"
#include "actionfilenode.h"
#include "actionfilenodesync.h"
#include "crc.h"
#include "filenode.h"
#include "fileutil.h"
#include "util.h"
#define MaxDeltaTime 0
@@ -96,6 +96,12 @@ void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight,
if (fileNodeRight->status == FileStatus_Deleted &&
fileNodeLeft->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_Nothing;
} else if (fileNodeLeft->status == FileStatus_Undeleted &&
fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
} else if (fileNodeLeft->status == FileStatus_Deleted &&
fileNodeRight->status == FileStatus_Undeleted) {
actionFileNodeNew->action = ActionFileCmp_RightToLeft;
} else if (fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
} else if (fileNodeLeft->status == FileStatus_Deleted) {
@@ -161,6 +167,12 @@ void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight,
if (fileNodeRight->status == FileStatus_Deleted &&
fileNodeLeft->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_Nothing;
} else if (fileNodeLeft->status == FileStatus_Undeleted &&
fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
} else if (fileNodeLeft->status == FileStatus_Deleted &&
fileNodeRight->status == FileStatus_Undeleted) {
actionFileNodeNew->action = ActionFileCmp_RightToLeft;
} else if (fileNodeRight->status == FileStatus_Deleted) {
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
} else if (fileNodeLeft->status == FileStatus_Deleted) {