ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ItemsCollection on Container

Browse Source
This commit is contained in:
Ádám Kovács
2023-02-27 09:00:30 +01:00
parent a01c3a69b4
commit ffbd7b154c
11 changed files with 26 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/FileTime.Core.Command/Copy/CopyCommand.cs
View File

@@ -111,13 +111,12 @@ public class CopyCommand : CommandBase, ITransportationCommand
if (item is IContainer container)
{
if (!((await resolvedTarget.Items.GetItemsAsync())?.Any(i => i.Path.GetName() == item.Name) ?? false))
if (resolvedTarget.ItemsCollection.All(i => i.Path.GetName() != item.Name))
{
await copyOperation.CreateContainerAsync(resolvedTarget, container.Name, container.PointInTime);
}
var children = await container.Items.GetItemsAsync();
if (children is null) continue;
var children = container.ItemsCollection;
await TraverseTree(currentTime, children.Select(c => c.Path).ToList(), target.GetChild(item.Name, AbsolutePathType.Container), transportMode, copyOperation);
await copyOperation.ContainerCopyDoneAsync(new AbsolutePath(_timelessContentProvider, container));

4
src/Core/FileTime.Core.Command/Create/CreateItemBase.cs
View File

@@ -42,9 +42,7 @@ public abstract class CreateItemBase : CommandBase, IExecutableCommand, IInitabl
var parent = await ResolveParentAsync();
if (parent is not IContainer parentContainer) return CanCommandRun.False;
var items = await parentContainer.Items.GetItemsAsync().AwaitWithTimeout(10, Enumerable.Empty<AbsolutePath>());
if (items is null) return CanCommandRun.Forcable;
var items = parentContainer.ItemsCollection;
var existingItem = items.FirstOrDefault(i => i.Path.GetName() == NewItemName);
return existingItem switch

2
src/Core/FileTime.Core.Command/Delete/DeleteCommand.cs
View File

@@ -71,7 +71,7 @@ public class DeleteCommand : CommandBase, IExecutableCommand
{
await TraverseTree(
currentTime,
(await container.Items.GetItemsAsync())?.Select(i => i.Path) ?? Enumerable.Empty<FullName>(),
container.ItemsCollection.Select(i => i.Path),
itemDeleters,
deleteStrategy
);

2
src/Core/FileTime.Core.Command/Helper.cs
View File

@@ -7,7 +7,7 @@ public static class Helper
{
public static async Task<string?> GetNewNameAsync(IContainer resolvedTarget, string name, TransportMode transportMode)
{
var items = (await resolvedTarget.Items.GetItemsAsync() ?? throw new NullReferenceException()).ToList();
var items = resolvedTarget.ItemsCollection.ToList();
var newName = name;
var targetNameExists = items.Any(i => i.Path.GetName() == newName);
if (transportMode == TransportMode.Merge)