beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #99 from Moonlight-Panel/FixImageImportExport

Browse source 
Fixed import and export
This commit is contained in:
Marcel Baumgartner 2023-04-26 18:17:04 +02:00 committed by GitHub
parent 762d487ec9 df01d0babd
commit bcec6e407a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Moonlight/App/Database/Entities/DockerImage.cs
View file

@ -1,7 +1,10 @@
namespace Moonlight.App.Database.Entities;
using Newtonsoft.Json;
namespace Moonlight.App.Database.Entities;
public class DockerImage
{
[JsonIgnore]
public int Id { get; set; }
public bool Default { get; set; } = false;
public string Name { get; set; } = "";

5
Moonlight/App/Database/Entities/Image.cs
View file

@ -1,7 +1,10 @@
namespace Moonlight.App.Database.Entities;
using Newtonsoft.Json;
namespace Moonlight.App.Database.Entities;
public class Image
{
[JsonIgnore]
public int Id { get; set; }
public Guid Uuid { get; set; }
public string Name { get; set; } = "";

5
Moonlight/App/Database/Entities/ImageVariable.cs
View file

@ -1,7 +1,10 @@
namespace Moonlight.App.Database.Entities;
using Newtonsoft.Json;
namespace Moonlight.App.Database.Entities;
public class ImageVariable
{
[JsonIgnore]
public int Id { get; set; }
public string Key { get; set; } = "";
public string DefaultValue { get; set; } = "";

96
Moonlight/Shared/Views/Admin/Servers/Images/Index.razor
View file

@ -14,8 +14,7 @@
@inject Repository<ImageVariable> ImageVariableRepository
@inject Repository<Server> ServerRepository
@inject SmartTranslateService SmartTranslateService
@inject ToastService ToastService
@inject NavigationManager NavigationManager
@inject AlertService AlertService
<OnlyAdmin>
<div class="row">
@ -33,22 +32,15 @@
<TL>New image</TL>
</a>
<InputFile OnChange="OnFileChanged" type="file" id="fileUpload" hidden="" multiple=""/>
<label for="fileUpload" class="btn btn-sm btn-light-primary @(Uploading ? "disabled" : "")">
@if (Uploading)
{
<span>@(Percent)%</span>
}
else
{
<span class="svg-icon svg-icon-2">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="currentColor"></path>
<path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="currentColor"></path>
<path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="currentColor"></path>
</svg>
</span>
<TL>Import</TL>
}
<label for="fileUpload" class="btn btn-sm btn-light-primary">
<span class="svg-icon svg-icon-2">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="currentColor"></path>
<path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="currentColor"></path>
<path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="currentColor"></path>
</svg>
</span>
<TL>Import</TL>
</label>
</div>
</div>
@ -108,10 +100,7 @@
private Image[] Images;
private LazyLoader LazyLoader;
private Dictionary<Image, int> ServersCount = new();
private bool Uploading = false;
private int Percent = 0;
private readonly Dictionary<Image, int> ServersCount = new();
private async Task Load(LazyLoader lazyLoader)
{
@ -156,63 +145,32 @@
private async Task OnFileChanged(InputFileChangeEventArgs arg)
{
await ToastService.CreateProcessToast("upload", SmartTranslateService.Translate("Uploading files"));
Uploading = true;
await InvokeAsync(StateHasChanged);
int i = 1;
foreach (var browserFile in arg.GetMultipleFiles())
{
if (browserFile.Size < 1024 * 1024 * 100)
try
{
Percent = 0;
var stream = browserFile.OpenReadStream(1024 * 1024 * 100);
var data = new byte[browserFile.Size];
_ = await stream.ReadAsync(data, 0, data.Length);
try
{
var stream = browserFile.OpenReadStream(1024 * 1024 * 100);
var data = new byte[browserFile.Size];
await stream.ReadAsync(data, 0, data.Length);
Percent = 50;
var text = Encoding.UTF8.GetString(data);
var image = JsonConvert.DeserializeObject<Image>(text)!;
image.Uuid = Guid.NewGuid();
var text = Encoding.UTF8.GetString(data);
ImageRepository.Add(image);
var image = JsonConvert.DeserializeObject<Image>(text);
foreach (var imageDockerImage in image.DockerImages)
{
imageDockerImage.Id = 0;
}
foreach (var imageVariable in image.Variables)
{
imageVariable.Id = 0;
}
image.Id = 0;
image = ImageRepository.Add(image);
NavigationManager.NavigateTo("/admin/servers/images/edit/" + image.Id);
}
catch (Exception e)
{
await ToastService.Error(SmartTranslateService.Translate("An unknown error occured while uploading and importing the image"));
Logger.Error("Error uploading file");
Logger.Error(e);
}
await ToastService.UpdateProcessToast("upload", $"{i}/{arg.GetMultipleFiles().Count} {SmartTranslateService.Translate("complete")}");
await AlertService.Success(SmartTranslateService.Translate("Successfully imported image"));
await LazyLoader.Reload();
}
else
catch (Exception e)
{
await ToastService.Error(SmartTranslateService.Translate("The uploaded file should not be bigger than 100MB"));
await AlertService.Error(SmartTranslateService.Translate("An unknown error occured while uploading and importing the image"));
Logger.Error("Error importing image");
Logger.Error(e);
}
i++;
}
Uploading = false;
await InvokeAsync(StateHasChanged);
await ToastService.UpdateProcessToast("upload", SmartTranslateService.Translate("Upload complete"));
await ToastService.RemoveProcessToast("upload");
}
}