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

Thirdparty: fix copy

Browse Source
This commit is contained in:
pavelbannov 2020-11-19 11:30:00 +03:00
parent e029d2aeb5
commit 2ceb845808
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs vendored
View File

@ -3,8 +3,8 @@ using System.Linq;
using System.Threading; using System.Threading;
using ASC.Common; using ASC.Common;
using ASC.Files.Core.Data;
using ASC.Files.Core.Resources; using ASC.Files.Core.Resources;
using ASC.Files.Core.Security;
using ASC.Files.Thirdparty.Box; using ASC.Files.Thirdparty.Box;
using ASC.Files.Thirdparty.Dropbox; using ASC.Files.Thirdparty.Dropbox;
using ASC.Files.Thirdparty.GoogleDrive; using ASC.Files.Thirdparty.GoogleDrive;
@ -49,8 +49,8 @@ namespace ASC.Files.Core.Thirdparty
FileSizeComment.FilesSizeToString(SetupInfo.AvailableFileSize))); FileSizeComment.FilesSizeToString(SetupInfo.AvailableFileSize)));
} }
var securityDao = ServiceProvider.GetService<SecurityDao<TFrom>>(); var securityDao = ServiceProvider.GetService<ISecurityDao<TFrom>>();
var tagDao = ServiceProvider.GetService<TagDao<TFrom>>(); var tagDao = ServiceProvider.GetService<ITagDao<TFrom>>();
var fromFileShareRecords = securityDao.GetPureShareRecords(fromFile).Where(x => x.EntryType == FileEntryType.File); var fromFileShareRecords = securityDao.GetPureShareRecords(fromFile).Where(x => x.EntryType == FileEntryType.File);
var fromFileNewTags = tagDao.GetNewTags(Guid.Empty, fromFile).ToList(); var fromFileNewTags = tagDao.GetNewTags(Guid.Empty, fromFile).ToList();
@ -153,7 +153,7 @@ namespace ASC.Files.Core.Thirdparty
if (deleteSourceFolder) if (deleteSourceFolder)
{ {
var securityDao = ServiceProvider.GetService<SecurityDao<TFrom>>(); var securityDao = ServiceProvider.GetService<ISecurityDao<TFrom>>();
var fromFileShareRecords = securityDao.GetPureShareRecords(fromFolder) var fromFileShareRecords = securityDao.GetPureShareRecords(fromFolder)
.Where(x => x.EntryType == FileEntryType.Folder); .Where(x => x.EntryType == FileEntryType.Folder);
@ -166,7 +166,7 @@ namespace ASC.Files.Core.Thirdparty
}); });
} }
var tagDao = ServiceProvider.GetService<TagDao<TFrom>>(); var tagDao = ServiceProvider.GetService<ITagDao<TFrom>>();
var fromFileNewTags = tagDao.GetNewTags(Guid.Empty, fromFolder).ToList(); var fromFileNewTags = tagDao.GetNewTags(Guid.Empty, fromFolder).ToList();
if (fromFileNewTags.Any()) if (fromFileNewTags.Any())

3
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs vendored
View File

@ -152,11 +152,10 @@ namespace ASC.Files.Thirdparty.ProviderDao
protected Folder<int> PerformCrossDaoFolderCopy(string fromFolderId, int toRootFolderId, bool deleteSourceFolder, CancellationToken? cancellationToken) protected Folder<int> PerformCrossDaoFolderCopy(string fromFolderId, int toRootFolderId, bool deleteSourceFolder, CancellationToken? cancellationToken)
{ {
var fromSelector = GetSelector(fromFolderId); var fromSelector = GetSelector(fromFolderId);
using var scope = ServiceProvider.CreateScope();
return CrossDao.PerformCrossDaoFolderCopy( return CrossDao.PerformCrossDaoFolderCopy(
fromFolderId, fromSelector.GetFolderDao(fromFolderId), fromSelector.GetFileDao(fromFolderId), fromSelector.ConvertId, fromFolderId, fromSelector.GetFolderDao(fromFolderId), fromSelector.GetFileDao(fromFolderId), fromSelector.ConvertId,
toRootFolderId, scope.ServiceProvider.GetService<FolderDao>(), scope.ServiceProvider.GetService<IFileDao<int>>(), r => r, toRootFolderId, ServiceProvider.GetService<IFolderDao<int>>(), ServiceProvider.GetService<IFileDao<int>>(), r => r,
deleteSourceFolder, cancellationToken); deleteSourceFolder, cancellationToken);
} }