Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Large file streaming uploads

Browse Source
This commit is contained in:
Shaun Walker
2019-09-06 13:15:18 -04:00
parent 22420f2b43
commit a84eee8782
17 changed files with 305 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor Normal file
View File

@ -0,0 +1,30 @@
@using Microsoft.AspNetCore.Components.Routing
@using Oqtane.Client.Modules.Controls
@using Oqtane.Modules
@using Oqtane.Services
@inherits ModuleBase
@inject IUriHelper UriHelper
@inject IFileService FileService
<table class="table table-borderless">
<tr>
<td>
<label for="Name" class="control-label">Module: </label>
</td>
<td>
<FileUpload Filter=".nupkg"></FileUpload>
</td>
</tr>
</table>
<button type="button" class="btn btn-success" @onclick="UploadFile">Upload</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
private async Task UploadFile()
{
await FileService.UploadFilesAsync("/Sites/Modules");
}
}

1
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -12,6 +12,7 @@
}
else
{
<ActionLink Action="Add" Text="Upload Module" />
<table class="table table-borderless">
<thead>
<tr>

43
Oqtane.Client/Modules/Controls/FileUpload.razor Normal file
View File

@ -0,0 +1,43 @@
@if (multiple)
{
<input type="file" id="@fileid" name="file" accept="@filter" multiple />
}
else
{
<input type="file" id="@fileid" name="file" accept="@filter" />
}
<span id="@progressinfoid"></span> <progress id="@progressbarid" style="visibility: hidden;"></progress>
@code {
[Parameter]
public string Name { get; set; } // optional - can be used for managing multiple file upload controls on a page
[Parameter]
public string Filter { get; set; } // optional - for restricting types of files that can be selected
[Parameter]
public string Multiple { get; set; } // optional - enable multiple file uploads
string fileid = "";
string progressinfoid = "";
string progressbarid = "";
string filter = "*";
bool multiple = false;
protected override void OnInitialized()
{
fileid = Name + "FileInput";
progressinfoid = Name + "ProgressInfo";
progressbarid = Name + "ProgressBar";
if (!string.IsNullOrEmpty(Filter))
{
filter = Filter;
}
if (!string.IsNullOrEmpty(Multiple))
{
multiple = bool.Parse(Multiple);
}
}
}

4
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -67,9 +67,9 @@
<table class="table">
<tbody>
<tr>
<td><label for="Username" class="control-label">User: </label></td>
<td style="text-align: right;"><label for="Username" class="control-label">User: </label></td>
<td><input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@username" /></td>
<td><button type="button" class="btn btn-primary" @onclick="@AddUser">Add</button></td>
<td style="text-align: left;"><button type="button" class="btn btn-primary" @onclick="@AddUser">Add</button></td>
</tr>
</tbody>
</table>

2
Oqtane.Client/Modules/IModuleControl.cs
View File

@ -5,6 +5,6 @@
SecurityAccessLevel SecurityAccessLevel { get; } // defines the security access level for this control - defaults to View
string Title { get; } // title to display for this control - defaults to module title
string Actions { get; } // allows for routing by configuration rather than by convention ( comma delimited ) - defaults to using component file name
string ContainerType { get; } // container for embedding control - defaults to AdminContainer
bool UseAdminContainer { get; } // container for embedding module control - defaults to true
}
}

2
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -18,7 +18,7 @@ namespace Oqtane.Modules
public virtual string Actions { get { return ""; } }
public virtual string ContainerType { get { return ""; } }
public virtual bool UseAdminContainer { get { return true; } }
public string NavigateUrl()
{

37
Oqtane.Client/Services/FileService.cs Normal file
View File

@ -0,0 +1,37 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using Oqtane.Shared;
namespace Oqtane.Services
{
public class FileService : ServiceBase, IFileService
{
private readonly SiteState sitestate;
private readonly IUriHelper urihelper;
private readonly IJSRuntime jsRuntime;
public FileService(SiteState sitestate, IUriHelper urihelper, IJSRuntime jsRuntime)
{
this.sitestate = sitestate;
this.urihelper = urihelper;
this.jsRuntime = jsRuntime;
}
private string apiurl
{
get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "File"); }
}
public async Task UploadFilesAsync(string Folder)
{
await UploadFilesAsync(Folder, "");
}
public async Task UploadFilesAsync(string Folder, string FileUploadName)
{
var interop = new Interop(jsRuntime);
await interop.UploadFiles(apiurl + "/upload", Folder, FileUploadName);
}
}
}

12
Oqtane.Client/Services/Interfaces/IFileService.cs Normal file
View File

@ -0,0 +1,12 @@
using Oqtane.Models;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Oqtane.Services
{
public interface IFileService
{
Task UploadFilesAsync(string Folder);
Task UploadFilesAsync(string Folder, string FileUploadName);
}
}

8
Oqtane.Client/Shared/Container.razor
View File

@ -47,13 +47,9 @@
{
ModuleState = Module; // passed in from Pane component
container = ModuleState.ContainerType;
if (PageState.ModuleId != -1 && PageState.Control != "")
if (PageState.ModuleId != -1 && PageState.Control != "" && ModuleState.UseAdminContainer)
{
container = ModuleState.AdminContainerType;
if (container == "")
{
container = Constants.DefaultAdminContainer;
}
container = Constants.DefaultAdminContainer;
}
}
return Task.CompletedTask;

15
Oqtane.Client/Shared/Interop.cs
View File

@ -85,5 +85,20 @@ namespace Oqtane.Shared
return Task.CompletedTask;
}
}
public Task UploadFiles(string posturl, string folder, string name)
{
try
{
jsRuntime.InvokeAsync<string>(
"interop.uploadFiles",
posturl, folder, name);
return Task.CompletedTask;
}
catch
{
return Task.CompletedTask;
}
}
}
}

2
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -349,7 +349,7 @@
module.SecurityAccessLevel = (SecurityAccessLevel)moduletype.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null);
module.ControlTitle = (string)moduletype.GetProperty("Title").GetValue(moduleobject);
module.Actions = (string)moduletype.GetProperty("Actions").GetValue(moduleobject);
module.AdminContainerType = (string)moduletype.GetProperty("ContainerType").GetValue(moduleobject);
module.UseAdminContainer = (bool)moduletype.GetProperty("UseAdminContainer").GetValue(moduleobject);
}
}

1
Oqtane.Client/Startup.cs
View File

@ -50,6 +50,7 @@ namespace Oqtane.Client
services.AddScoped<IRoleService, RoleService>();
services.AddScoped<IUserRoleService, UserRoleService>();
services.AddScoped<ISettingService, SettingService>();
services.AddScoped<IFileService, FileService>();
// dynamically register module contexts and repository services
Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();