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

CA1841

Browse Source
This commit is contained in:
Anton Suhorukov 2022-03-17 17:53:05 +03:00
parent 717456d71d
commit 72cee6362f
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -538,7 +538,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
var toDelete = await FilesDbContext.Tree
.AsQueryable()
.Where(r => subfolders.Keys.Contains(r.FolderId) && !subfolders.Keys.Contains(r.ParentId))
.Where(r => subfolders.ContainsKey(r.FolderId) && !subfolders.ContainsKey(r.ParentId))
.ToListAsync();
FilesDbContext.Tree.RemoveRange(toDelete);

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

@ -607,7 +607,7 @@ public class FileStorageService<T> //: IFileStorageService
if (fileExt != _fileUtility.MasterFormExtension)
{
fileExt = _fileUtility.GetInternalExtension(title);
if (!_fileUtility.InternalExtension.Values.Contains(fileExt))
if (!_fileUtility.InternalExtension.ContainsValue(fileExt))
{
fileExt = _fileUtility.InternalExtension[FileType.Document];
file.Title = title + fileExt;

3
products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
View File

@ -346,8 +346,7 @@ namespace ASC.Web.Files
var outType = (context.Request.Query[FilesLinkUtility.OutType].FirstOrDefault() ?? "").Trim();
if (!string.IsNullOrEmpty(outType)
&& FileUtility.ExtsConvertible.Keys.Contains(ext)
&& FileUtility.ExtsConvertible[ext].Contains(outType))
&& FileUtility.ExtsConvertible.ContainsKey(ext) && FileUtility.ExtsConvertible[ext].Contains(outType))
{
ext = outType;
}

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

@ -1162,8 +1162,7 @@ public class EntryManager
if (file.ProviderEntry && !newExtension.Equals(currentExt))
{
if (_fileUtility.ExtsConvertible.Keys.Contains(newExtension)
&& _fileUtility.ExtsConvertible[newExtension].Contains(currentExt))
if (_fileUtility.ExtsConvertible.ContainsKey(newExtension) && _fileUtility.ExtsConvertible[newExtension].Contains(currentExt))
{
if (stream != null)
{

8
products/ASC.Files/Core/Utils/FileConverter.cs
View File

@ -177,7 +177,7 @@ internal class FileConverterQueue<T> : IDisposable
lock (_locker)
{
if (!_conversionQueue.Keys.Contains(file))
if (!_conversionQueue.ContainsKey(file))
{
continue;
}
@ -632,12 +632,12 @@ public class FileConverter
}
fileExtension = FileUtility.GetFileExtension(file.Title);
if (_fileUtility.InternalExtension.Values.Contains(toExtension))
if (_fileUtility.InternalExtension.ContainsValue(toExtension))
{
return true;
}
return _fileUtility.ExtsConvertible.Keys.Contains(fileExtension) && _fileUtility.ExtsConvertible[fileExtension].Contains(toExtension);
return _fileUtility.ExtsConvertible.ContainsKey(fileExtension) && _fileUtility.ExtsConvertible[fileExtension].Contains(toExtension);
}
public Task<Stream> ExecAsync<T>(File<T> file)
@ -748,7 +748,7 @@ public class FileConverter
{
throw new ArgumentException(FilesCommonResource.ErrorMassage_NotSupportedFormat);
}
if (!string.IsNullOrEmpty(file.ConvertedType) || _fileUtility.InternalExtension.Values.Contains(FileUtility.GetFileExtension(file.Title)))
if (!string.IsNullOrEmpty(file.ConvertedType) || _fileUtility.InternalExtension.ContainsValue(FileUtility.GetFileExtension(file.Title)))
{
return;
}