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

Files: fix

Browse Source
This commit is contained in:
pavelbannov 2022-08-11 16:37:18 +03:00
parent 0ad8be0d1a
commit e54617c275
2 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
products/ASC.Files/Core/Core/FileStorageService.cs
View File

@ -379,6 +379,8 @@ public class FileStorageService<T> //: IFileStorageService
entries = _entryManager.FilterEntries(entries, filter, subjectGroup, subjectId, search, true);
var result = new List<FileEntry>();
var files = new List<File<TId>>();
var folders = new List<Folder<TId>>();
await foreach (var fileEntry in entries)
{
@ -390,6 +392,10 @@ public class FileStorageService<T> //: IFileStorageService
{
file.FolderIdDisplay = await _globalFolderHelper.GetFolderShareAsync<TId>();
}
if (!Equals(file.Id, default(TId)))
{
files.Add(file);
}
}
else if (fileEntry is Folder<TId> folder)
{
@ -399,13 +405,20 @@ public class FileStorageService<T> //: IFileStorageService
{
folder.FolderIdDisplay = await _globalFolderHelper.GetFolderShareAsync<TId>();
}
if (!Equals(folder.Id, default(TId)))
{
folders.Add(folder);
}
}
result.Add(fileEntry);
}
await _entryStatusManager.SetFileStatusAsync(result);
await _entryStatusManager.SetIsFavoriteFoldersAsync(result);
var setFilesStatus = _entryStatusManager.SetFileStatusAsync(files);
var setFavorites = _entryStatusManager.SetIsFavoriteFoldersAsync(folders);
await Task.WhenAll(setFilesStatus, setFavorites);
return result;
}

53
products/ASC.Files/Core/Utils/EntryManager.cs
View File

@ -195,13 +195,6 @@ public class EntryStatusManager
await SetFileStatusAsync(new List<File<T>>(1) { file });
}
public async Task SetFileStatusAsync(IEnumerable<FileEntry> files)
{
var t1 = SetFileStatusAsync(files.OfType<File<int>>().Where(r => r.Id != 0));
var t2 = SetFileStatusAsync(files.OfType<File<string>>().Where(r => !string.IsNullOrEmpty(r.Id)));
await Task.WhenAll(t1, t2);
}
public async Task SetFileStatusAsync<T>(IEnumerable<File<T>> files)
{
if (!files.Any())
@ -266,13 +259,6 @@ public class EntryStatusManager
await SetIsFavoriteFoldersAsync(new List<Folder<T>>(1) { folder });
}
public async Task SetIsFavoriteFoldersAsync(IEnumerable<FileEntry> files)
{
var t1 = SetIsFavoriteFoldersAsync(files.OfType<Folder<int>>().Where(r => r.Id != 0));
var t2 = SetIsFavoriteFoldersAsync(files.OfType<Folder<string>>().Where(r => !string.IsNullOrEmpty(r.Id)));
await Task.WhenAll(t1, t2);
}
public async Task SetIsFavoriteFoldersAsync<T>(IEnumerable<Folder<T>> folders)
{
if (!folders.Any())
@ -557,9 +543,42 @@ public class EntryManager
data = data.ToList();
}
var t1 = _entryStatusManager.SetFileStatusAsync(data.Where(r => r != null && r.FileEntryType == FileEntryType.File));
var t2 = _entryStatusManager.SetIsFavoriteFoldersAsync(data.Where(r => r != null && r.FileEntryType == FileEntryType.Folder));
await Task.WhenAll(t1, t2);
var internalFiles = new List<File<int>>();
var internalFolders = new List<Folder<int>>();
var thirdPartyFiles = new List<File<string>>();
var thirdPartyFolders = new List<Folder<string>>();
foreach (var item in data.Where(r => r != null))
{
if (item.FileEntryType == FileEntryType.File)
{
if (item is File<int> internalFile)
{
internalFiles.Add(internalFile);
}
else if (item is File<string> thirdPartyFile)
{
thirdPartyFiles.Add(thirdPartyFile);
}
}
else
{
if (item is Folder<int> internalFolder)
{
internalFolders.Add(internalFolder);
}
else if (item is Folder<string> thirdPartyFolder)
{
thirdPartyFolders.Add(thirdPartyFolder);
}
}
}
var t1 = _entryStatusManager.SetFileStatusAsync(internalFiles);
var t2 = _entryStatusManager.SetIsFavoriteFoldersAsync(internalFolders);
var t3 = _entryStatusManager.SetFileStatusAsync(thirdPartyFiles);
var t4 = _entryStatusManager.SetIsFavoriteFoldersAsync(thirdPartyFolders);
await Task.WhenAll(t1, t2, t3, t4);
return (data, total);