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

Fix phantom file delete action on "Copy" action

Browse Source
This commit is contained in:
Valeriano A.R.
2013-10-21 01:26:42 +02:00
parent 32f62dc55e
commit 3ac813e281
1 changed files with 90 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
filenodecmp.c
View File

@@ -8,6 +8,8 @@
#include "filenode.h" #include "filenode.h"
#include "filenodecmp.h" #include "filenodecmp.h"
#define QueueNode(queue,node) (queue)->next = node; (queue) = node;
AccionFileNode *_actionFileNodeFree = NULL; AccionFileNode *_actionFileNodeFree = NULL;
int _actionFileNodeFreeCount = 0; int _actionFileNodeFreeCount = 0;
#define AccionFileNode_Tocho 1024 #define AccionFileNode_Tocho 1024
@@ -138,43 +140,41 @@ void AccionFileNode_CompareChilds(AccionFileNode *actionFileNodeRoot,
void AccionFileNode_DeletePair(FileNode *fileNodeLeft, FileNode *fileNodeRight, void AccionFileNode_DeletePair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
AccionFileNode **actionFileNodeQueue) { AccionFileNode **actionFileNodeQueue) {
AccionFileNode *afnNew = AccionFileNode_CreateNormal(fileNodeLeft, AccionFileNode *actionFileNodeNew = AccionFileNode_CreateNormal(
fileNodeRight); fileNodeLeft, fileNodeRight);
if (!fileNodeLeft && !fileNodeRight) { if (!fileNodeLeft && !fileNodeRight) {
AccionFileNode_Destroy(afnNew); AccionFileNode_Destroy(actionFileNodeNew);
return; return;
} }
if (!fileNodeLeft && fileNodeRight) { if (!fileNodeLeft && fileNodeRight) {
if (fileNodeRight->flags & FileFlag_Directory) { if (fileNodeRight->flags & FileFlag_Directory) {
// Iterar hijos para borrarlos // Iterar hijos para borrarlos
AccionFileNode_CompareChilds(afnNew, actionFileNodeQueue, AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
AccionFileNode_DeletePair); AccionFileNode_DeletePair);
} }
if (fileNodeRight->estado != FileStatus_Deleted) { if (fileNodeRight->estado != FileStatus_Deleted) {
// Accion de borrado para el nodo // Accion de borrado para el nodo
afnNew->action = AccionFileCmp_DeleteRight; actionFileNodeNew->action = AccionFileCmp_DeleteRight;
(*actionFileNodeQueue)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = afnNew;
} else { } else {
AccionFileNode_Destroy(afnNew); AccionFileNode_Destroy(actionFileNodeNew);
} }
} }
if (fileNodeLeft && !fileNodeRight) { if (fileNodeLeft && !fileNodeRight) {
if (fileNodeLeft->flags & FileFlag_Directory) { if (fileNodeLeft->flags & FileFlag_Directory) {
// Iterar hijos para borrarlos // Iterar hijos para borrarlos
AccionFileNode_CompareChilds(afnNew, actionFileNodeQueue, AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
AccionFileNode_DeletePair); AccionFileNode_DeletePair);
} }
if (fileNodeLeft->estado != FileStatus_Deleted) { if (fileNodeLeft->estado != FileStatus_Deleted) {
// Accion de borrado para el nodo // Accion de borrado para el nodo
afnNew->action = AccionFileCmp_DeleteLeft; actionFileNodeNew->action = AccionFileCmp_DeleteLeft;
(*actionFileNodeQueue)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = afnNew;
} else { } else {
AccionFileNode_Destroy(afnNew); AccionFileNode_Destroy(actionFileNodeNew);
} }
} }
if (fileNodeLeft && fileNodeRight) { if (fileNodeLeft && fileNodeRight) {
@@ -183,30 +183,28 @@ void AccionFileNode_DeletePair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
// Alguno es directorio // Alguno es directorio
// Iterar hijos para borrarlos // Iterar hijos para borrarlos
AccionFileNode_CompareChilds(afnNew, actionFileNodeQueue, AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
AccionFileNode_DeletePair); AccionFileNode_DeletePair);
} }
if (fileNodeLeft->estado != FileStatus_Deleted) { if (fileNodeLeft->estado != FileStatus_Deleted) {
// Accion de borrado para el nodo izquierdo // Accion de borrado para el nodo izquierdo
afnNew->action = AccionFileCmp_DeleteLeft; actionFileNodeNew->action = AccionFileCmp_DeleteLeft;
(*actionFileNodeQueue)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = afnNew; actionFileNodeNew = NULL;
afnNew = NULL;
} }
if (fileNodeRight->estado != FileStatus_Deleted) { if (fileNodeRight->estado != FileStatus_Deleted) {
if (!afnNew) { if (!actionFileNodeNew) {
afnNew = AccionFileNode_CreateNormal(fileNodeLeft, actionFileNodeNew = AccionFileNode_CreateNormal(fileNodeLeft,
fileNodeRight); fileNodeRight);
} }
// Accion de borrado para el nodo derecho // Accion de borrado para el nodo derecho
afnNew->action = AccionFileCmp_DeleteRight; actionFileNodeNew->action = AccionFileCmp_DeleteRight;
(*actionFileNodeQueue)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = afnNew; actionFileNodeNew = NULL;
afnNew = NULL;
} }
if (afnNew) { if (actionFileNodeNew) {
AccionFileNode_Destroy(afnNew); AccionFileNode_Destroy(actionFileNodeNew);
} }
} }
} }
@@ -225,17 +223,10 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
// Directory // Directory
if (fileNodeRight->estado == FileStatus_Deleted) { if (fileNodeRight->estado == FileStatus_Deleted) {
actionFileNodeNew->action = AccionFileCmp_Nothing; actionFileNodeNew->action = AccionFileCmp_Nothing;
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
// Anhadir a la lista de acciones
(*actionFileNodeQueue)->next = actionFileNodeNew;
(*actionFileNodeQueue) = actionFileNodeNew;
} else { } else {
actionFileNodeNew->action = AccionFileCmp_MakeLeftDirectory; actionFileNodeNew->action = AccionFileCmp_MakeLeftDirectory;
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
// Anhadir a la lista de acciones
(*actionFileNodeQueue)->next = actionFileNodeNew;
(*actionFileNodeQueue) = actionFileNodeNew;
// Iterar hijos // Iterar hijos
AccionFileNode_CompareChilds(actionFileNodeNew, AccionFileNode_CompareChilds(actionFileNodeNew,
@@ -245,8 +236,7 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
actionFileNodeNew = AccionFileNode_CreateNormal(fileNodeLeft, actionFileNodeNew = AccionFileNode_CreateNormal(fileNodeLeft,
fileNodeRight); fileNodeRight);
actionFileNodeNew->action = AccionFileCmp_DateRightToLeft; actionFileNodeNew->action = AccionFileCmp_DateRightToLeft;
(*actionFileNodeQueue)->next = actionFileNodeNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = actionFileNodeNew;
} }
} else { } else {
// File // File
@@ -255,8 +245,7 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
} else { } else {
actionFileNodeNew->action = AccionFileCmp_RightToLeft; actionFileNodeNew->action = AccionFileCmp_RightToLeft;
} }
(*actionFileNodeQueue)->next = actionFileNodeNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = actionFileNodeNew;
} }
} }
if (fileNodeLeft && !fileNodeRight) { if (fileNodeLeft && !fileNodeRight) {
@@ -264,17 +253,10 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
// Directory // Directory
if (fileNodeLeft->estado == FileStatus_Deleted) { if (fileNodeLeft->estado == FileStatus_Deleted) {
actionFileNodeNew->action = AccionFileCmp_Nothing; actionFileNodeNew->action = AccionFileCmp_Nothing;
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
// Anhadir a la lista de acciones
(*actionFileNodeQueue)->next = actionFileNodeNew;
(*actionFileNodeQueue) = actionFileNodeNew;
} else { } else {
actionFileNodeNew->action = AccionFileCmp_MakeRightDirectory; actionFileNodeNew->action = AccionFileCmp_MakeRightDirectory;
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
// Anhadir a la lista de acciones
(*actionFileNodeQueue)->next = actionFileNodeNew;
(*actionFileNodeQueue) = actionFileNodeNew;
// Iterar hijos // Iterar hijos
AccionFileNode_CompareChilds(actionFileNodeNew, AccionFileNode_CompareChilds(actionFileNodeNew,
@@ -284,8 +266,7 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
actionFileNodeNew = AccionFileNode_CreateNormal(fileNodeLeft, actionFileNodeNew = AccionFileNode_CreateNormal(fileNodeLeft,
fileNodeRight); fileNodeRight);
actionFileNodeNew->action = AccionFileCmp_DateLeftToRight; actionFileNodeNew->action = AccionFileCmp_DateLeftToRight;
(*actionFileNodeQueue)->next = actionFileNodeNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = actionFileNodeNew;
} }
} else { } else {
// File // File
@@ -294,8 +275,7 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
} else { } else {
actionFileNodeNew->action = AccionFileCmp_LeftToRight; actionFileNodeNew->action = AccionFileCmp_LeftToRight;
} }
(*actionFileNodeQueue)->next = actionFileNodeNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*actionFileNodeQueue) = actionFileNodeNew;
} }
} }
if (fileNodeLeft && fileNodeRight) { if (fileNodeLeft && fileNodeRight) {
@@ -351,11 +331,7 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
AccionFileNode_CompareChilds(actionFileNodeNew, AccionFileNode_CompareChilds(actionFileNodeNew,
actionFileNodeQueue, AccionFileNode_CheckPair); actionFileNodeQueue, AccionFileNode_CheckPair);
} }
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
// Encolar accion para el directorio padre
(*actionFileNodeQueue)->next = actionFileNodeNew;
(*actionFileNodeQueue) = actionFileNodeNew;
} else if ((fileNodeLeft->flags & FileFlag_Normal) } else if ((fileNodeLeft->flags & FileFlag_Normal)
&& (fileNodeRight->flags & FileFlag_Normal)) { && (fileNodeRight->flags & FileFlag_Normal)) {
// Ficheros // Ficheros
@@ -397,11 +373,7 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
} }
} }
} }
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
// Encolar accion para el fichero
(*actionFileNodeQueue)->next = actionFileNodeNew;
(*actionFileNodeQueue) = actionFileNodeNew;
} else { } else {
// FIXME: !!!!! // FIXME: !!!!!
// Directory vs File // Directory vs File
@@ -411,86 +383,89 @@ void AccionFileNode_CheckPair(FileNode *fileNodeLeft, FileNode *fileNodeRight,
} }
AccionFileNode *AccionFileNode_BuildSync(FileNode *izquierda, FileNode *derecha) { AccionFileNode *AccionFileNode_BuildSync(FileNode *izquierda, FileNode *derecha) {
AccionFileNode *afnRaiz = AccionFileNode_CreateNormal(izquierda, derecha); AccionFileNode *actionFileNodeRoot = AccionFileNode_CreateNormal(izquierda,
AccionFileNode *afnCola = afnRaiz; derecha);
AccionFileNode *actionFileNodeQueue = actionFileNodeRoot;
AccionFileNode_CompareChilds(afnRaiz, &afnCola, AccionFileNode_CheckPair); AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue,
AccionFileNode_CheckPair);
return afnRaiz; return actionFileNodeRoot;
} }
void AccionFileNode_Copy(FileNode *fnIzq, FileNode *fnDer, void AccionFileNode_Copy(FileNode *fileNodeLeft, FileNode *fileNodeRight,
AccionFileNode **afnCola) { AccionFileNode **actionFileNodeQueue) {
AccionFileNode *afnNew = AccionFileNode_CreateNormal(fnIzq, fnDer); AccionFileNode *actionFileNodeNew = AccionFileNode_CreateNormal(
fileNodeLeft, fileNodeRight);
if (!fnIzq && !fnDer) { if (!fileNodeLeft && !fileNodeRight) {
AccionFileNode_Destroy(afnNew); AccionFileNode_Destroy(actionFileNodeNew);
return; return;
} }
if (!fnIzq && fnDer) { if (!fileNodeLeft && fileNodeRight) {
if (fnDer->flags & FileFlag_Directory) { if (fileNodeRight->flags & FileFlag_Directory) {
AccionFileNode_CompareChilds(afnNew, afnCola, AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
AccionFileNode_DeletePair); AccionFileNode_DeletePair);
} }
if (fnDer->estado != FileStatus_Deleted) { if (fileNodeRight->estado != FileStatus_Deleted) {
afnNew->action = AccionFileCmp_DeleteRight; actionFileNodeNew->action = AccionFileCmp_DeleteRight;
} else { } else {
afnNew->action = AccionFileCmp_Nothing; actionFileNodeNew->action = AccionFileCmp_Nothing;
} }
(*afnCola)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*afnCola) = afnNew;
} }
if (fnIzq && !fnDer) { if (fileNodeLeft && !fileNodeRight) {
if (fnIzq->estado != FileStatus_Deleted) { if (fileNodeLeft->estado != FileStatus_Deleted) {
if (fnIzq->flags & FileFlag_Directory) { if (fileNodeLeft->flags & FileFlag_Directory) {
afnNew->action = AccionFileCmp_MakeRightDirectory; actionFileNodeNew->action = AccionFileCmp_MakeRightDirectory;
(*afnCola)->next = afnNew; (*actionFileNodeQueue)->next = actionFileNodeNew;
(*afnCola) = afnNew; (*actionFileNodeQueue) = actionFileNodeNew;
AccionFileNode_CompareChilds(afnNew, afnCola, AccionFileNode_CompareChilds(actionFileNodeNew,
AccionFileNode_Copy); actionFileNodeQueue, AccionFileNode_Copy);
afnNew = AccionFileNode_CreateNormal(fnIzq, fnDer); actionFileNodeNew = AccionFileNode_CreateNormal(fileNodeLeft,
afnNew->action = AccionFileCmp_DateLeftToRight; fileNodeRight);
actionFileNodeNew->action = AccionFileCmp_DateLeftToRight;
} else { } else {
afnNew->action = AccionFileCmp_LeftToRight; actionFileNodeNew->action = AccionFileCmp_LeftToRight;
} }
} else { } else {
afnNew->action = AccionFileCmp_Nothing; actionFileNodeNew->action = AccionFileCmp_Nothing;
} }
(*afnCola)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*afnCola) = afnNew;
} }
if (fnIzq && fnDer) { if (fileNodeLeft && fileNodeRight) {
if ((fnIzq->flags & FileFlag_Directory) if ((fileNodeLeft->flags & FileFlag_Directory)
|| (fnDer->flags & FileFlag_Directory)) { || (fileNodeRight->flags & FileFlag_Directory)) {
if (fnIzq->estado != FileStatus_Deleted) { if (fileNodeLeft->estado != FileStatus_Deleted) {
AccionFileNode_CompareChilds(afnNew, afnCola, AccionFileNode_CompareChilds(actionFileNodeNew,
AccionFileNode_Copy); actionFileNodeQueue, AccionFileNode_Copy);
if (abs(fnIzq->fileTime - fnDer->fileTime) <= 1) { // appox. equal if (abs(fileNodeLeft->fileTime - fileNodeRight->fileTime)
afnNew->action = AccionFileCmp_Nothing; <= 1) { // appox. equal
actionFileNodeNew->action = AccionFileCmp_Nothing;
} else { } else {
afnNew->action = AccionFileCmp_DateLeftToRight; actionFileNodeNew->action = AccionFileCmp_DateLeftToRight;
} }
} else { } else {
AccionFileNode_CompareChilds(afnNew, afnCola, AccionFileNode_CompareChilds(actionFileNodeNew,
AccionFileNode_DeletePair); actionFileNodeQueue, AccionFileNode_DeletePair);
afnNew->action = AccionFileCmp_DeleteRight; if (fileNodeRight->estado != FileStatus_Deleted) {
actionFileNodeNew->action = AccionFileCmp_DeleteRight;
}
} }
} else { } else {
if (fnIzq->estado != FileStatus_Deleted) { if (fileNodeLeft->estado != FileStatus_Deleted) {
if (abs(fnIzq->fileTime - fnDer->fileTime) <= 1) { // appox. equal if (abs(fileNodeLeft->fileTime - fileNodeRight->fileTime)
afnNew->action = AccionFileCmp_Nothing; <= 1) { // appox. equal
actionFileNodeNew->action = AccionFileCmp_Nothing;
} else { } else {
afnNew->action = AccionFileCmp_LeftToRight; actionFileNodeNew->action = AccionFileCmp_LeftToRight;
} }
} else { } else {
if (fnDer->estado != FileStatus_Deleted) { if (fileNodeRight->estado != FileStatus_Deleted) {
afnNew->action = AccionFileCmp_DeleteRight; actionFileNodeNew->action = AccionFileCmp_DeleteRight;
} }
} }
} }
(*afnCola)->next = afnNew; QueueNode(*actionFileNodeQueue, actionFileNodeNew);
(*afnCola) = afnNew;
} }
} }
@@ -499,10 +474,8 @@ AccionFileNode *AccionFileNode_BuildCopy(FileNode *fileNodeLeft,
AccionFileNode *actionFileNodeRoot = AccionFileNode_CreateNormal( AccionFileNode *actionFileNodeRoot = AccionFileNode_CreateNormal(
fileNodeLeft, fileNodeRight); fileNodeLeft, fileNodeRight);
AccionFileNode *actionFileNodeQueue = actionFileNodeRoot; AccionFileNode *actionFileNodeQueue = actionFileNodeRoot;
AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue, AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue,
AccionFileNode_Copy); AccionFileNode_Copy);
return actionFileNodeRoot; return actionFileNodeRoot;
} }