diff --git a/Moonlight/App/Helpers/Files/ContextAction.cs b/Moonlight/App/Helpers/Files/ContextAction.cs new file mode 100644 index 0000000..704c425 --- /dev/null +++ b/Moonlight/App/Helpers/Files/ContextAction.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Helpers.Files; + +public class ContextAction +{ + public string Id { get; set; } = ""; + public string Name { get; set; } = ""; + public Action Action { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/FileAccess.cs b/Moonlight/App/Helpers/Files/FileAccess.cs new file mode 100644 index 0000000..a900c46 --- /dev/null +++ b/Moonlight/App/Helpers/Files/FileAccess.cs @@ -0,0 +1,24 @@ +namespace Moonlight.App.Helpers.Files; + +public abstract class FileAccess : ICloneable +{ + public string CurrentPath { get; set; } = "/"; + + public abstract Task Ls(); + public abstract Task Cd(string dir); + public abstract Task Up(); + public abstract Task SetDir(string dir); + public abstract Task Read(FileData fileData); + public abstract Task Write(FileData fileData, string content); + public abstract Task Upload(string name, Stream stream, Action? progressUpdated = null); + public abstract Task MkDir(string name); + public abstract Task Pwd(); + public abstract Task DownloadUrl(FileData fileData); + public abstract Task DownloadStream(FileData fileData); + public abstract Task Delete(FileData fileData); + public abstract Task Move(FileData fileData, string newPath); + public abstract Task Compress(params FileData[] files); + public abstract Task Decompress(FileData fileData); + public abstract Task GetLaunchUrl(); + public abstract object Clone(); +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/FileData.cs b/Moonlight/App/Helpers/Files/FileData.cs new file mode 100644 index 0000000..f0bb75f --- /dev/null +++ b/Moonlight/App/Helpers/Files/FileData.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Helpers.Files; + +public class FileData +{ + public string Name { get; set; } = ""; + public long Size { get; set; } + public bool IsFile { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/WingsFileAccess.cs b/Moonlight/App/Helpers/Files/WingsFileAccess.cs new file mode 100644 index 0000000..b1c2296 --- /dev/null +++ b/Moonlight/App/Helpers/Files/WingsFileAccess.cs @@ -0,0 +1,232 @@ +using System.Web; +using Moonlight.App.Database.Entities; +using Moonlight.App.Models.Wings.Requests; +using Moonlight.App.Models.Wings.Resources; +using Moonlight.App.Services; +using RestSharp; + +namespace Moonlight.App.Helpers.Files; + +public class WingsFileAccess : FileAccess +{ + private readonly WingsApiHelper WingsApiHelper; + private readonly WingsJwtHelper WingsJwtHelper; + private readonly ConfigService ConfigService; + private readonly Server Server; + private readonly User User; + + public WingsFileAccess( + WingsApiHelper wingsApiHelper, + WingsJwtHelper wingsJwtHelper, + Server server, + ConfigService configService, + User user) + { + WingsApiHelper = wingsApiHelper; + WingsJwtHelper = wingsJwtHelper; + Server = server; + ConfigService = configService; + User = user; + + if (server.Node == null) + { + throw new ArgumentException("The wings file access server model needs to include the node data"); + } + } + + public override async Task Ls() + { + var res = await WingsApiHelper.Get( + Server.Node, + $"api/servers/{Server.Uuid}/files/list-directory?directory={CurrentPath}" + ); + + var x = new List(); + + foreach (var response in res) + { + x.Add(new() + { + Name = response.Name, + Size = response.File ? response.Size : 0, + IsFile = response.File, + }); + } + + return x.ToArray(); + } + + public override Task Cd(string dir) + { + var x = Path.Combine(CurrentPath, dir).Replace("\\", "/") + "/"; + x = x.Replace("//", "/"); + CurrentPath = x; + + return Task.CompletedTask; + } + + public override Task Up() + { + CurrentPath = Path.GetFullPath(Path.Combine(CurrentPath, "..")).Replace("\\", "/").Replace("C:", ""); + return Task.CompletedTask; + } + + public override Task SetDir(string dir) + { + CurrentPath = dir; + return Task.CompletedTask; + } + + public override async Task Read(FileData fileData) + { + return await WingsApiHelper.GetRaw(Server.Node, + $"api/servers/{Server.Uuid}/files/contents?file={CurrentPath}{fileData.Name}"); + } + + public override async Task Write(FileData fileData, string content) + { + await WingsApiHelper.PostRaw(Server.Node, + $"api/servers/{Server.Uuid}/files/write?file={CurrentPath}{fileData.Name}", content); + } + + public override async Task Upload(string name, Stream dataStream, Action? progressUpdated = null) + { + var token = WingsJwtHelper.Generate( + Server.Node.Token, + claims => { claims.Add("server_uuid", Server.Uuid.ToString()); } + ); + + var client = new RestClient(); + var request = new RestRequest(); + + if (Server.Node.Ssl) + request.Resource = + $"https://{Server.Node.Fqdn}:{Server.Node.HttpPort}/upload/file?token={token}&directory={CurrentPath}"; + else + request.Resource = + $"http://{Server.Node.Fqdn}:{Server.Node.HttpPort}/upload/file?token={token}&directory={CurrentPath}"; + + request.AddParameter("name", "files"); + request.AddParameter("filename", name); + request.AddHeader("Content-Type", "multipart/form-data"); + request.AddHeader("Origin", ConfigService.GetSection("Moonlight").GetValue("AppUrl")); + request.AddFile("files", () => + { + return new StreamProgressHelper(dataStream) + { + Progress = i => { progressUpdated?.Invoke(i); } + }; + }, name); + + await client.ExecutePostAsync(request); + + client.Dispose(); + dataStream.Close(); + } + + public override async Task MkDir(string name) + { + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/create-directory", + new CreateDirectory() + { + Name = name, + Path = CurrentPath + } + ); + } + + public override Task Pwd() + { + return Task.FromResult(CurrentPath); + } + + public override Task DownloadUrl(FileData fileData) + { + var token = WingsJwtHelper.Generate(Server.Node.Token, claims => + { + claims.Add("server_uuid", Server.Uuid.ToString()); + claims.Add("file_path", CurrentPath + "/" + fileData.Name); + }); + + if (Server.Node.Ssl) + { + return Task.FromResult( + $"https://{Server.Node.Fqdn}:{Server.Node.HttpPort}/download/file?token={token}" + ); + } + else + { + return Task.FromResult( + $"http://{Server.Node.Fqdn}:{Server.Node.HttpPort}/download/file?token={token}" + ); + } + } + + public override Task DownloadStream(FileData fileData) + { + throw new NotImplementedException(); + } + + public override async Task Delete(FileData fileData) + { + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/delete", new DeleteFiles() + { + Root = CurrentPath, + Files = new() + { + fileData.Name + } + }); + } + + public override async Task Move(FileData fileData, string newPath) + { + var req = new RenameFiles() + { + Root = "/", + Files = new[] + { + new RenameFilesData() + { + From = (CurrentPath + fileData.Name), + To = newPath + } + } + }; + + await WingsApiHelper.Put(Server.Node, $"api/servers/{Server.Uuid}/files/rename", req); + } + + public override async Task Compress(params FileData[] files) + { + var req = new CompressFiles() + { + Root = CurrentPath, + Files = files.Select(x => x.Name).ToArray() + }; + + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/compress", req); + } + + public override async Task Decompress(FileData fileData) + { + var req = new DecompressFile() + { + Root = CurrentPath, + File = fileData.Name + }; + + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/decompress", req); + } + + public override Task GetLaunchUrl() + { + return Task.FromResult( + $"sftp://{User.Id}.{StringHelper.IntToStringWithLeadingZeros(Server.Id, 8)}@{Server.Node.Fqdn}:{Server.Node.SftpPort}"); + } + + public override object Clone() + { + return new WingsFileAccess(WingsApiHelper, WingsJwtHelper, Server, ConfigService, User); + } +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/PaperApiHelper.cs b/Moonlight/App/Helpers/PaperApiHelper.cs index 232b4a8..c8e1a3f 100644 --- a/Moonlight/App/Helpers/PaperApiHelper.cs +++ b/Moonlight/App/Helpers/PaperApiHelper.cs @@ -24,11 +24,11 @@ public class PaperApiHelper else requrl = ApiUrl + "/" + url; - RestRequest request = new(requrl); + RestRequest request = new(requrl, Method.Get); request.AddHeader("Content-Type", "application/json"); - var response = await client.GetAsync(request); + var response = await client.ExecuteAsync(request); if (!response.IsSuccessful) { diff --git a/Moonlight/App/Helpers/WingsApiHelper.cs b/Moonlight/App/Helpers/WingsApiHelper.cs index 23900b4..9611d64 100644 --- a/Moonlight/App/Helpers/WingsApiHelper.cs +++ b/Moonlight/App/Helpers/WingsApiHelper.cs @@ -14,24 +14,13 @@ public class WingsApiHelper Client = new(); } - private string GetApiUrl(Node node) - { - if(node.Ssl) - return $"https://{node.Fqdn}:{node.HttpPort}/"; - else - return $"http://{node.Fqdn}:{node.HttpPort}/"; - //return $"https://{node.Fqdn}:{node.HttpPort}/"; - } - public async Task Get(Node node, string resource) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Get; - var response = await Client.GetAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -53,13 +42,11 @@ public class WingsApiHelper public async Task GetRaw(Node node, string resource) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Get; - var response = await Client.GetAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -81,18 +68,16 @@ public class WingsApiHelper public async Task Post(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Post; request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody ); - var response = await Client.PostAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -114,16 +99,14 @@ public class WingsApiHelper public async Task Post(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Post; - if(body != null) + if(body != null) request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - var response = await Client.PostAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -143,15 +126,13 @@ public class WingsApiHelper public async Task PostRaw(Node node, string resource, object body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Post; request.AddParameter("text/plain", body, ParameterType.RequestBody); - var response = await Client.PostAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -171,16 +152,14 @@ public class WingsApiHelper public async Task Delete(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Delete; - if(body != null) + if(body != null) request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - var response = await Client.DeleteAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -200,15 +179,13 @@ public class WingsApiHelper public async Task Put(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Put; request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - var response = await Client.PutAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -225,4 +202,20 @@ public class WingsApiHelper } } } + + private RestRequest CreateRequest(Node node, string resource) + { + var url = (node.Ssl ? "https" : "http") + $"://{node.Fqdn}:{node.HttpPort}/" + resource; + + var request = new RestRequest(url) + { + Timeout = 60 * 15 + }; + + request.AddHeader("Content-Type", "application/json"); + request.AddHeader("Accept", "application/json"); + request.AddHeader("Authorization", "Bearer " + node.Token); + + return request; + } } \ No newline at end of file diff --git a/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs b/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs index 6d181e2..1d64ab8 100644 --- a/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs +++ b/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs @@ -39,7 +39,7 @@ public class WingsFileAccess : IFileAccess public async Task GetDirectoryContent() { - var res = await WingsApiHelper.Get(Node, + var res = await WingsApiHelper.Get(Node, $"api/servers/{Server.Uuid}/files/list-directory?directory={Path}"); var x = new List(); @@ -130,7 +130,7 @@ public class WingsFileAccess : IFileAccess public async Task CreateDirectory(string name) { await WingsApiHelper.Post(Node, $"api/servers/{Server.Uuid}/files/create-directory", - new CreateDirectoryRequest() + new CreateDirectory() { Name = name, Path = Path @@ -171,7 +171,7 @@ public class WingsFileAccess : IFileAccess public async Task Delete(FileManagerObject managerObject) { - await WingsApiHelper.Post(Node, $"api/servers/{Server.Uuid}/files/delete", new DeleteFilesRequest() + await WingsApiHelper.Post(Node, $"api/servers/{Server.Uuid}/files/delete", new DeleteFiles() { Root = Path, Files = new() @@ -183,7 +183,7 @@ public class WingsFileAccess : IFileAccess public async Task Move(FileManagerObject managerObject, string newPath) { - await WingsApiHelper.Put(Node, $"api/servers/{Server.Uuid}/files/rename", new RenameFilesRequest() + await WingsApiHelper.Put(Node, $"api/servers/{Server.Uuid}/files/rename", new RenameFiles() { Root = "/", Files = new[] diff --git a/Moonlight/App/Models/Files/FileContextAction.cs b/Moonlight/App/Models/Files/FileContextAction.cs new file mode 100644 index 0000000..7570013 --- /dev/null +++ b/Moonlight/App/Models/Files/FileContextAction.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Models.Files; + +public class FileContextAction +{ + public string Id { get; set; } + public string Name { get; set; } + public Action Action { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Wings/Requests/CompressFiles.cs b/Moonlight/App/Models/Wings/Requests/CompressFiles.cs new file mode 100644 index 0000000..2c86667 --- /dev/null +++ b/Moonlight/App/Models/Wings/Requests/CompressFiles.cs @@ -0,0 +1,12 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Wings.Requests; + +public class CompressFiles +{ + [JsonProperty("root")] + public string Root { get; set; } + + [JsonProperty("files")] + public string[] Files { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Wings/Requests/CreateBackupRequest.cs b/Moonlight/App/Models/Wings/Requests/CreateBackup.cs similarity index 89% rename from Moonlight/App/Models/Wings/Requests/CreateBackupRequest.cs rename to Moonlight/App/Models/Wings/Requests/CreateBackup.cs index a0ce5b4..779abf1 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateBackupRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/CreateBackup.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class CreateBackupRequest +public class CreateBackup { [JsonProperty("adapter")] public string Adapter { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/CreateDirectoryRequest.cs b/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs similarity index 85% rename from Moonlight/App/Models/Wings/Requests/CreateDirectoryRequest.cs rename to Moonlight/App/Models/Wings/Requests/CreateDirectory.cs index 62c95e3..1dc6617 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateDirectoryRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class CreateDirectoryRequest +public class CreateDirectory { [JsonProperty("name")] public string Name { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/CreateServerRequest.cs b/Moonlight/App/Models/Wings/Requests/CreateServer.cs similarity index 87% rename from Moonlight/App/Models/Wings/Requests/CreateServerRequest.cs rename to Moonlight/App/Models/Wings/Requests/CreateServer.cs index 3288d88..7e939a4 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateServerRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/CreateServer.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class CreateServerRequest +public class CreateServer { [JsonProperty("uuid")] public Guid Uuid { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/DecompressFile.cs b/Moonlight/App/Models/Wings/Requests/DecompressFile.cs new file mode 100644 index 0000000..5fb7073 --- /dev/null +++ b/Moonlight/App/Models/Wings/Requests/DecompressFile.cs @@ -0,0 +1,12 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Wings.Requests; + +public class DecompressFile +{ + [JsonProperty("root")] + public string Root { get; set; } + + [JsonProperty("file")] + public string File { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Wings/Requests/DeleteFilesRequest.cs b/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs similarity index 86% rename from Moonlight/App/Models/Wings/Requests/DeleteFilesRequest.cs rename to Moonlight/App/Models/Wings/Requests/DeleteFiles.cs index c64487f..9988ff0 100644 --- a/Moonlight/App/Models/Wings/Requests/DeleteFilesRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class DeleteFilesRequest +public class DeleteFiles { [JsonProperty("root")] public string Root { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/RenameFilesRequest.cs b/Moonlight/App/Models/Wings/Requests/RenameFiles.cs similarity index 91% rename from Moonlight/App/Models/Wings/Requests/RenameFilesRequest.cs rename to Moonlight/App/Models/Wings/Requests/RenameFiles.cs index 8355cff..f565a32 100644 --- a/Moonlight/App/Models/Wings/Requests/RenameFilesRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/RenameFiles.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class RenameFilesRequest +public class RenameFiles { [JsonProperty("root")] public string Root { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/RestoreBackupRequest.cs b/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs similarity index 90% rename from Moonlight/App/Models/Wings/Requests/RestoreBackupRequest.cs rename to Moonlight/App/Models/Wings/Requests/RestoreBackup.cs index 0dfa9cb..fcd7b8a 100644 --- a/Moonlight/App/Models/Wings/Requests/RestoreBackupRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class RestoreBackupRequest +public class RestoreBackup { [JsonProperty("adapter")] public string Adapter { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/ServerPowerRequest.cs b/Moonlight/App/Models/Wings/Requests/ServerPower.cs similarity index 81% rename from Moonlight/App/Models/Wings/Requests/ServerPowerRequest.cs rename to Moonlight/App/Models/Wings/Requests/ServerPower.cs index 597d9e5..e877fb7 100644 --- a/Moonlight/App/Models/Wings/Requests/ServerPowerRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/ServerPower.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class ServerPowerRequest +public class ServerPower { [JsonProperty("action")] public string Action { get; set; } diff --git a/Moonlight/App/Models/Wings/Resources/ListDirectoryRequest.cs b/Moonlight/App/Models/Wings/Resources/ListDirectory.cs similarity index 94% rename from Moonlight/App/Models/Wings/Resources/ListDirectoryRequest.cs rename to Moonlight/App/Models/Wings/Resources/ListDirectory.cs index 0a67bfa..d99e15d 100644 --- a/Moonlight/App/Models/Wings/Resources/ListDirectoryRequest.cs +++ b/Moonlight/App/Models/Wings/Resources/ListDirectory.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Resources; -public class ListDirectoryRequest +public class ListDirectory { [JsonProperty("name")] public string Name { get; set; } diff --git a/Moonlight/App/Models/Wings/Resources/ServerDetailsResponse.cs b/Moonlight/App/Models/Wings/Resources/ServerDetails.cs similarity index 78% rename from Moonlight/App/Models/Wings/Resources/ServerDetailsResponse.cs rename to Moonlight/App/Models/Wings/Resources/ServerDetails.cs index bc89a29..b14ac56 100644 --- a/Moonlight/App/Models/Wings/Resources/ServerDetailsResponse.cs +++ b/Moonlight/App/Models/Wings/Resources/ServerDetails.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Resources; -public class ServerDetailsResponse +public class ServerDetails { [JsonProperty("state")] public string State { get; set; } @@ -11,9 +11,9 @@ public class ServerDetailsResponse public bool IsSuspended { get; set; } [JsonProperty("utilization")] - public ServerDetailsResponseUtilization Utilization { get; set; } + public ServerDetailsUtilization Utilization { get; set; } - public class ServerDetailsResponseUtilization + public class ServerDetailsUtilization { [JsonProperty("memory_bytes")] public long MemoryBytes { get; set; } @@ -25,7 +25,7 @@ public class ServerDetailsResponse public double CpuAbsolute { get; set; } [JsonProperty("network")] - public ServerDetailsResponseNetwork Network { get; set; } + public ServerDetailsNetwork Network { get; set; } [JsonProperty("uptime")] public long Uptime { get; set; } @@ -37,7 +37,7 @@ public class ServerDetailsResponse public long DiskBytes { get; set; } } - public class ServerDetailsResponseNetwork + public class ServerDetailsNetwork { [JsonProperty("rx_bytes")] public long RxBytes { get; set; } diff --git a/Moonlight/App/Services/Interop/ModalService.cs b/Moonlight/App/Services/Interop/ModalService.cs new file mode 100644 index 0000000..881fb2e --- /dev/null +++ b/Moonlight/App/Services/Interop/ModalService.cs @@ -0,0 +1,23 @@ +using Microsoft.JSInterop; + +namespace Moonlight.App.Services.Interop; + +public class ModalService +{ + private readonly IJSRuntime JsRuntime; + + public ModalService(IJSRuntime jsRuntime) + { + JsRuntime = jsRuntime; + } + + public async Task Show(string name) + { + await JsRuntime.InvokeVoidAsync("moonlight.modals.show", name); + } + + public async Task Hide(string name) + { + await JsRuntime.InvokeVoidAsync("moonlight.modals.hide", name); + } +} \ No newline at end of file diff --git a/Moonlight/App/Services/Interop/ToastService.cs b/Moonlight/App/Services/Interop/ToastService.cs index 3eff8a1..5e1839d 100644 --- a/Moonlight/App/Services/Interop/ToastService.cs +++ b/Moonlight/App/Services/Interop/ToastService.cs @@ -30,4 +30,19 @@ public class ToastService { await JsRuntime.InvokeVoidAsync("showSuccessToast", message); } + + public async Task CreateProcessToast(string id, string text) + { + await JsRuntime.InvokeVoidAsync("createToast", id, text); + } + + public async Task UpdateProcessToast(string id, string text) + { + await JsRuntime.InvokeVoidAsync("modifyToast", id, text); + } + + public async Task RemoveProcessToast(string id) + { + await JsRuntime.InvokeVoidAsync("removeToast", id); + } } \ No newline at end of file diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs index 0542a09..2f69fd7 100644 --- a/Moonlight/App/Services/ServerService.cs +++ b/Moonlight/App/Services/ServerService.cs @@ -75,11 +75,11 @@ public class ServerService return s; } - public async Task GetDetails(Server s) + public async Task GetDetails(Server s) { Server server = EnsureNodeData(s); - return await WingsApiHelper.Get( + return await WingsApiHelper.Get( server.Node, $"api/servers/{server.Uuid}" ); @@ -91,7 +91,7 @@ public class ServerService var rawSignal = signal.ToString().ToLower(); - await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/power", new ServerPowerRequest() + await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/power", new ServerPower() { Action = rawSignal }); @@ -118,7 +118,7 @@ public class ServerService serverData.Backups.Add(backup); ServerRepository.Update(serverData); - await WingsApiHelper.Post(serverData.Node, $"api/servers/{serverData.Uuid}/backup", new CreateBackupRequest() + await WingsApiHelper.Post(serverData.Node, $"api/servers/{serverData.Uuid}/backup", new CreateBackup() { Adapter = "wings", Uuid = backup.Uuid, @@ -158,7 +158,7 @@ public class ServerService Server server = EnsureNodeData(s); await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/backup/{serverBackup.Uuid}/restore", - new RestoreBackupRequest() + new RestoreBackup() { Adapter = "wings" }); @@ -299,7 +299,7 @@ public class ServerService try { - await WingsApiHelper.Post(node, $"api/servers", new CreateServerRequest() + await WingsApiHelper.Post(node, $"api/servers", new CreateServer() { Uuid = newServerData.Uuid, StartOnCompletion = false diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index 07c3a9f..9609e64 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -68,7 +68,6 @@ - diff --git a/Moonlight/Pages/_Layout.cshtml b/Moonlight/Pages/_Layout.cshtml index cbfcf6e..b82364f 100644 --- a/Moonlight/Pages/_Layout.cshtml +++ b/Moonlight/Pages/_Layout.cshtml @@ -101,6 +101,7 @@ + @@ -112,5 +113,6 @@ + \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 8dc9429..c1519c1 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -93,6 +93,7 @@ namespace Moonlight builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor b/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor index 0a2888c..9af01b0 100644 --- a/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor +++ b/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor @@ -3,27 +3,30 @@ @using Moonlight.Shared.Components.Partials @inject SmartTranslateService TranslationService +@inject IJSRuntime JsRuntime -
- -
- -@if (!HideControls) -{ -
-
- - -
+
+
+
-} + + @if (!HideControls) + { +
+
+ + +
+
+ } +
@code { @@ -53,8 +56,8 @@ { AutomaticLayout = true, Language = "plaintext", - Value = "Wird geladen", - Theme = "vs-dark", + Value = "Loading content", + Theme = "moonlight-theme", Contextmenu = false, Minimap = new() { @@ -68,6 +71,8 @@ { if (firstRender) { + await JsRuntime.InvokeVoidAsync("initMonacoTheme"); + Editor.OnDidInit = new EventCallback(this, async () => { EditorOptions.Language = Language; diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor b/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor index cf8c13b..f1f9eea 100644 --- a/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor +++ b/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor @@ -1,529 +1,329 @@ -@using Moonlight.App.Helpers -@using BlazorContextMenu -@using BlazorDownloadFile +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Helpers @using Logging.Net -@using Moonlight.App.Models.Files @using Moonlight.App.Services @using Moonlight.App.Services.Interop +@using BlazorDownloadFile -@inject AlertService AlertService @inject ToastService ToastService @inject NavigationManager NavigationManager -@inject SmartTranslateService TranslationService +@inject AlertService AlertService +@inject SmartTranslateService SmartTranslateService @inject IBlazorDownloadFileService FileService -
-@if (Editing == null) +@if (Editing) { -
-
-
- - - - - - - -
-
-
- @if (SelectedFiles.Count == 0) - { -
- - - - -
- } - else - { -
-
- - @(SelectedFiles.Count) - - Selected -
- - -
- } -
-
-
-
-
-
- @{ - var vx = "/"; - } - / - - - - - - @{ - var cp = "/"; - var lp = "/"; - var pathParts = CurrentPath.Replace("\\", "/").Split('/', StringSplitOptions.RemoveEmptyEntries); - foreach (var path in pathParts) - { - lp = cp; - @(path) - - - - - - - cp += path + "/"; - } - } -
-
-
-
- @if (Loading) - { -
- - Loading - -
- } - else - { -
- - - - - - - - - - - - @foreach (var obj in Objects.Where(x => x.Name.Contains(Search))) - { - - - - - - - - } - -
-
- -
- 		- File name - - File size - - Last modified -
-
- -
- 		-
- @if (obj.IsFile) - { - - - - - - - } - else - { - - - - - - - } - - @if (obj.IsFile) - { - @(obj.Name) - } - else - { - @(obj.Name) - } -
- 		- @(Formatter.FormatSize(obj.Size)) - - @(obj.UpdatedAt.ToShortDateString()) @(obj.UpdatedAt.ToShortTimeString()) - -
-
- - - -
-
-
-
- } -
-
+ + } else { - if (Loading) - { -
- - Loading - -
- } - else - { - - } -} -
+
+
+
+
+ +
+
+
+
+ @if (View != null && View.SelectedFiles.Any()) + { +
+ @(View.SelectedFiles.Length) selected +
+ + + + + + + + + + } + else + { + - - Rename - Move - Archive - Unarchive - Download - Delete - + + + + } +
+
+
+
+ +
+ + +
+ + + +} @code { [Parameter] - public IFileAccess FileAccess { get; set; } + public FileAccess Access { get; set; } - // Data + // File Editor + private bool Editing = false; + private string EditorInitialData = ""; + private string EditorLanguage = ""; + private FileData EditingFile; + private FileEditor Editor; - private List SelectedFiles { get; set; } = new(); - private List Objects { get; set; } = new(); - private string CurrentPath = ""; + // File View + private FileView? View; - // Search - private string SearchValue = ""; + // File Move + private FileAccess MoveAccess; + private FileSelectModal FileSelectModal; + private FileData? SingleMoveFile = null; + + // Config + private ContextAction[] Actions = Array.Empty(); - private string Search + protected override void OnInitialized() { - get { return SearchValue; } - set + MoveAccess = (FileAccess)Access.Clone(); + + List actions = new(); + + actions.Add(new() { - SearchValue = value; - InvokeAsync(StateHasChanged); - } - } + Id = "rename", + Name = "Rename", + Action = async (x) => + { + var name = await AlertService.Text( + SmartTranslateService.Translate("Rename"), + SmartTranslateService.Translate("Enter a new name"), + x.Name + ); - // States - private bool Loading = false; - - // States - Editor - private FileManagerObject? Editing = null; - private string InitialEditorData = ""; - private string Language = "plaintext"; - - // States - File Upload - private bool Uploading = false; - private int Percent = 0; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) + if (name != x.Name) + { + await Access.Move(x, Access.CurrentPath + name); + } + + await View!.Refresh(); + } + }); + + actions.Add(new () { - await RefreshActive(); - } - } - - private async Task RefreshActive() - { - Loading = true; - await InvokeAsync(StateHasChanged); - - await Refresh(false); - - Loading = false; - await InvokeAsync(StateHasChanged); - } - - private async Task Refresh(bool rerender = true) - { - SelectedFiles.Clear(); - Objects.Clear(); - CurrentPath = await FileAccess.GetCurrentPath(); - - var data = await FileAccess.GetDirectoryContent(); - Objects = data.ToList(); - - if (rerender) - await InvokeAsync(StateHasChanged); - } - - private async Task CdPath(string path) - { - await FileAccess.ChangeDirectory(path); - await RefreshActive(); - } - - private async Task SetPath(string path) - { - await FileAccess.SetDirectory(path); - await RefreshActive(); - } - - private async Task OnContextMenuClick(ItemClickEventArgs e) - { - var data = e.Data as FileManagerObject; - - if (data == null) - return; - - switch (e.MenuItem.Id) - { - case "delete": - await FileAccess.Delete(data); - break; - case "download": - if (data.IsFile) + Id = "download", + Name = "Download", + Action = async (x) => + { + if (x.IsFile) { try { - var stream = await FileAccess.GetDownloadStream(data); - await ToastService.Info(TranslationService.Translate("Starting download")); + var stream = await Access.DownloadStream(x); + await ToastService.Info(SmartTranslateService.Translate("Starting download")); await FileService.AddBuffer(stream); - await FileService.DownloadBinaryBuffers(data.Name); + await FileService.DownloadBinaryBuffers(x.Name); } catch (NotImplementedException) { - try - { - var url = await FileAccess.GetDownloadUrl(data); - NavigationManager.NavigateTo(url, true); - await ToastService.Info(TranslationService.Translate("Starting download")); - } - catch (Exception exception) - { - await ToastService.Error(TranslationService.Translate("Error starting download")); - Logger.Error("Error downloading file"); - Logger.Error(exception.Message); - } - } - catch (Exception exception) - { - await ToastService.Error(TranslationService.Translate("Error starting download")); - Logger.Error("Error downloading file stream"); - Logger.Error(exception.Message); + var url = await Access.DownloadUrl(x); + NavigationManager.NavigateTo(url, true); + await ToastService.Info(SmartTranslateService.Translate("Starting download")); } } - break; - case "rename": - var newName = await AlertService.Text(TranslationService.Translate("Rename"), TranslationService.Translate("Enter a new name"), data.Name); - var path = await FileAccess.GetCurrentPath(); - await FileAccess.Move(data, path + "/" + newName); - break; - } - - await Refresh(false); - } - - private async Task OnFileToggle(ChangeEventArgs obj, FileManagerObject o) - { - if ((bool)obj.Value) - { - if (SelectedFiles.Contains(o)) - return; - - SelectedFiles.Add(o); - await InvokeAsync(StateHasChanged); - } - else - { - if (!SelectedFiles.Contains(o)) - return; - - SelectedFiles.Remove(o); - await InvokeAsync(StateHasChanged); - } - } - - private async Task OnAllFileToggle(ChangeEventArgs obj) - { - if ((bool)obj.Value) - { - foreach (var o in Objects) - { - if (SelectedFiles.Contains(o)) - continue; - - SelectedFiles.Add(o); } - - await InvokeAsync(StateHasChanged); - } - else + }); + + actions.Add(new() { - foreach (var o in Objects) + Id = "compress", + Name = "Compress", + Action = async (x) => { - if (!SelectedFiles.Contains(o)) - continue; - - SelectedFiles.Remove(o); + await Access.Compress(x); + await View!.Refresh(); } + }); + + actions.Add(new () + { + Id = "decompress", + Name = "Decompress", + Action = async (x) => + { + await Access.Decompress(x); + await View!.Refresh(); + } + }); + actions.Add(new() + { + Id = "move", + Name = "Move", + Action = async (x) => + { + SingleMoveFile = x; + await StartMoveFiles(); + } + }); + + actions.Add(new() + { + Id = "delete", + Name = "Delete", + Action = async (x) => + { + await Access.Delete(x); + await View!.Refresh(); + } + }); + + Actions = actions.ToArray(); + } + + private async Task OnElementClicked(FileData fileData) + { + if (fileData.IsFile) + { + EditorInitialData = await Access.Read(fileData); + EditorLanguage = MonacoTypeHelper.GetEditorType(fileData.Name); + EditingFile = fileData; + + Editing = true; await InvokeAsync(StateHasChanged); + return true; } - } - - private async Task CreateFolder() - { - var name = await AlertService.Text(TranslationService.Translate("Create a new folder"), TranslationService.Translate("Enter a name"), ""); - - if (string.IsNullOrEmpty(name)) - return; - - await FileAccess.CreateDirectory(name); - await Refresh(); - } - - private async void SaveFile(string data) - { - if (Editing == null) - return; - - await FileAccess.WriteFile(Editing, data); - Editing = null; - await Refresh(); - } - - private async Task OpenFile(FileManagerObject o) - { - Editing = o; - Loading = true; - await InvokeAsync(StateHasChanged); - - InitialEditorData = await FileAccess.ReadFile(Editing); - Language = MonacoTypeHelper.GetEditorType(Editing.Name); - - Loading = false; + await InvokeAsync(StateHasChanged); + return false; } - private async void CloseFile() + private async void Cancel(bool save = false) { - Editing = null; + if (save) + { + var data = await Editor.GetData(); + await Access.Write(EditingFile, data); + } + + Editing = false; await InvokeAsync(StateHasChanged); } private async Task Launch() { - NavigationManager.NavigateTo(await FileAccess.GetLaunchUrl()); + var url = await Access.GetLaunchUrl(); + NavigationManager.NavigateTo(url, true); } - private async Task OnFileChanged(InputFileChangeEventArgs arg) + private async Task CreateFolder() + { + var name = await AlertService.Text( + SmartTranslateService.Translate("Create a new folder"), + SmartTranslateService.Translate("Enter a name"), + "" + ); + + if (string.IsNullOrEmpty(name)) + return; + + await Access.MkDir(name); + await View!.Refresh(); + } + + private async Task OnSelectionChanged() { - Uploading = true; await InvokeAsync(StateHasChanged); + } - foreach (var browserFile in arg.GetMultipleFiles()) + private async Task StartMoveFiles() + { + await FileSelectModal.Show(); + } + + private async Task DeleteMultiple() + { + foreach (var data in View!.SelectedFiles) { - if (browserFile.Size < 1024 * 1024 * 100) - { - Percent = 0; - - try - { - await FileAccess.UploadFile( - browserFile.Name, - browserFile.OpenReadStream(1024 * 1024 * 100), - async (i) => - { - Percent = i; - - Task.Run(() => { InvokeAsync(StateHasChanged); }); - }); - - await Refresh(); - } - catch (Exception e) - { - await ToastService.Error(TranslationService.Translate("An unknown error occured while uploading a file")); - Logger.Error("Error uploading file"); - Logger.Error(e); - } - } - else - { - await ToastService.Error(TranslationService.Translate("The uploaded file should not be bigger than 100MB")); - } + await Access.Delete(data); } - Uploading = false; - await InvokeAsync(StateHasChanged); + await View!.Refresh(); + } - await ToastService.Success(TranslationService.Translate("File upload complete")); + private async Task CompressMultiple() + { + await Access.Compress(View!.SelectedFiles); + + await View!.Refresh(); + } + + private async Task OnFileMoveSubmit(string path) + { + foreach (var sFile in View!.SelectedFiles) + { + await Access.Move(sFile, path + sFile.Name); + } + + if (SingleMoveFile != null) + { + await Access.Move(SingleMoveFile, path + SingleMoveFile.Name); + SingleMoveFile = null; + } + + await View.Refresh(); + } + + // This method can be called by every component to refresh the view + private async Task OnComponentStateChanged() + { + await View!.Refresh(); + await InvokeAsync(StateHasChanged); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor b/Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor new file mode 100644 index 0000000..cf8c13b --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor @@ -0,0 +1,529 @@ +@using Moonlight.App.Helpers +@using BlazorContextMenu +@using BlazorDownloadFile +@using Logging.Net +@using Moonlight.App.Models.Files +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject AlertService AlertService +@inject ToastService ToastService +@inject NavigationManager NavigationManager +@inject SmartTranslateService TranslationService +@inject IBlazorDownloadFileService FileService + +
+@if (Editing == null) +{ +
+
+
+ + + + + + + +
+
+
+ @if (SelectedFiles.Count == 0) + { +
+ + + + +
+ } + else + { +
+
+ + @(SelectedFiles.Count) + + Selected +
+ + +
+ } +
+
+
+
+
+
+ @{ + var vx = "/"; + } + / + + + + + + @{ + var cp = "/"; + var lp = "/"; + var pathParts = CurrentPath.Replace("\\", "/").Split('/', StringSplitOptions.RemoveEmptyEntries); + foreach (var path in pathParts) + { + lp = cp; + @(path) + + + + + + + cp += path + "/"; + } + } +
+
+
+
+ @if (Loading) + { +
+ + Loading + +
+ } + else + { +
+ + + + + + + + + + + + @foreach (var obj in Objects.Where(x => x.Name.Contains(Search))) + { + + + + + + + + } + +
+
+ +
+ 		+ File name + + File size + + Last modified +
+
+ +
+ 		+
+ @if (obj.IsFile) + { + + + + + + + } + else + { + + + + + + + } + + @if (obj.IsFile) + { + @(obj.Name) + } + else + { + @(obj.Name) + } +
+ 		+ @(Formatter.FormatSize(obj.Size)) + + @(obj.UpdatedAt.ToShortDateString()) @(obj.UpdatedAt.ToShortTimeString()) + +
+
+ + + +
+
+
+
+ } +
+
+} +else +{ + if (Loading) + { +
+ + Loading + +
+ } + else + { + + } +} +
+ + + Rename + Move + Archive + Unarchive + Download + Delete + + +@code +{ + [Parameter] + public IFileAccess FileAccess { get; set; } + + // Data + + private List SelectedFiles { get; set; } = new(); + private List Objects { get; set; } = new(); + private string CurrentPath = ""; + + // Search + private string SearchValue = ""; + + private string Search + { + get { return SearchValue; } + set + { + SearchValue = value; + InvokeAsync(StateHasChanged); + } + } + + // States + private bool Loading = false; + + // States - Editor + private FileManagerObject? Editing = null; + private string InitialEditorData = ""; + private string Language = "plaintext"; + + // States - File Upload + private bool Uploading = false; + private int Percent = 0; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await RefreshActive(); + } + } + + private async Task RefreshActive() + { + Loading = true; + await InvokeAsync(StateHasChanged); + + await Refresh(false); + + Loading = false; + await InvokeAsync(StateHasChanged); + } + + private async Task Refresh(bool rerender = true) + { + SelectedFiles.Clear(); + Objects.Clear(); + CurrentPath = await FileAccess.GetCurrentPath(); + + var data = await FileAccess.GetDirectoryContent(); + Objects = data.ToList(); + + if (rerender) + await InvokeAsync(StateHasChanged); + } + + private async Task CdPath(string path) + { + await FileAccess.ChangeDirectory(path); + await RefreshActive(); + } + + private async Task SetPath(string path) + { + await FileAccess.SetDirectory(path); + await RefreshActive(); + } + + private async Task OnContextMenuClick(ItemClickEventArgs e) + { + var data = e.Data as FileManagerObject; + + if (data == null) + return; + + switch (e.MenuItem.Id) + { + case "delete": + await FileAccess.Delete(data); + break; + case "download": + if (data.IsFile) + { + try + { + var stream = await FileAccess.GetDownloadStream(data); + await ToastService.Info(TranslationService.Translate("Starting download")); + await FileService.AddBuffer(stream); + await FileService.DownloadBinaryBuffers(data.Name); + } + catch (NotImplementedException) + { + try + { + var url = await FileAccess.GetDownloadUrl(data); + NavigationManager.NavigateTo(url, true); + await ToastService.Info(TranslationService.Translate("Starting download")); + } + catch (Exception exception) + { + await ToastService.Error(TranslationService.Translate("Error starting download")); + Logger.Error("Error downloading file"); + Logger.Error(exception.Message); + } + } + catch (Exception exception) + { + await ToastService.Error(TranslationService.Translate("Error starting download")); + Logger.Error("Error downloading file stream"); + Logger.Error(exception.Message); + } + } + break; + case "rename": + var newName = await AlertService.Text(TranslationService.Translate("Rename"), TranslationService.Translate("Enter a new name"), data.Name); + var path = await FileAccess.GetCurrentPath(); + await FileAccess.Move(data, path + "/" + newName); + break; + } + + await Refresh(false); + } + + private async Task OnFileToggle(ChangeEventArgs obj, FileManagerObject o) + { + if ((bool)obj.Value) + { + if (SelectedFiles.Contains(o)) + return; + + SelectedFiles.Add(o); + await InvokeAsync(StateHasChanged); + } + else + { + if (!SelectedFiles.Contains(o)) + return; + + SelectedFiles.Remove(o); + await InvokeAsync(StateHasChanged); + } + } + + private async Task OnAllFileToggle(ChangeEventArgs obj) + { + if ((bool)obj.Value) + { + foreach (var o in Objects) + { + if (SelectedFiles.Contains(o)) + continue; + + SelectedFiles.Add(o); + } + + await InvokeAsync(StateHasChanged); + } + else + { + foreach (var o in Objects) + { + if (!SelectedFiles.Contains(o)) + continue; + + SelectedFiles.Remove(o); + } + + + await InvokeAsync(StateHasChanged); + } + } + + private async Task CreateFolder() + { + var name = await AlertService.Text(TranslationService.Translate("Create a new folder"), TranslationService.Translate("Enter a name"), ""); + + if (string.IsNullOrEmpty(name)) + return; + + await FileAccess.CreateDirectory(name); + await Refresh(); + } + + private async void SaveFile(string data) + { + if (Editing == null) + return; + + await FileAccess.WriteFile(Editing, data); + Editing = null; + await Refresh(); + } + + private async Task OpenFile(FileManagerObject o) + { + Editing = o; + Loading = true; + await InvokeAsync(StateHasChanged); + + InitialEditorData = await FileAccess.ReadFile(Editing); + Language = MonacoTypeHelper.GetEditorType(Editing.Name); + + Loading = false; + await InvokeAsync(StateHasChanged); + } + + private async void CloseFile() + { + Editing = null; + await InvokeAsync(StateHasChanged); + } + + private async Task Launch() + { + NavigationManager.NavigateTo(await FileAccess.GetLaunchUrl()); + } + + private async Task OnFileChanged(InputFileChangeEventArgs arg) + { + Uploading = true; + await InvokeAsync(StateHasChanged); + + foreach (var browserFile in arg.GetMultipleFiles()) + { + if (browserFile.Size < 1024 * 1024 * 100) + { + Percent = 0; + + try + { + await FileAccess.UploadFile( + browserFile.Name, + browserFile.OpenReadStream(1024 * 1024 * 100), + async (i) => + { + Percent = i; + + Task.Run(() => { InvokeAsync(StateHasChanged); }); + }); + + await Refresh(); + } + catch (Exception e) + { + await ToastService.Error(TranslationService.Translate("An unknown error occured while uploading a file")); + Logger.Error("Error uploading file"); + Logger.Error(e); + } + } + else + { + await ToastService.Error(TranslationService.Translate("The uploaded file should not be bigger than 100MB")); + } + } + + Uploading = false; + await InvokeAsync(StateHasChanged); + + await ToastService.Success(TranslationService.Translate("File upload complete")); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FilePath.razor b/Moonlight/Shared/Components/FileManagerPartials/FilePath.razor new file mode 100644 index 0000000..93982da --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FilePath.razor @@ -0,0 +1,47 @@ +@using Moonlight.App.Helpers.Files + +
+
+ @{ + var vx = "/"; + } + / + + + + + + @{ + var cp = "/"; + var lp = "/"; + var pathParts = Access.CurrentPath.Replace("\\", "/").Split('/', StringSplitOptions.RemoveEmptyEntries); + foreach (var path in pathParts) + { + lp = cp; + @(path) + + + + + + + cp += path + "/"; + } + } +
+
+ +@code +{ + [Parameter] + public FileAccess Access { get; set; } + + [Parameter] + public Func? OnPathChanged { get; set; } + + public async Task SetPath(string path) + { + await Access.SetDir(path); + OnPathChanged?.Invoke(); + } +} diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor b/Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor new file mode 100644 index 0000000..9a9814f --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor @@ -0,0 +1,132 @@ +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject ModalService ModalService +@inject SmartTranslateService SmartTranslateService + + + +@code +{ + [Parameter] + public FileAccess Access { get; set; } + + [Parameter] + public bool OnlyFolder { get; set; } = false; + + [Parameter] + public Func? Filter { get; set; } + + [Parameter] + public string Title { get; set; } = "Select file or folder"; + + [Parameter] + public Func? OnSubmit { get; set; } + + [Parameter] + public Func? OnCancel { get; set; } + + private int Id = 0; + private string Result = "/"; + + private FileView FileView; + + protected override void OnInitialized() + { + Id = this.GetHashCode(); + } + + public async Task Show() + { + // Reset + Result = "/"; + await Access.SetDir("/"); + await FileView.Refresh(); + + await ModalService.Show("fileView" + Id); + } + + public async Task Hide() + { + await Cancel(); + } + + private async Task Cancel() + { + await ModalService.Hide("fileView" + Id); + await OnCancel?.Invoke()!; + } + + private async Task Submit() + { + await ModalService.Hide("fileView" + Id); + await OnSubmit?.Invoke(Result)!; + } + + private bool DoFilter(FileData file) + { + if (OnlyFolder) + { + if (file.IsFile) + return false; + else + { + if (Filter != null) + return Filter.Invoke(file); + else + return true; + } + } + else + { + if (Filter != null) + return Filter.Invoke(file); + else + return true; + } + } + + private async Task OnElementClicked(FileData file) + { + Result = Access.CurrentPath + file.Name + (file.IsFile ? "" : "/"); + + if (!OnlyFolder && file.IsFile) + { + await Submit(); + } + + return false; + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor b/Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor new file mode 100644 index 0000000..5efc29f --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor @@ -0,0 +1,90 @@ +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop +@using Logging.Net + +@inject ToastService ToastService +@inject SmartTranslateService SmartTranslateService + +