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

ASC.Files.Core: FileMarker: using ICacheNotify

Browse Source
This commit is contained in:
Andrey Savihin 2023-09-13 15:39:42 +03:00
parent 4fe179cb7b
commit c7162a24ca
3 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Core/ASC.Files.Core.csproj
View File

@ -11,6 +11,7 @@
<ItemGroup>
<None Remove="proto\box_cache_item.proto" />
<None Remove="proto\dropbox_cache_item.proto" />
<None Remove="proto\file_marker_cache_item.proto" />
<None Remove="proto\google_drive_cache_item.proto" />
<None Remove="proto\one_drive_cache_item.proto" />
<None Remove="proto\provider_account_cache_item.proto" />
@ -37,7 +38,8 @@
</ItemGroup>
<ItemGroup>
<Protobuf Include="proto\box_cache_item.proto" />
<Protobuf Include="proto\dropbox_cache_item.proto" />
<Protobuf Include="proto\dropbox_cache_item.proto" />
<Protobuf Include="proto\file_marker_cache_item.proto" />
<Protobuf Include="proto\google_drive_cache_item.proto" />
<Protobuf Include="proto\one_drive_cache_item.proto" />
<Protobuf Include="proto\provider_account_cache_item.proto" />

48
products/ASC.Files/Core/Utils/FileMarker.cs
View File

@ -26,6 +26,41 @@
namespace ASC.Web.Files.Utils;
[Singletone]
public class FileMarkerCache
{
private readonly ICache _ñache;
private readonly ICacheNotify<FileMarkerCacheItem> _notify;
private readonly TimeSpan _cacheExpiration = TimeSpan.FromMinutes(10);
public FileMarkerCache(ICacheNotify<FileMarkerCacheItem> notify, ICache cache)
{
_ñache = cache;
_notify = notify;
_notify.Subscribe((i) => _ñache.Remove(i.Key), CacheNotifyAction.Remove);
}
public T Get<T>(string key) where T : class
{
return _ñache.Get<T>(key);
}
public void Insert(string key, object value)
{
_notify.Publish(new FileMarkerCacheItem { Key = key }, CacheNotifyAction.Remove);
_ñache.Insert(key, value, _cacheExpiration);
}
public void Remove(string key)
{
_notify.Publish(new FileMarkerCacheItem { Key = key }, CacheNotifyAction.Remove);
_ñache.Remove(key);
}
}
[Singletone]
public class FileMarkerHelper
{
@ -68,8 +103,6 @@ public class FileMarkerHelper
[Scope(Additional = typeof(FileMarkerExtention))]
public class FileMarker
{
private readonly ICache _cache;
private const string CacheKeyFormat = "MarkedAsNew/{0}/folder_{1}";
private readonly TenantManager _tenantManager;
@ -82,6 +115,7 @@ public class FileMarker
private readonly FilesSettingsHelper _filesSettingsHelper;
private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1);
private readonly RoomsNotificationSettingsHelper _roomsNotificationSettingsHelper;
private readonly FileMarkerCache _fileMarkerCache;
public FileMarker(
TenantManager tenantManager,
@ -93,7 +127,7 @@ public class FileMarker
IServiceProvider serviceProvider,
FilesSettingsHelper filesSettingsHelper,
RoomsNotificationSettingsHelper roomsNotificationSettingsHelper,
ICache cache)
FileMarkerCache fileMarkerCache)
{
_tenantManager = tenantManager;
_userManager = userManager;
@ -104,7 +138,7 @@ public class FileMarker
_serviceProvider = serviceProvider;
_filesSettingsHelper = filesSettingsHelper;
_roomsNotificationSettingsHelper = roomsNotificationSettingsHelper;
_cache = cache;
_fileMarkerCache = fileMarkerCache;
}
internal async Task ExecMarkFileAsNewAsync<T>(AsyncTaskData<T> obj, SocketManager socketManager)
@ -982,13 +1016,13 @@ public class FileMarker
private void InsertToCahce(object folderId, int count)
{
var key = string.Format(CacheKeyFormat, _authContext.CurrentAccount.ID, folderId);
_cache.Insert(key, count.ToString(), TimeSpan.FromMinutes(10));
_fileMarkerCache.Insert(key, count.ToString());
}
private int GetCountFromCahce(object folderId)
{
var key = string.Format(CacheKeyFormat, _authContext.CurrentAccount.ID, folderId);
var count = _cache.Get<string>(key);
var count = _fileMarkerCache.Get<string>(key);
return count == null ? -1 : int.Parse(count);
}
@ -1001,7 +1035,7 @@ public class FileMarker
private void RemoveFromCahce(object folderId, Guid userId)
{
var key = string.Format(CacheKeyFormat, userId, folderId);
_cache.Remove(key);
_fileMarkerCache.Remove(key);
}
private static async Task SendChangeNoticeAsync(IEnumerable<Tag> tags, SocketManager socketManager)

7
products/ASC.Files/Core/proto/file_marker_cache_item.proto Normal file
View File

@ -0,0 +1,7 @@
syntax = "proto3";
package ASC.Web.Files.Utils;
message FileMarkerCacheItem {
string key = 1;
}