glm94/data_organizer
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Added a function to allow a snapshot object to handle dealing with the diff on its own.

Browse Source
This commit is contained in:
Admin
2020-12-05 17:00:08 -06:00
parent 8a1be37434
commit d758e42afb
3 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataOrganizer/Snapshot.cs
+39
View File
@@ -168,6 +168,44 @@ namespace DataOrganizer
public void MergeSnapshot(Snapshot snapshot)
{
//TODO: build this out
var newFiles = Files.Values.Except(snapshot.Files.Values);
var newFolders = Directories.Values.Except(snapshot.Directories.Values);
var newOrgFolders = OrganizationFolders.Values.Except(snapshot.OrganizationFolders.Values);
var existingFiles = Files.Values.Except(snapshot.Files.Values);
foreach (var existingFile in existingFiles)
{
if (!snapshot.Files.ContainsKey(existingFile.FullPath))
{
existingFile.Status = FileSnapshot.FileStatus.PendingDelete;
//deletedFiles.Add(existingFile);
//pendingChanges++;
}
else if (existingFile.ModifiedDate != snapshot.Files[existingFile.FullPath].ModifiedDate)
{
existingFile.ModifiedDate = snapshot.Files[existingFile.FullPath].ModifiedDate;
//modifiedFiles.Add(snapShot.Files[existingFile.FullPath]);
//pendingChanges++;
}
}
foreach(var newFile in newFiles)
{
if(!Files.ContainsKey(newFile.FullPath)) Files.Add(newFile.FullPath, newFile);
Folder folder = newFile.ParentFolder;
while(folder != null)
{
if (!Directories.ContainsKey(folder.FullPath))
{
Directories.Add(folder.FullPath, folder);
}
if (folder.Parent == null && !OrganizationFolders.ContainsKey(folder.FullPath)) OrganizationFolders.Add(folder.FullPath, folder.Files.Values.ToList());
folder = folder.Parent;
}
}
}
public struct Duplicate
@@ -344,6 +382,7 @@ namespace DataOrganizer
PendingInsert,
PendingUpdate,
PendingDelete,
Deleted,
None
}
}