Split filenodecmp in actionfilenode*
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include <stdio.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -6,11 +6,7 @@
|
||||
#include "crc.h"
|
||||
#include "fileutil.h"
|
||||
#include "filenode.h"
|
||||
#include "filenodecmp.h"
|
||||
|
||||
int maxDeltaTime = 4000;
|
||||
|
||||
#define QueueNode(queue,node) (queue)->next = (node); (queue) = (node);
|
||||
#include "actionfilenode.h"
|
||||
|
||||
ActionFileNode _actionFileNodeFree = NULL;
|
||||
#define AccionFileNode_Block 1024
|
||||
@@ -63,7 +59,8 @@ ActionFileNode ActionFileNode_CreateNormal(FileNode fileNodeLeft,
|
||||
}
|
||||
|
||||
|
||||
void AccionFileNode_CompareChilds(ActionFileNode actionFileNodeRoot,
|
||||
void AccionFileNode_CompareChilds(
|
||||
ActionFileNode actionFileNodeRoot,
|
||||
ActionFileNode *actionFileNodeQueue,
|
||||
void(*CheckPair)(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue))
|
||||
@@ -152,373 +149,8 @@ void AccionFileNode_CompareChilds(ActionFileNode actionFileNodeRoot,
|
||||
|
||||
}
|
||||
|
||||
void AccionFileNode_DeletePair(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue)
|
||||
{
|
||||
ActionFileNode actionFileNodeNew = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
|
||||
if (!fileNodeLeft && !fileNodeRight) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
return;
|
||||
}
|
||||
if (!fileNodeLeft && fileNodeRight) {
|
||||
if (fileNodeRight->flags & FileFlag_Directory) {
|
||||
// Iterate childs for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
// Node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && !fileNodeRight) {
|
||||
if (fileNodeLeft->flags & FileFlag_Directory) {
|
||||
// Iterate childs for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
// Node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && fileNodeRight) {
|
||||
if ((fileNodeLeft->flags & FileFlag_Directory)
|
||||
|| (fileNodeRight->flags & FileFlag_Directory)) {
|
||||
// One is Directory
|
||||
|
||||
// Iterate childs for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
// Left node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
actionFileNodeNew = NULL;
|
||||
}
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
if (!actionFileNodeNew) {
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
}
|
||||
// Right node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
actionFileNodeNew = NULL;
|
||||
}
|
||||
if (actionFileNodeNew) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue)
|
||||
{
|
||||
ActionFileNode actionFileNodeNew = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
|
||||
if (!fileNodeLeft && !fileNodeRight) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
return;
|
||||
}
|
||||
if (!fileNodeLeft && fileNodeRight) {
|
||||
if (fileNodeRight->flags & FileFlag_Directory) {
|
||||
// Directory
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_MakeLeftDirectory;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
|
||||
// Iterate childs
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_SyncPair);
|
||||
|
||||
// Creatre new action for date copy
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
actionFileNodeNew->action = ActionFileCmp_DateRightToLeft;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
else {
|
||||
// File
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_RightToLeft;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && !fileNodeRight) {
|
||||
if (fileNodeLeft->flags & FileFlag_Directory) {
|
||||
// Directory
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_MakeRightDirectory;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
|
||||
// Iterate childs
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_SyncPair);
|
||||
|
||||
// Create new action for date copy
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
else {
|
||||
// File
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && fileNodeRight) {
|
||||
if ((fileNodeLeft->flags & FileFlag_Directory)
|
||||
&& (fileNodeRight->flags & FileFlag_Directory))
|
||||
{
|
||||
// Directory
|
||||
|
||||
// Prepare action for directory pair
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime)) <= maxDeltaTime) { // aprox. equal
|
||||
if (fileNodeRight->status == FileStatus_Deleted
|
||||
&& fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
}
|
||||
else if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime < fileNodeRight->fileTime) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DateRightToLeft;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime > fileNodeRight->fileTime) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Process child nodes
|
||||
if (actionFileNodeNew->action == ActionFileCmp_DeleteRight
|
||||
|| actionFileNodeNew->action == ActionFileCmp_DeleteLeft
|
||||
|| (fileNodeLeft->status == FileStatus_Deleted
|
||||
&& fileNodeRight->status == FileStatus_Deleted)) {
|
||||
// Iterate child nodes for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_DeletePair);
|
||||
}
|
||||
else {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_SyncPair);
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else if ((fileNodeLeft->flags & FileFlag_Normal)
|
||||
&& (fileNodeRight->flags & FileFlag_Normal))
|
||||
{
|
||||
// Files
|
||||
|
||||
// Prepare action for file pair
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime)) <= maxDeltaTime) { // aprox. equal
|
||||
if (fileNodeRight->status == FileStatus_Deleted
|
||||
&& fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
}
|
||||
else if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime < fileNodeRight->fileTime) {
|
||||
// FIXME: Check size to determine y further checks are necessary
|
||||
actionFileNodeNew->action = ActionFileCmp_RightToLeft;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime > fileNodeRight->fileTime) {
|
||||
// FIXME: Check size to determine y further checks are necessary
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
// FIXME: !!!!!
|
||||
// Directory vs File
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ActionFileNode ActionFileNode_BuildSync(FileNode izquierda, FileNode derecha) {
|
||||
ActionFileNode actionFileNodeRoot = ActionFileNode_CreateNormal(izquierda,
|
||||
derecha);
|
||||
ActionFileNode actionFileNodeQueue = actionFileNodeRoot;
|
||||
AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue,
|
||||
AccionFileNode_SyncPair);
|
||||
return actionFileNodeRoot;
|
||||
}
|
||||
|
||||
void AccionFileNode_Copy(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue)
|
||||
{
|
||||
ActionFileNode actionFileNodeNew = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
|
||||
if (!fileNodeLeft && !fileNodeRight) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
return;
|
||||
}
|
||||
if (!fileNodeLeft && fileNodeRight) {
|
||||
if (fileNodeRight->flags & FileFlag_Directory) {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
if (fileNodeLeft && !fileNodeRight) {
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
if (fileNodeLeft->flags & FileFlag_Directory) {
|
||||
actionFileNodeNew->action = ActionFileCmp_MakeRightDirectory;
|
||||
(*actionFileNodeQueue)->next = actionFileNodeNew;
|
||||
(*actionFileNodeQueue) = actionFileNodeNew;
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_Copy);
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
}
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
if (fileNodeLeft && fileNodeRight) {
|
||||
if ((fileNodeLeft->flags & FileFlag_Directory)
|
||||
|| (fileNodeRight->flags & FileFlag_Directory))
|
||||
{
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_Copy);
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime))
|
||||
<= maxDeltaTime) { // appox. equal
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
}
|
||||
}
|
||||
else {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_DeletePair);
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime))
|
||||
<= maxDeltaTime)
|
||||
{
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
}
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
|
||||
ActionFileNode ActionFileNode_BuildCopy(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight) {
|
||||
ActionFileNode actionFileNodeRoot = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
ActionFileNode actionFileNodeQueue = actionFileNodeRoot;
|
||||
AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue,
|
||||
AccionFileNode_Copy);
|
||||
return actionFileNodeRoot;
|
||||
}
|
||||
|
||||
void ActionFileNode_Statistics(ActionFileNode actionFileNode,
|
||||
ActionQueueStatistics *statistics)
|
||||
ActionQueueStatistics *statistics)
|
||||
{
|
||||
statistics->readLeft = 0;
|
||||
statistics->writeLeft = 0;
|
||||
@@ -643,7 +275,7 @@ void AccionFileNodeAux_MakeDir(char *pathOrig, char *pathDest) {
|
||||
}
|
||||
|
||||
void ActionFileNode_RunList(ActionFileNode actionFileNode, char *pathLeft,
|
||||
char *pathRight)
|
||||
char *pathRight)
|
||||
{
|
||||
char fullPathLeft[MaxPath], fullPathRight[MaxPath], showPath[MaxPath];
|
||||
while (actionFileNode != NULL) {
|
||||
@@ -706,3 +338,83 @@ void ActionFileNode_RunList(ActionFileNode actionFileNode, char *pathLeft,
|
||||
}
|
||||
printff("End\n");
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Common utilities
|
||||
|
||||
#define QueueNode(queue,node) (queue)->next = (node); (queue) = (node);
|
||||
|
||||
void AccionFileNode_DeletePair(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue)
|
||||
{
|
||||
ActionFileNode actionFileNodeNew = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
|
||||
if (!fileNodeLeft && !fileNodeRight) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
return;
|
||||
}
|
||||
if (!fileNodeLeft && fileNodeRight) {
|
||||
if (fileNodeRight->flags & FileFlag_Directory) {
|
||||
// Iterate childs for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
// Node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && !fileNodeRight) {
|
||||
if (fileNodeLeft->flags & FileFlag_Directory) {
|
||||
// Iterate childs for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
// Node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && fileNodeRight) {
|
||||
if ((fileNodeLeft->flags & FileFlag_Directory)
|
||||
|| (fileNodeRight->flags & FileFlag_Directory)) {
|
||||
// One is Directory
|
||||
|
||||
// Iterate childs for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
// Left node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
actionFileNodeNew = NULL;
|
||||
}
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
if (!actionFileNodeNew) {
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
}
|
||||
// Right node delete action
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
actionFileNodeNew = NULL;
|
||||
}
|
||||
if (actionFileNodeNew) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef _FILENODECMP_H_
|
||||
#define _FILENODECMP_H_
|
||||
#ifndef _ACTIONFILENODE_H_
|
||||
#define _ACTIONFILENODE_H_
|
||||
|
||||
#include "filenode.h"
|
||||
|
||||
@@ -28,10 +28,11 @@ void AccionFileNode_Destroy(ActionFileNode actionFileNode);
|
||||
ActionFileNode ActionFileNode_CreateNormal(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight);
|
||||
|
||||
ActionFileNode ActionFileNode_BuildSync(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight);
|
||||
ActionFileNode ActionFileNode_BuildCopy(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight);
|
||||
void AccionFileNode_CompareChilds(
|
||||
ActionFileNode actionFileNodeRoot,
|
||||
ActionFileNode *actionFileNodeQueue,
|
||||
void(*CheckPair)(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue));
|
||||
|
||||
typedef struct SActionQueueStatistics {
|
||||
long long readLeft;
|
||||
@@ -54,4 +55,10 @@ void ActionFileNode_Print(ActionFileNode actionFileNode);
|
||||
void ActionFileNode_RunList(ActionFileNode actionFileNode, char *pathLeft,
|
||||
char *pathRight);
|
||||
|
||||
|
||||
// Common utilities
|
||||
|
||||
void AccionFileNode_DeletePair(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue);
|
||||
|
||||
#endif
|
||||
115
src/actionfilenodecopy.c
Normal file
115
src/actionfilenodecopy.c
Normal file
@@ -0,0 +1,115 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "crc.h"
|
||||
#include "fileutil.h"
|
||||
#include "filenode.h"
|
||||
#include "actionfilenode.h"
|
||||
#include "actionfilenodesync.h"
|
||||
|
||||
#define maxDeltaTime 4000
|
||||
|
||||
#define QueueNode(queue,node) (queue)->next = (node); (queue) = (node);
|
||||
|
||||
|
||||
void AccionFileNode_CopyPair(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue)
|
||||
{
|
||||
ActionFileNode actionFileNodeNew = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
|
||||
if (!fileNodeLeft && !fileNodeRight) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
return;
|
||||
}
|
||||
if (!fileNodeLeft && fileNodeRight) {
|
||||
if (fileNodeRight->flags & FileFlag_Directory) {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew, actionFileNodeQueue,
|
||||
AccionFileNode_DeletePair);
|
||||
}
|
||||
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
if (fileNodeLeft && !fileNodeRight) {
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
if (fileNodeLeft->flags & FileFlag_Directory) {
|
||||
actionFileNodeNew->action = ActionFileCmp_MakeRightDirectory;
|
||||
(*actionFileNodeQueue)->next = actionFileNodeNew;
|
||||
(*actionFileNodeQueue) = actionFileNodeNew;
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_CopyPair);
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
}
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
if (fileNodeLeft && fileNodeRight) {
|
||||
if ((fileNodeLeft->flags & FileFlag_Directory)
|
||||
|| (fileNodeRight->flags & FileFlag_Directory))
|
||||
{
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_CopyPair);
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime))
|
||||
<= maxDeltaTime) { // appox. equal
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
}
|
||||
}
|
||||
else {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_DeletePair);
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (fileNodeLeft->status != FileStatus_Deleted) {
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime))
|
||||
<= maxDeltaTime)
|
||||
{
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (fileNodeRight->status != FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
}
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
|
||||
ActionFileNode ActionFileNode_BuildCopy(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight) {
|
||||
ActionFileNode actionFileNodeRoot = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
ActionFileNode actionFileNodeQueue = actionFileNodeRoot;
|
||||
AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue,
|
||||
AccionFileNode_CopyPair);
|
||||
return actionFileNodeRoot;
|
||||
}
|
||||
|
||||
10
src/actionfilenodecopy.h
Normal file
10
src/actionfilenodecopy.h
Normal file
@@ -0,0 +1,10 @@
|
||||
#ifndef _ACTIONFILENODECOPY_H_
|
||||
#define _ACTIONFILENODECOPY_H_
|
||||
|
||||
#include "filenode.h"
|
||||
#include "actionfilenode.h"
|
||||
|
||||
ActionFileNode ActionFileNode_BuildCopy(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight);
|
||||
|
||||
#endif
|
||||
206
src/actionfilenodesync.c
Normal file
206
src/actionfilenodesync.c
Normal file
@@ -0,0 +1,206 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "crc.h"
|
||||
#include "fileutil.h"
|
||||
#include "filenode.h"
|
||||
#include "actionfilenode.h"
|
||||
#include "actionfilenodesync.h"
|
||||
|
||||
#define maxDeltaTime 4000
|
||||
|
||||
#define QueueNode(queue,node) (queue)->next = (node); (queue) = (node);
|
||||
|
||||
void AccionFileNode_SyncPair(FileNode fileNodeLeft, FileNode fileNodeRight,
|
||||
ActionFileNode *actionFileNodeQueue)
|
||||
{
|
||||
ActionFileNode actionFileNodeNew = ActionFileNode_CreateNormal(
|
||||
fileNodeLeft, fileNodeRight);
|
||||
|
||||
if (!fileNodeLeft && !fileNodeRight) {
|
||||
AccionFileNode_Destroy(actionFileNodeNew);
|
||||
return;
|
||||
}
|
||||
if (!fileNodeLeft && fileNodeRight) {
|
||||
if (fileNodeRight->flags & FileFlag_Directory) {
|
||||
// Directory
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_MakeLeftDirectory;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
|
||||
// Iterate childs
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_SyncPair);
|
||||
|
||||
// Creatre new action for date copy
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
actionFileNodeNew->action = ActionFileCmp_DateRightToLeft;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
else {
|
||||
// File
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_RightToLeft;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && !fileNodeRight) {
|
||||
if (fileNodeLeft->flags & FileFlag_Directory) {
|
||||
// Directory
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_MakeRightDirectory;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
|
||||
// Iterate childs
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_SyncPair);
|
||||
|
||||
// Create new action for date copy
|
||||
actionFileNodeNew = ActionFileNode_CreateNormal(fileNodeLeft,
|
||||
fileNodeRight);
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
else {
|
||||
// File
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
}
|
||||
if (fileNodeLeft && fileNodeRight) {
|
||||
if ((fileNodeLeft->flags & FileFlag_Directory)
|
||||
&& (fileNodeRight->flags & FileFlag_Directory))
|
||||
{
|
||||
// Directory
|
||||
|
||||
// Prepare action for directory pair
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime)) <= maxDeltaTime) { // aprox. equal
|
||||
if (fileNodeRight->status == FileStatus_Deleted
|
||||
&& fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
}
|
||||
else if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime < fileNodeRight->fileTime) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DateRightToLeft;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime > fileNodeRight->fileTime) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DateLeftToRight;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Process child nodes
|
||||
if (actionFileNodeNew->action == ActionFileCmp_DeleteRight
|
||||
|| actionFileNodeNew->action == ActionFileCmp_DeleteLeft
|
||||
|| (fileNodeLeft->status == FileStatus_Deleted
|
||||
&& fileNodeRight->status == FileStatus_Deleted)) {
|
||||
// Iterate child nodes for deletion
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_DeletePair);
|
||||
}
|
||||
else {
|
||||
AccionFileNode_CompareChilds(actionFileNodeNew,
|
||||
actionFileNodeQueue, AccionFileNode_SyncPair);
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else if ((fileNodeLeft->flags & FileFlag_Normal)
|
||||
&& (fileNodeRight->flags & FileFlag_Normal))
|
||||
{
|
||||
// Files
|
||||
|
||||
// Prepare action for file pair
|
||||
if (abs((int)(fileNodeLeft->fileTime - fileNodeRight->fileTime)) <= maxDeltaTime) { // aprox. equal
|
||||
if (fileNodeRight->status == FileStatus_Deleted
|
||||
&& fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
else if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
}
|
||||
else if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
}
|
||||
else {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime < fileNodeRight->fileTime) {
|
||||
// FIXME: Check size to determine y further checks are necessary
|
||||
actionFileNodeNew->action = ActionFileCmp_RightToLeft;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteLeft;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (fileNodeLeft->fileTime > fileNodeRight->fileTime) {
|
||||
// FIXME: Check size to determine y further checks are necessary
|
||||
actionFileNodeNew->action = ActionFileCmp_LeftToRight;
|
||||
if (fileNodeLeft->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_DeleteRight;
|
||||
if (fileNodeRight->status == FileStatus_Deleted) {
|
||||
actionFileNodeNew->action = ActionFileCmp_Nothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
QueueNode(*actionFileNodeQueue, actionFileNodeNew);
|
||||
}
|
||||
else {
|
||||
// FIXME: !!!!!
|
||||
// Directory vs File
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ActionFileNode ActionFileNode_BuildSync(FileNode izquierda, FileNode derecha) {
|
||||
ActionFileNode actionFileNodeRoot = ActionFileNode_CreateNormal(izquierda,
|
||||
derecha);
|
||||
ActionFileNode actionFileNodeQueue = actionFileNodeRoot;
|
||||
AccionFileNode_CompareChilds(actionFileNodeRoot, &actionFileNodeQueue,
|
||||
AccionFileNode_SyncPair);
|
||||
return actionFileNodeRoot;
|
||||
}
|
||||
10
src/actionfilenodesync.h
Normal file
10
src/actionfilenodesync.h
Normal file
@@ -0,0 +1,10 @@
|
||||
#ifndef _ACTIONFILENODESYNC_H_
|
||||
#define _ACTIONFILENODESYNC_H_
|
||||
|
||||
#include "filenode.h"
|
||||
#include "actionfilenode.h"
|
||||
|
||||
ActionFileNode ActionFileNode_BuildSync(FileNode fileNodeLeft,
|
||||
FileNode fileNodeRight);
|
||||
|
||||
#endif
|
||||
@@ -6,7 +6,10 @@
|
||||
#include "crc.h"
|
||||
#include "fileutil.h"
|
||||
#include "filenode.h"
|
||||
#include "filenodecmp.h"
|
||||
#include "actionfilenode.h"
|
||||
#include "actionfilenodesync.h"
|
||||
#include "actionfilenodecopy.h"
|
||||
|
||||
|
||||
void Help(char *exe) {
|
||||
char exeFilename[MaxPath];
|
||||
|
||||
Reference in New Issue
Block a user