kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2450 from sbwalker/dev

Browse Source 
add file download event
This commit is contained in:
Shaun Walker 2022-10-05 08:02:22 -04:00 committed by GitHub
commit 13ec726ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Oqtane.Server/Controllers/FileController.cs
View File

@ -491,10 +491,15 @@ namespace Oqtane.Controllers
var filepath = _files.GetFilePath(file); var filepath = _files.GetFilePath(file);
if (System.IO.File.Exists(filepath)) if (System.IO.File.Exists(filepath))
{ {
var result = asAttachment if (asAttachment)
? PhysicalFile(filepath, file.GetMimeType(), file.Name) {
: PhysicalFile(filepath, file.GetMimeType()); _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, "Download");
return result; return PhysicalFile(filepath, file.GetMimeType(), file.Name);
}
else
{
return PhysicalFile(filepath, file.GetMimeType());
}
} }
else else
{ {

4
Oqtane.Server/Infrastructure/CacheInvalidationService.cs → Oqtane.Server/Infrastructure/HostedServices/CacheInvalidationHostedService.cs
View File

@ -7,12 +7,12 @@ using Oqtane.Shared;
namespace Oqtane.Infrastructure namespace Oqtane.Infrastructure
{ {
public class EventJob : IHostedService public class CacheInvalidationHostedService : IHostedService
{ {
private readonly ISyncManager _syncManager; private readonly ISyncManager _syncManager;
private readonly IMemoryCache _cache; private readonly IMemoryCache _cache;
public EventJob(ISyncManager syncManager, IMemoryCache cache) public CacheInvalidationHostedService(ISyncManager syncManager, IMemoryCache cache)
{ {
_syncManager = syncManager; _syncManager = syncManager;
_cache = cache; _cache = cache;

8
Oqtane.Server/Pages/Files.cshtml.cs
View File

@ -23,15 +23,17 @@ namespace Oqtane.Pages
private readonly IFileRepository _files; private readonly IFileRepository _files;
private readonly IUserPermissions _userPermissions; private readonly IUserPermissions _userPermissions;
private readonly IUrlMappingRepository _urlMappings; private readonly IUrlMappingRepository _urlMappings;
private readonly ISyncManager _syncManager;
private readonly ILogManager _logger; private readonly ILogManager _logger;
private readonly Alias _alias; private readonly Alias _alias;
public FilesModel(IWebHostEnvironment environment, IFileRepository files, IUserPermissions userPermissions, IUrlMappingRepository urlMappings, ILogManager logger, ITenantManager tenantManager) public FilesModel(IWebHostEnvironment environment, IFileRepository files, IUserPermissions userPermissions, IUrlMappingRepository urlMappings, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
{ {
_environment = environment; _environment = environment;
_files = files; _files = files;
_userPermissions = userPermissions; _userPermissions = userPermissions;
_urlMappings = urlMappings; _urlMappings = urlMappings;
_syncManager = syncManager;
_logger = logger; _logger = logger;
_alias = tenantManager.GetAlias(); _alias = tenantManager.GetAlias();
} }
@ -43,10 +45,9 @@ namespace Oqtane.Pages
var filename = ""; var filename = "";
bool download = false; bool download = false;
if (path.Contains("?download")) if (Request.Query.ContainsKey("download"))
{ {
download = true; download = true;
path = path.Substring(0, path.IndexOf("?download"));
} }
var segments = path.Split('/'); var segments = path.Split('/');
@ -78,6 +79,7 @@ namespace Oqtane.Pages
{ {
if (download) if (download)
{ {
_syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, "Download");
return PhysicalFile(filepath, file.GetMimeType(), file.Name); return PhysicalFile(filepath, file.GetMimeType(), file.Name);
} }
else else