IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix FileMoveCopyOperation

Browse Source
This commit is contained in:
Anton Suhorukov 2022-11-16 14:36:30 +03:00
parent 0fb1e343a5
commit d509f1e31b
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
View File

@ -50,9 +50,8 @@ class FileDeleteOperation : ComposeFileOperation<FileDeleteOperationData<string>
public FileDeleteOperation(IServiceProvider serviceProvider, FileOperation<FileDeleteOperationData<string>, string> f1, FileOperation<FileDeleteOperationData<int>, int> f2)
: base(serviceProvider, f1, f2)
{
this[OpType] = (int)FileOperationType.Delete;
}
public override FileOperationType OperationType => FileOperationType.Delete;
}
class FileDeleteOperation<T> : FileOperation<FileDeleteOperationData<T>, T>
@ -64,9 +63,6 @@ class FileDeleteOperation<T> : FileOperation<FileDeleteOperationData<T>, T>
private readonly IDictionary<string, StringValues> _headers;
private readonly ThumbnailSettings _thumbnailSettings;
public override FileOperationType OperationType => FileOperationType.Delete;
public FileDeleteOperation(IServiceProvider serviceProvider, FileDeleteOperationData<T> fileOperationData, ThumbnailSettings thumbnailSettings)
: base(serviceProvider, fileOperationData)
{
@ -74,7 +70,8 @@ class FileDeleteOperation<T> : FileOperation<FileDeleteOperationData<T>, T>
_immediately = fileOperationData.Immediately;
_headers = fileOperationData.Headers;
_isEmptyTrash = fileOperationData.IsEmptyTrash;
_thumbnailSettings = thumbnailSettings;
_thumbnailSettings = thumbnailSettings;
this[OpType] = (int)FileOperationType.Delete;
}
protected override async Task DoJob(IServiceScope scope)

5
products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
View File

@ -46,10 +46,9 @@ class FileDownloadOperation : ComposeFileOperation<FileDownloadOperationData<str
: base(serviceProvider, f1, f2)
{
_tempStream = tempStream;
this[OpType] = (int)FileOperationType.Download;
}
public override FileOperationType OperationType => FileOperationType.Download;
private readonly TempStream _tempStream;
public override async Task RunJob(DistributedTask distributedTask, CancellationToken cancellationToken)
@ -155,13 +154,13 @@ class FileDownloadOperation<T> : FileOperation<FileDownloadOperationData<T>, T>
private readonly Dictionary<T, string> _files;
private readonly IDictionary<string, StringValues> _headers;
private ItemNameValueCollection<T> _entriesPathId;
public override FileOperationType OperationType => FileOperationType.Download;
public FileDownloadOperation(IServiceProvider serviceProvider, FileDownloadOperationData<T> fileDownloadOperationData)
: base(serviceProvider, fileDownloadOperationData)
{
_files = fileDownloadOperationData.FilesDownload;
_headers = fileDownloadOperationData.Headers;
this[OpType] = (int)FileOperationType.Download;
}
protected override async Task DoJob(IServiceScope scope)

6
products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
View File

@ -42,21 +42,19 @@ class FileMarkAsReadOperation : ComposeFileOperation<FileMarkAsReadOperationData
public FileMarkAsReadOperation(IServiceProvider serviceProvider, FileOperation<FileMarkAsReadOperationData<string>, string> f1, FileOperation<FileMarkAsReadOperationData<int>, int> f2)
: base(serviceProvider, f1, f2)
{
this[OpType] = (int)FileOperationType.MarkAsRead;
}
public override FileOperationType OperationType => FileOperationType.MarkAsRead;
}
class FileMarkAsReadOperation<T> : FileOperation<FileMarkAsReadOperationData<T>, T>
{
public override FileOperationType OperationType => FileOperationType.MarkAsRead;
private readonly IDictionary<string, StringValues> _headers;
public FileMarkAsReadOperation(IServiceProvider serviceProvider, FileMarkAsReadOperationData<T> fileOperationData)
: base(serviceProvider, fileOperationData)
{
_headers = fileOperationData.Headers;
this[OpType] = (int)FileOperationType.MarkAsRead;
}
protected override int InitTotalProgressSteps()

7
products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
View File

@ -34,10 +34,8 @@ class FileMoveCopyOperation : ComposeFileOperation<FileMoveCopyOperationData<str
FileOperation<FileMoveCopyOperationData<int>, int> daoOperation)
: base(serviceProvider, thirdPartyOperation, daoOperation)
{
this[OpType] = (int)ThirdPartyOperation[OpType];
}
public override FileOperationType OperationType => ThirdPartyOperation.OperationType;
}
internal class FileMoveCopyOperationData<T> : FileOperationData<T>
@ -83,8 +81,6 @@ class FileMoveCopyOperation<T> : FileOperation<FileMoveCopyOperationData<T>, T>
private readonly ThumbnailSettings _thumbnailSettings;
private readonly Dictionary<T, Folder<T>> _parentRooms = new Dictionary<T, Folder<T>>();
public override FileOperationType OperationType => _copy ? FileOperationType.Copy : FileOperationType.Move;
public FileMoveCopyOperation(IServiceProvider serviceProvider, FileMoveCopyOperationData<T> data, ThumbnailSettings thumbnailSettings)
: base(serviceProvider, data)
{
@ -95,6 +91,7 @@ class FileMoveCopyOperation<T> : FileOperation<FileMoveCopyOperationData<T>, T>
_headers = data.Headers;
_thumbnailSettings = thumbnailSettings;
this[OpType] = (int)(_copy ? FileOperationType.Copy : FileOperationType.Move);
}
protected override async Task DoJob(IServiceScope scope)

4
products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
View File

@ -44,16 +44,12 @@ public abstract class FileOperation : DistributedTaskProgress
protected int _processed;
public int Total { get; set; }
public virtual FileOperationType OperationType { get; }
protected FileOperation(IServiceProvider serviceProvider)
{
_principal = serviceProvider.GetService<IHttpContextAccessor>()?.HttpContext?.User ?? Thread.CurrentPrincipal;
_culture = Thread.CurrentThread.CurrentCulture.Name;
this[Owner] = ((IAccount)(_principal ?? Thread.CurrentPrincipal).Identity).ID.ToString();
this[OpType] = (int)OperationType;
this[Src] = "";
this[Progress] = 0;
this[Res] = "";