diff --git a/Moonlight/Core/Helpers/HostFileActions.cs b/Moonlight/Core/Helpers/HostFileActions.cs index 13e411bf..860340d3 100644 --- a/Moonlight/Core/Helpers/HostFileActions.cs +++ b/Moonlight/Core/Helpers/HostFileActions.cs @@ -40,18 +40,26 @@ public class HostFileActions : IFileActions return Task.FromResult(entries.ToArray()); } - public Task Delete(string path) + public Task DeleteFile(string path) { var fullPath = GetFullPath(path); if (File.Exists(fullPath)) File.Delete(fullPath); - else if (Directory.Exists(fullPath)) - Directory.Delete(fullPath, true); return Task.CompletedTask; } + public Task DeleteDirectory(string path) + { + var fullPath = GetFullPath(path); + + if (Directory.Exists(fullPath)) + Directory.Delete(fullPath, true); + + return Task.CompletedTask; + } + public Task Move(string from, string to) { var source = GetFullPath(from); @@ -65,29 +73,29 @@ public class HostFileActions : IFileActions return Task.CompletedTask; } - public Task CreateDirectory(string name) + public Task CreateDirectory(string path) { - var fullPath = GetFullPath(name); + var fullPath = GetFullPath(path); Directory.CreateDirectory(fullPath); return Task.CompletedTask; } - public Task CreateFile(string name) + public Task CreateFile(string path) { - var fullPath = GetFullPath(name); + var fullPath = GetFullPath(path); File.Create(fullPath).Close(); return Task.CompletedTask; } - public Task ReadFile(string name) + public Task ReadFile(string path) { - var fullPath = GetFullPath(name); + var fullPath = GetFullPath(path); return File.ReadAllTextAsync(fullPath); } - public Task WriteFile(string name, string content) + public Task WriteFile(string path, string content) { - var fullPath = GetFullPath(name); + var fullPath = GetFullPath(path); EnsureDir(fullPath); @@ -95,15 +103,15 @@ public class HostFileActions : IFileActions return Task.CompletedTask; } - public Task ReadFileStream(string name) + public Task ReadFileStream(string path) { - var fullPath = GetFullPath(name); + var fullPath = GetFullPath(path); return Task.FromResult(File.OpenRead(fullPath)); } - public Task WriteFileStream(string name, Stream dataStream) + public Task WriteFileStream(string path, Stream dataStream) { - var fullPath = GetFullPath(name); + var fullPath = GetFullPath(path); EnsureDir(fullPath); diff --git a/Moonlight/Features/FileManager/Implementations/CreateFileAction.cs b/Moonlight/Features/FileManager/Implementations/CreateFileAction.cs index 2d447644..68589af9 100644 --- a/Moonlight/Features/FileManager/Implementations/CreateFileAction.cs +++ b/Moonlight/Features/FileManager/Implementations/CreateFileAction.cs @@ -1,7 +1,6 @@ using MoonCoreUI.Services; using Moonlight.Features.FileManager.Interfaces; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; namespace Moonlight.Features.FileManager.Implementations; @@ -11,7 +10,7 @@ public class CreateFileAction : IFileManagerCreateAction public string Icon => "bx-file"; public string Color => "primary"; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, IServiceProvider provider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, IServiceProvider provider) { var alertService = provider.GetRequiredService(); diff --git a/Moonlight/Features/FileManager/Implementations/CreateFolderAction.cs b/Moonlight/Features/FileManager/Implementations/CreateFolderAction.cs index b62289d1..1b8fb36d 100644 --- a/Moonlight/Features/FileManager/Implementations/CreateFolderAction.cs +++ b/Moonlight/Features/FileManager/Implementations/CreateFolderAction.cs @@ -1,7 +1,7 @@ using MoonCoreUI.Services; using Moonlight.Features.FileManager.Interfaces; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Implementations; @@ -11,7 +11,7 @@ public class CreateFolderAction : IFileManagerCreateAction public string Icon => "bx-folder"; public string Color => "primary"; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, IServiceProvider provider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, IServiceProvider provider) { var alertService = provider.GetRequiredService(); var toastService = provider.GetRequiredService(); diff --git a/Moonlight/Features/FileManager/Implementations/DeleteContextAction.cs b/Moonlight/Features/FileManager/Implementations/DeleteContextAction.cs index 11ec8dad..223509c6 100644 --- a/Moonlight/Features/FileManager/Implementations/DeleteContextAction.cs +++ b/Moonlight/Features/FileManager/Implementations/DeleteContextAction.cs @@ -1,7 +1,7 @@ using MoonCoreUI.Services; using Moonlight.Features.FileManager.Interfaces; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Implementations; @@ -12,7 +12,7 @@ public class DeleteContextAction : IFileManagerContextAction public string Color => "danger"; public Func Filter => _ => true; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry entry, IServiceProvider serviceProvider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry, IServiceProvider serviceProvider) { await access.Delete(entry); diff --git a/Moonlight/Features/FileManager/Implementations/DeleteSelectionAction.cs b/Moonlight/Features/FileManager/Implementations/DeleteSelectionAction.cs index d4574aec..fbc0142f 100644 --- a/Moonlight/Features/FileManager/Implementations/DeleteSelectionAction.cs +++ b/Moonlight/Features/FileManager/Implementations/DeleteSelectionAction.cs @@ -1,7 +1,7 @@ using MoonCoreUI.Services; using Moonlight.Features.FileManager.Interfaces; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Implementations; @@ -10,7 +10,7 @@ public class DeleteSelectionAction : IFileManagerSelectionAction public string Name => "Delete"; public string Color => "danger"; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry[] entries, IServiceProvider provider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry[] entries, IServiceProvider provider) { var alertService = provider.GetRequiredService(); var toastService = provider.GetRequiredService(); diff --git a/Moonlight/Features/FileManager/Implementations/DownloadContextAction.cs b/Moonlight/Features/FileManager/Implementations/DownloadContextAction.cs index 48aa3210..6a56beec 100644 --- a/Moonlight/Features/FileManager/Implementations/DownloadContextAction.cs +++ b/Moonlight/Features/FileManager/Implementations/DownloadContextAction.cs @@ -4,7 +4,7 @@ using MoonCoreUI.Services; using Moonlight.Features.FileManager.Interfaces; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; using Moonlight.Features.FileManager.Services; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Implementations; @@ -15,7 +15,7 @@ public class DownloadContextAction : IFileManagerContextAction public string Color => "primary"; public Func Filter => entry => entry.IsFile; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry entry, IServiceProvider serviceProvider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry, IServiceProvider serviceProvider) { var fileAccessService = serviceProvider.GetRequiredService(); var navigation = serviceProvider.GetRequiredService(); diff --git a/Moonlight/Features/FileManager/Implementations/MoveContextAction.cs b/Moonlight/Features/FileManager/Implementations/MoveContextAction.cs index bd19bce8..b5f3a7ce 100644 --- a/Moonlight/Features/FileManager/Implementations/MoveContextAction.cs +++ b/Moonlight/Features/FileManager/Implementations/MoveContextAction.cs @@ -11,7 +11,7 @@ public class MoveContextAction : IFileManagerContextAction public string Color => "info"; public Func Filter => _ => true; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry entry, IServiceProvider provider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry, IServiceProvider provider) { await fileManager.OpenFolderSelect("Select the location to move the item to", async path => { diff --git a/Moonlight/Features/FileManager/Implementations/MoveSelectionAction.cs b/Moonlight/Features/FileManager/Implementations/MoveSelectionAction.cs index e78fa918..981d9835 100644 --- a/Moonlight/Features/FileManager/Implementations/MoveSelectionAction.cs +++ b/Moonlight/Features/FileManager/Implementations/MoveSelectionAction.cs @@ -9,7 +9,7 @@ public class MoveSelectionAction : IFileManagerSelectionAction public string Name => "Move"; public string Color => "primary"; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry[] entries, IServiceProvider provider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry[] entries, IServiceProvider provider) { await fileManager.OpenFolderSelect("Select the location to move the items to", async path => { diff --git a/Moonlight/Features/FileManager/Implementations/RenameContextAction.cs b/Moonlight/Features/FileManager/Implementations/RenameContextAction.cs index b405c188..996dffd3 100644 --- a/Moonlight/Features/FileManager/Implementations/RenameContextAction.cs +++ b/Moonlight/Features/FileManager/Implementations/RenameContextAction.cs @@ -1,7 +1,7 @@ using MoonCoreUI.Services; using Moonlight.Features.FileManager.Interfaces; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Implementations; @@ -12,7 +12,7 @@ public class RenameContextAction : IFileManagerContextAction public string Color => "info"; public Func Filter => _ => true; - public async Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry entry, IServiceProvider provider) + public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry, IServiceProvider provider) { var alertService = provider.GetRequiredService(); var toastService = provider.GetRequiredService(); diff --git a/Moonlight/Features/FileManager/Interfaces/IFileManagerContextAction.cs b/Moonlight/Features/FileManager/Interfaces/IFileManagerContextAction.cs index e1e8ba11..a12109c4 100644 --- a/Moonlight/Features/FileManager/Interfaces/IFileManagerContextAction.cs +++ b/Moonlight/Features/FileManager/Interfaces/IFileManagerContextAction.cs @@ -1,5 +1,5 @@ using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Interfaces; @@ -10,5 +10,5 @@ public interface IFileManagerContextAction public string Color { get; } public Func Filter { get; } - public Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry entry, IServiceProvider provider); + public Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry, IServiceProvider provider); } \ No newline at end of file diff --git a/Moonlight/Features/FileManager/Interfaces/IFileManagerCreateAction.cs b/Moonlight/Features/FileManager/Interfaces/IFileManagerCreateAction.cs index d856cb10..87c04781 100644 --- a/Moonlight/Features/FileManager/Interfaces/IFileManagerCreateAction.cs +++ b/Moonlight/Features/FileManager/Interfaces/IFileManagerCreateAction.cs @@ -1,5 +1,5 @@ using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Interfaces; @@ -9,5 +9,5 @@ public interface IFileManagerCreateAction public string Icon { get; } public string Color { get; } - public Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, IServiceProvider provider); + public Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, IServiceProvider provider); } \ No newline at end of file diff --git a/Moonlight/Features/FileManager/Interfaces/IFileManagerSelectionAction.cs b/Moonlight/Features/FileManager/Interfaces/IFileManagerSelectionAction.cs index 12c04aa7..9dea9391 100644 --- a/Moonlight/Features/FileManager/Interfaces/IFileManagerSelectionAction.cs +++ b/Moonlight/Features/FileManager/Interfaces/IFileManagerSelectionAction.cs @@ -1,5 +1,5 @@ using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; -using Moonlight.Features.FileManager.UI.NewFileManager; +using Moonlight.Features.FileManager.UI.Components; namespace Moonlight.Features.FileManager.Interfaces; @@ -8,5 +8,5 @@ public interface IFileManagerSelectionAction public string Name { get; } public string Color { get; } - public Task Execute(BaseFileAccess access, UI.NewFileManager.FileManager fileManager, FileEntry[] entries, IServiceProvider provider); + public Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry[] entries, IServiceProvider provider); } \ No newline at end of file diff --git a/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/BaseFileAccess.cs b/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/BaseFileAccess.cs index 9d2e02e7..0eac0d0f 100644 --- a/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/BaseFileAccess.cs +++ b/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/BaseFileAccess.cs @@ -50,7 +50,10 @@ public class BaseFileAccess : IDisposable { var finalPath = CurrentDirectory + entry.Name; - await Actions.Delete(finalPath); + if(entry.IsFile) + await Actions.DeleteFile(finalPath); + else + await Actions.DeleteDirectory(finalPath); } public async Task Move(FileEntry entry, string to) diff --git a/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/IFileActions.cs b/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/IFileActions.cs index abb431f8..5fba42bc 100644 --- a/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/IFileActions.cs +++ b/Moonlight/Features/FileManager/Models/Abstractions/FileAccess/IFileActions.cs @@ -3,13 +3,14 @@ public interface IFileActions : IDisposable { public Task List(string path); - public Task Delete(string path); + public Task DeleteFile(string path); + public Task DeleteDirectory(string path); public Task Move(string from, string to); - public Task CreateDirectory(string name); - public Task CreateFile(string name); - public Task ReadFile(string name); - public Task WriteFile(string name, string content); - public Task ReadFileStream(string name); - public Task WriteFileStream(string name, Stream dataStream); + public Task CreateDirectory(string path); + public Task CreateFile(string path); + public Task ReadFile(string path); + public Task WriteFile(string path, string content); + public Task ReadFileStream(string path); + public Task WriteFileStream(string path, Stream dataStream); public IFileActions Clone(); } \ No newline at end of file diff --git a/Moonlight/Features/FileManager/UI/Components/FileManager.razor b/Moonlight/Features/FileManager/UI/Components/FileManager.razor index 2edf6e86..16e37019 100644 --- a/Moonlight/Features/FileManager/UI/Components/FileManager.razor +++ b/Moonlight/Features/FileManager/UI/Components/FileManager.razor @@ -1,282 +1,363 @@ -@using Moonlight.Core.Configuration @using MoonCore.Helpers @using MoonCore.Services @using MoonCoreUI.Services +@using Moonlight.Core.Configuration +@using Moonlight.Core.Services +@using Moonlight.Features.FileManager.Interfaces @using Moonlight.Features.FileManager.Models.Abstractions.FileAccess +@using Moonlight.Features.FileManager.Services @inject AlertService AlertService -@inject ConfigService ConfigService @inject ToastService ToastService +@inject FileManagerInteropService FileManagerInteropService +@inject SharedFileAccessService FileAccessService +@inject ConfigService ConfigService +@inject PluginService PluginService +@inject IServiceProvider ServiceProvider -
-
-
-
+@implements IDisposable + +
+
+
+
@{ - var elements = Path + var parts = Path .Split("/") .Where(x => !string.IsNullOrEmpty(x)) - .ToList(); + .ToArray(); - int i = 1; - var root = "/"; + var i = 1; } - / - @foreach (var element in elements) - { - var pathToCd = "/" + string.Join('/', elements.Take(i)); + / - @(element) + @foreach (var part in parts) + { + var x = i + 0; + + @(part)
/
i++; }
-
- @if (ShowFileUploader) +
+ @if (View != null && View.Selection.Any()) { - + foreach (var action in SelectionActions) + { + var cssClass = $"btn btn-{action.Color} mx-2"; + + + } } else { - - - Launch - - + + + + +
}
-
- @if (ShowFileUploader) - { - - } - else if (ShowFileEditor) - { - - } - else - { - - } -
- -
-
Select the location to move '@(MoveEntry.Name)'
- +@if (ShowEditor) +{ +
+
-
- +} +else +{ +
+ + + @foreach (var action in ContextActions) + { + if (!action.Filter.Invoke(context)) + continue; + + + + @action.Name + + } + +
-
-
- - + + +
+
@FolderSelectTitle
+
-
- +
+ +
+
+ + +
+ +} @code { [Parameter] public BaseFileAccess FileAccess { get; set; } - // Navigation + public FileView View { get; private set; } private string Path = "/"; - private FileView? FileView; - // Uploading - private bool ShowFileUploader = false; - private FileUploader? FileUploader; + private IFileManagerContextAction[] ContextActions; + private IFileManagerSelectionAction[] SelectionActions; + private IFileManagerCreateAction[] CreateActions; - // Editing - private bool ShowFileEditor = false; - private FileEntry EditorOpenFile; + // Editor + private FileEditor Editor; + private FileEntry FileToEdit; + private bool ShowEditor = false; - // Move - private FileEntry MoveEntry; - private SmartModal MoveModal; - private BaseFileAccess MoveAccess; + // Folder select dialog + private bool FolderSelectIsOpen = false; + private SmartModal FolderSelectModal; + private BaseFileAccess FolderSelectFileAccess; + private string FolderSelectTitle; + private Func FolderSelectResult; + private FileView FolderSelectView; + private Func FolderSelectFilter => entry => entry.IsDirectory; - private async Task OnPathChanged(string path) + private Timer? UploadTokenTimer; + + protected override async Task OnInitializedAsync() { - Path = path; - await InvokeAsync(StateHasChanged); + // Load plugin ui and options + ContextActions = await PluginService.GetImplementations(); + SelectionActions = await PluginService.GetImplementations(); + CreateActions = await PluginService.GetImplementations(); } - private async Task NavigateToPath(string path) + protected override async Task OnAfterRenderAsync(bool firstRender) { - if (ShowFileUploader) - await ToggleFileUploader(false); - - if (FileView == null) + if (!firstRender) return; - await FileView.NavigateToPath(path); - } - #region Uploader - - private async Task ToggleFileUploader() => await ToggleFileUploader(!ShowFileUploader); - - private async Task ToggleFileUploader(bool b) - { - ShowFileUploader = b; - await InvokeAsync(StateHasChanged); - } - - #endregion - - #region mkdir / touch - - private async Task CreateFile() - { - if (FileView == null) - return; - - var name = await AlertService.Text("Enter the filename", ""); - - if(string.IsNullOrEmpty(name)) - return; - - if (name.Contains("..")) + // Setup upload url update timer + UploadTokenTimer = new(async _ => { - Logger.Warn($"Someone tried to use path transversal to create a file: '{name}'", "security"); - return; + await FileAccessService.Register(FileAccess); + var token = await FileAccessService.GenerateToken(FileAccess); + var url = $"/api/upload?token={token}"; + + await FileManagerInteropService.UpdateUrl("fileManager", url); + }, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5)); + + // Create initial url + await FileAccessService.Register(FileAccess); + var token = await FileAccessService.GenerateToken(FileAccess); + var url = $"/api/upload?token={token}"; + + // Refresh the file view when a upload is completed + FileManagerInteropService.OnUploadStateChanged += async () => { await View.Refresh(); }; + + // Initialize drop area & file select + await FileManagerInteropService.UpdateUrl("fileManager", url); + await FileManagerInteropService.InitDropzone("fileManagerUpload", "fileManager"); + await FileManagerInteropService.InitFileSelect("fileManagerSelect", "fileManager"); + } + + private async Task OnEntryClicked(FileEntry entry) + { + if (entry.IsFile) + { + var fileSizeInKilobytes = ByteSizeValue.FromBytes(entry.Size).KiloBytes; + + if (fileSizeInKilobytes > ConfigService.Get().Customisation.FileManager.MaxFileOpenSize) + { + await ToastService.Danger("Unable to open file as it exceeds the max file size limit"); + return; + } + + await OpenEditor(entry); } - - await FileAccess.CreateFile(name); - - await FileView.Refresh(); - - // Open editor to start editing - await OpenEditor(new FileEntry() + else { - Size = 0, - Name = name, - IsFile = true, - IsDirectory = false, - LastModifiedAt = DateTime.UtcNow - }); - } + await FileAccess.ChangeDirectory(entry.Name); + await View.Refresh(); - private async Task CreateDirectory() - { - if (FileView == null) - return; - - var name = await AlertService.Text("Enter the folder name", ""); - - if(string.IsNullOrEmpty(name)) - return; - - if (name.Contains("..")) - { - Logger.Warn($"Someone tried to use path transversal to create a file: '{name}'", "security"); - return; + await Refresh(); } - - await FileAccess.CreateDirectory(name); - - await FileView.Refresh(); } - #endregion - - #region Editor - - private async Task OnFileClicked(FileEntry fileEntry) => await OpenEditor(fileEntry); - - private async Task OpenEditor(FileEntry fileEntry) + private async Task InvokeContextAction(IFileManagerContextAction contextAction, FileEntry entry) { - var fileSizeInKilobytes = ByteSizeValue.FromBytes(fileEntry.Size).KiloBytes; + await View.HideContextMenu(); - if (fileSizeInKilobytes > ConfigService.Get().Customisation.FileManager.MaxFileOpenSize) - { - await ToastService.Danger("Unable to open file as it exceeds the max file size limit"); + await contextAction.Execute(FileAccess, this, entry, ServiceProvider); + } + + private async Task InvokeSelectionAction(IFileManagerSelectionAction action) + { + await action.Execute(FileAccess, this, View.Selection, ServiceProvider); + + // Refresh resets the selection + await View.Refresh(); + } + + private async Task InvokeCreateAction(IFileManagerCreateAction action) + { + await action.Execute(FileAccess, this, ServiceProvider); + } + + private async Task OnSelectionChanged(FileEntry[] _) => await InvokeAsync(StateHasChanged); + + #region Navigation & Refreshing + + private async Task OnNavigateUpClicked() + { + await FileAccess.ChangeDirectory(".."); + await View.Refresh(); + + await Refresh(); + } + + private async Task NavigateBackToLevel(int level) + { + if (ShowEditor) // Ignore navigation events while the editor is open return; - } - EditorOpenFile = fileEntry; + var path = await FileAccess.GetCurrentDirectory(); - // Prepare editor - ShowFileEditor = true; - await InvokeAsync(StateHasChanged); + var parts = path.Split("/"); + var pathToNavigate = string.Join("/", parts.Take(level + 1)) + "/"; + + await FileAccess.SetDirectory(pathToNavigate); + await View.Refresh(); + await Refresh(); } - private async Task OnEditorClosed() + private async Task ManualRefresh() { - ShowFileEditor = false; + if (ShowEditor) // Ignore refresh while editor is open + return; + + await View.Refresh(); + await Refresh(); + + await ToastService.Info("Refreshed"); + } + + private async Task Refresh() + { + Path = await FileAccess.GetCurrentDirectory(); + await InvokeAsync(StateHasChanged); } #endregion - #region Move + #region File Editor - private async Task StartMove(FileEntry fileEntry) + public async Task OpenEditor(FileEntry entry) { - MoveEntry = fileEntry; - MoveAccess = FileAccess.Clone(); + FileToEdit = entry; + ShowEditor = true; - await MoveAccess.SetDirectory("/"); - await MoveModal.Show(); + await InvokeAsync(StateHasChanged); } - private async Task FinishMove() + public async Task CloseEditor() { - var pathToMove = await MoveAccess.GetCurrentDirectory(); - MoveAccess.Dispose(); - - // Perform move and process ui updates - await FileAccess.Move(MoveEntry, pathToMove + MoveEntry.Name); - - await MoveModal.Hide(); - - if (FileView == null) - return; - - await FileView.Refresh(); + ShowEditor = false; + await InvokeAsync(StateHasChanged); } #endregion + #region Selects + + public async Task OpenFolderSelect(string title, Func onResult) + { + if (FolderSelectIsOpen) + await HideFolderSelect(); + + FolderSelectResult = onResult; + FolderSelectTitle = title; + + FolderSelectFileAccess = FileAccess.Clone(); + await FolderSelectFileAccess.SetDirectory("/"); + + await FolderSelectModal.Show(); + } + + public async Task HideFolderSelect() + { + await FolderSelectModal.Hide(); + FolderSelectIsOpen = false; + FolderSelectFileAccess.Dispose(); + } + + private async Task SubmitFolderSelect() + { + var path = await FolderSelectFileAccess.GetCurrentDirectory(); + + await HideFolderSelect(); + + await FolderSelectResult.Invoke(path); + } + + private async Task NavigateUpFolderSelect() + { + await FolderSelectFileAccess.ChangeDirectory(".."); + await FolderSelectView.Refresh(); + } + + private async Task EntryClickFolderSelect(FileEntry entry) + { + await FolderSelectFileAccess.ChangeDirectory(entry.Name); + await FolderSelectView.Refresh(); + } + + #endregion + + public async void Dispose() + { + if (UploadTokenTimer != null) + await UploadTokenTimer.DisposeAsync(); + + await FileAccessService.Unregister(FileAccess); + } } \ No newline at end of file diff --git a/Moonlight/Features/FileManager/UI/Components/FileUploader.razor b/Moonlight/Features/FileManager/UI/Components/FileUploader.razor deleted file mode 100644 index e9a9f517..00000000 --- a/Moonlight/Features/FileManager/UI/Components/FileUploader.razor +++ /dev/null @@ -1,94 +0,0 @@ -@using Moonlight.Core.Services -@using Moonlight.Features.FileManager.Models.Abstractions.FileAccess -@using Moonlight.Features.FileManager.Services - -@inject DropzoneService DropzoneService -@inject SharedFileAccessService SharedFileAccessService - -@implements IDisposable - -
-
-
-
-
-
- -
- Drag a file or folder or click to upload files -
- -
-
-
-
- -
-
-
-
- -@code -{ - [Parameter] public BaseFileAccess FileAccess { get; set; } - - private CancellationTokenSource Cancellation = new(); - private string DropzoneId; - - protected override void OnInitialized() - { - DropzoneId = $"dropzone{GetHashCode()}"; - } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - //await SharedFileAccessService.Register(FileAccess); - - //var token = await SharedFileAccessService.GenerateToken(FileAccess); - //var url = $"/api/upload?token={token}"; - - //await DropzoneService.Create(DropzoneId, url); - - Task.Run(async () => // Update the dropzone url every 5 minutes so the token does not expire - { - while (!Cancellation.IsCancellationRequested) - { - await Task.Delay(TimeSpan.FromMinutes(5)); - - //var newToken = await SharedFileAccessService.GenerateToken(FileAccess); - //var newUrl = $"/api/upload?token={newToken}"; - //await DropzoneService.UpdateUrl(DropzoneId, newUrl); - } - }); - } - } - - public async void Dispose() - { - Cancellation.Cancel(); - //await SharedFileAccessService.Unregister(FileAccess); - } -} \ No newline at end of file diff --git a/Moonlight/Features/FileManager/UI/Components/FileView.razor b/Moonlight/Features/FileManager/UI/Components/FileView.razor index e1ef77a6..088ab16a 100644 --- a/Moonlight/Features/FileManager/UI/Components/FileView.razor +++ b/Moonlight/Features/FileManager/UI/Components/FileView.razor @@ -1,247 +1,287 @@ -@using MoonCoreUI.Services @using MoonCore.Helpers -@using Moonlight.Core.Services @using Moonlight.Features.FileManager.Models.Abstractions.FileAccess -@using Moonlight.Features.FileManager.Services +@using BlazorContextMenu -@inject ToastService ToastService -@inject AlertService AlertService -@inject SharedFileAccessService SharedFileAccessService -@inject NavigationManager Navigation +@inject IJSRuntime JsRuntime -@implements IDisposable - - - +
+ @if (IsLoading) + { +
+ Loading... +
+ } +
- - @if (ShowHeader) - { - - @if (ShowSelect) - { - - } - @if (ShowIcons) - { - - } - + @if (ShowSelect) + { + - @if (ShowSize) - { - - } - @if (ShowLastModified) - { - - } - @if (SelectedEntries.Count == 0) - { - - } - else - { - - } - - } + } + + + @if (ShowSize) + { + + } + @if (ShowDate) + { + + } + @if (EnableContextMenu) + { + + } + @if (AdditionTemplate != null) + { + + } + - @if (ShowGoUp && Path != "/" && !DisableNavigation) + @if (Path != "/" && ShowNavigateUp) { - + @if (ShowSelect) { - + } - @if (ShowIcons) - { - - } - + @if (ShowSize) { - + } - @if (ShowLastModified) + @if (ShowDate) { - + } - @if (ShowActions) + @if (EnableContextMenu) { - + + } + @if (AdditionTemplate != null) + { + } } @foreach (var entry in Entries) { - - @if (ShowSelect) - { - - } - @if (ShowIcons) - { - + } + - } - + @if (ShowSize) + { + } - - @if (ShowSize) - { - - } - @if (ShowLastModified) - { - - } - @if (ShowActions) - { - + } + - } - + @if (AdditionTemplate != null) + { + @AdditionTemplate.Invoke(entry) + } + + } + else + { + + @if (ShowSelect) + { + + } + + + @if (ShowSize) + { + + } + @if (ShowDate) + { + + } + @if (AdditionTemplate != null) + { + @AdditionTemplate.Invoke(entry) + } + + } }
-
- -
- 		- Name +
+
+ @if (IsAllSelected) + { + + } + else + { + + } +
- Size - - Last modified at - - @SelectedEntries.Count element(s) selected -
- - - -
-
NameSizeLast modified
- - - @{ - var upPath = ".."; - } - - - Go up + + + + + Back to parent folder - - - - - - -
-
- @if (SelectedEntries.Contains(entry)) - { - - } - else - { - - } -
- 		+ if (EnableContextMenu) + { + + @if (ShowSelect) + { + +
+ @if (SelectionCache.ContainsKey(entry) && SelectionCache[entry]) + { + + } + else + { + + } +
+ 		@if (entry.IsFile) { - + } else { - + } - @if (DisableNavigation) - { - @(entry.Name) - } - else - { - - @(entry.Name) + + + @entry.Name + + @if (entry.IsFile) + { + @Formatter.FormatSize(entry.Size) + } + - @if (entry.IsFile) - { - @(Formatter.FormatSize(entry.Size)) - } - else - { - - - } - - @(Formatter.FormatDate(entry.LastModifiedAt)) - -
- - - - -
- - + @if (ShowDate) + { +
+ @Formatter.FormatDate(entry.LastModifiedAt) + +
+ +
+ @if (ContextMenuTemplate != null) + { + @ContextMenuTemplate.Invoke(entry) + }
+
+ @if (SelectionCache.ContainsKey(entry) && SelectionCache[entry]) + { + + } + else + { + + } +
+ 		+ @if (entry.IsFile) + { + + } + else + { + + } + + + @entry.Name + + + @if (entry.IsFile) + { + @Formatter.FormatSize(entry.Size) + } + + @Formatter.FormatDate(entry.LastModifiedAt) +
- +
+@if (EnableContextMenu && ContextMenuTemplate != null) +{ + + @if (ShowContextMenu) + { +
+ @ContextMenuTemplate.Invoke(ContextMenuItem) +
+ } + +} @code { - [Parameter] public BaseFileAccess FileAccess { get; set; } + [Parameter] public RenderFragment? AdditionTemplate { get; set; } - [Parameter] public Func? Filter { get; set; } [Parameter] public bool ShowSize { get; set; } = true; - [Parameter] public bool ShowLastModified { get; set; } = true; - [Parameter] public bool ShowIcons { get; set; } = true; - [Parameter] public bool ShowActions { get; set; } = true; + [Parameter] public bool ShowDate { get; set; } = true; [Parameter] public bool ShowSelect { get; set; } = true; - [Parameter] public bool ShowGoUp { get; set; } = true; - [Parameter] public bool ShowHeader { get; set; } = true; - [Parameter] public bool DisableNavigation { get; set; } = false; - [Parameter] public Func? OnFileClicked { get; set; } - [Parameter] public Func? OnSelectionChanged { get; set; } - [Parameter] public Func? OnPathChanged { get; set; } - [Parameter] public Func? OnMoveRequested { get; set; } + [Parameter] public bool ShowNavigateUp { get; set; } = true; - public readonly List SelectedEntries = new(); + [Parameter] public RenderFragment? ContextMenuTemplate { get; set; } + [Parameter] public bool EnableContextMenu { get; set; } = false; + private bool ShowContextMenu = false; + private FileEntry ContextMenuItem; + private string ContextMenuId = "fileManagerContextMenu"; + private ContextMenu? CurrentContextMenu; - private LazyLoader LazyLoader; - private FileEntry[] Entries; + [Parameter] public BaseFileAccess FileAccess { get; set; } + [Parameter] public Func? Filter { get; set; } + + [Parameter] public Func? OnEntryClicked { get; set; } + [Parameter] public Func? OnSelectionChanged { get; set; } + + [Parameter] public Func? OnNavigateUpClicked { get; set; } + + private bool IsLoading = false; + private string LoadingText = ""; + + private FileEntry[] Entries = Array.Empty(); private string Path = "/"; - private async Task Load(LazyLoader lazyLoader) - { - await lazyLoader.SetText("Loading files and folders"); + private Dictionary SelectionCache = new(); + public FileEntry[] Selection => SelectionCache.Where(x => x.Value).Select(x => x.Key).ToArray(); + private bool IsAllSelected => Entries.Length != 0 && SelectionCache.Count(x => x.Value) == Entries.Length; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + await Refresh(); + } + + public async Task Refresh() + { + IsLoading = true; + LoadingText = "Loading"; + await InvokeAsync(StateHasChanged); + + // Load current directory + Path = await FileAccess.GetCurrentDirectory(); + + // Load entries + LoadingText = "Loading files and folders"; + await InvokeAsync(StateHasChanged); - // Load all entries Entries = await FileAccess.List(); - await lazyLoader.SetText("Sorting files and folders"); + // Sort entries + LoadingText = "Sorting files and folders"; + await InvokeAsync(StateHasChanged); - // Perform sorting and filtering if (Filter != null) { Entries = Entries @@ -255,180 +295,93 @@ .SelectMany(x => x.OrderBy(y => y.Name)) .ToArray(); - SelectedEntries.Clear(); + // Build selection cache + SelectionCache.Clear(); - Path = await FileAccess.GetCurrentDirectory(); + foreach (var entry in Entries) + SelectionCache.Add(entry, false); - if (OnPathChanged != null) - await OnPathChanged.Invoke(Path); + if (OnSelectionChanged != null) + await OnSelectionChanged.Invoke(Array.Empty()); + + IsLoading = false; + await InvokeAsync(StateHasChanged); } - private async Task HandleClick(FileEntry fileEntry) + private async Task HandleEntryClick(FileEntry entry) { - if (fileEntry.IsDirectory && !DisableNavigation) - { - await Navigate(fileEntry.Name); - } - else - { - if (OnFileClicked != null) - await OnFileClicked.Invoke(fileEntry); - } - } - - #region Actions - - private async Task Delete(params FileEntry[] entries) - { - if (entries.Length == 0) + if (OnEntryClicked == null) return; - var fileNameDesc = entries.Length == 1 ? entries.First().Name : $"{entries.Length} files"; - var confirm = await AlertService.YesNo($"Do you really want to delete '{fileNameDesc}'?", "Yes", "No"); - - if(!confirm) - return; - - var toastId = "fileDelete" + GetHashCode(); - await ToastService.CreateProgress(toastId, $"[0/{entries.Length}] Deleting items"); - - int i = 0; - foreach (var entry in entries) - { - await ToastService.ModifyProgress(toastId, $"[{i + 1}/{entries.Length}] Deleting '{entry.Name}'"); - - await FileAccess.Delete(entry); - - i++; - } - - await ToastService.RemoveProgress(toastId); - await ToastService.Success($"Successfully deleted {i} item(s)"); - - await LazyLoader.Reload(); + await OnEntryClicked.Invoke(entry); } - private async Task Rename(FileEntry fileEntry) + private async Task NavigateUp() { - var name = await AlertService.Text($"Rename '{fileEntry.Name}'", "", fileEntry.Name); - - if (string.IsNullOrEmpty(name)) + if (OnNavigateUpClicked == null) return; - await FileAccess.Move(fileEntry, await FileAccess.GetCurrentDirectory() + name); - - await LazyLoader.Reload(); + await OnNavigateUpClicked.Invoke(); } - private async Task RequestMove(FileEntry fileEntry) - { - if (OnMoveRequested == null) - return; - - await OnMoveRequested.Invoke(fileEntry); - } - - private async Task Download(FileEntry fileEntry) - { - try - { - //await SharedFileAccessService.Register(FileAccess); - //var token = await SharedFileAccessService.GenerateToken(FileAccess); - //var url = $"/api/download?token={token}&name={fileEntry.Name}"; - - await ToastService.Info("Starting download..."); - //Navigation.NavigateTo(url, true); - } - catch (Exception e) - { - Logger.Warn("Unable to start download"); - Logger.Warn(e); - - await ToastService.Danger("Failed to start download"); - } - } - - #endregion - #region Selection - private async Task HandleSelected(FileEntry fileEntry, ChangeEventArgs args) + private async Task ChangeSelection(FileEntry entry, bool selectionState) { - if (args.Value == null) // This should never be called. Still i want to handle it - return; - - if (args.Value.ToString() == "True") - { - if (!SelectedEntries.Contains(fileEntry)) - SelectedEntries.Add(fileEntry); - } - else - { - if (SelectedEntries.Contains(fileEntry)) - SelectedEntries.Remove(fileEntry); - } + SelectionCache[entry] = selectionState; + await InvokeAsync(StateHasChanged); if (OnSelectionChanged != null) - await OnSelectionChanged.Invoke(); + { + await OnSelectionChanged.Invoke(SelectionCache + .Where(x => x.Value) + .Select(x => x.Key) + .ToArray() + ); + } + } + private async Task ChangeAllSelection(bool toggle) + { + foreach (var key in SelectionCache.Keys) + SelectionCache[key] = toggle; + + await InvokeAsync(StateHasChanged); + + if (OnSelectionChanged != null) + { + await OnSelectionChanged.Invoke(SelectionCache + .Where(x => x.Value) + .Select(x => x.Key) + .ToArray() + ); + } + } + + #endregion + + #region Context Menu + + private async Task OnContextMenuAppear(MenuAppearingEventArgs data) + { + ContextMenuItem = (data.Data as FileEntry)!; + + ShowContextMenu = true; await InvokeAsync(StateHasChanged); } - private async Task ToggleAll(ChangeEventArgs args) + private async Task OnContextMenuHide() { - if (args.Value == null) - return; - - if (args.Value.ToString() == "True") - { - foreach (var entry in Entries) - { - if (!SelectedEntries.Contains(entry)) - SelectedEntries.Add(entry); - } - } - else - { - SelectedEntries.Clear(); - } + ShowContextMenu = false; + await InvokeAsync(StateHasChanged); + } + public async Task HideContextMenu() + { + ShowContextMenu = false; await InvokeAsync(StateHasChanged); } #endregion - #region Navigation - - public async Task Navigate(string name) - { - await LazyLoader.Reload(async loader => - { - await loader.SetText("Switching directory on target"); - await FileAccess.ChangeDirectory(name); - - if (OnPathChanged != null) - await OnPathChanged.Invoke(await FileAccess.GetCurrentDirectory()); - }); - } - - public async Task NavigateToPath(string path) - { - await LazyLoader.Reload(async loader => - { - await loader.SetText("Switching directory on target"); - await FileAccess.SetDirectory(path); - - if (OnPathChanged != null) - await OnPathChanged.Invoke(await FileAccess.GetCurrentDirectory()); - }); - } - - #endregion - - public async Task Refresh() => await LazyLoader.Reload(); - - public async void Dispose() - { - //await SharedFileAccessService.Unregister(FileAccess); - } } \ No newline at end of file diff --git a/Moonlight/Features/FileManager/UI/NewFileManager/Editor.razor b/Moonlight/Features/FileManager/UI/NewFileManager/Editor.razor deleted file mode 100644 index 9b1b6909..00000000 --- a/Moonlight/Features/FileManager/UI/NewFileManager/Editor.razor +++ /dev/null @@ -1,60 +0,0 @@ -@using Moonlight.Features.FileManager.Services -@using MoonCore.Helpers - -@inject EditorService EditorService - -
- -@code -{ - [Parameter] public string InitialContent { get; set; } = ""; - [Parameter] public string Theme { get; set; } = "one_dark"; - [Parameter] public string Mode { get; set; } = "text"; - [Parameter] public int Lines { get; set; } = 30; - [Parameter] public int FontSize { get; set; } = 15; - [Parameter] public bool EnableAutoInit { get; set; } = false; - [Parameter] public Func? OnChanged { get; set; } - - private string Identifier; - - protected override void OnInitialized() - { - Identifier = "editor" + GetHashCode(); - } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - if(EnableAutoInit) - await Initialize(); - } - } - - public async Task Initialize() - { - await EditorService.Create( - Identifier, - Theme, - Mode, - InitialContent, - Lines, - FontSize - ); - } - - public async Task GetContent() => await EditorService.GetValue(); - - public async Task SetContent(string content) => await EditorService.SetValue(content); - - public async Task SetMode(string mode) => await EditorService.SetMode(mode); - - private async Task FocusOut() - { - if (OnChanged != null) - { - var content = await GetContent(); - await OnChanged.Invoke(content); - } - } -} diff --git a/Moonlight/Features/FileManager/UI/NewFileManager/FileEditor.razor b/Moonlight/Features/FileManager/UI/NewFileManager/FileEditor.razor deleted file mode 100644 index c63ed457..00000000 --- a/Moonlight/Features/FileManager/UI/NewFileManager/FileEditor.razor +++ /dev/null @@ -1,112 +0,0 @@ -@using MoonCoreUI.Services -@using Moonlight.Core.Services -@using MoonCore.Helpers -@using Moonlight.Core.Helpers -@using Moonlight.Features.FileManager.Helpers -@using Moonlight.Features.FileManager.Models.Abstractions.FileAccess - -@inject ToastService ToastService -@inject HotKeyService HotKeyService - -@implements IDisposable - -
-
-
-
- @(File.Name) (@(Formatter.FormatSize(File.Size))) -
-
- - Back - - - Save - -
-
-
-
- - - -@code -{ - [Parameter] public FileEntry File { get; set; } - - [Parameter] public BaseFileAccess FileAccess { get; set; } - - [Parameter] public bool CloseOnSave { get; set; } = false; - - [Parameter] public Func? OnClosed { get; set; } - - private Editor Editor; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - // Initialize the editor - await Editor.Initialize(); - - // Load file and check the file type - var fileData = await FileAccess.ReadFile(File.Name); - var mode = EditorModeDetector.GetModeFromFile(File.Name); - - // Finalize editor - await Editor.SetMode(mode); - await Editor.SetContent(fileData); - - HotKeyService.HotKeyPressed += OnHotKeyPressed; - } - } - - private async Task OnClose() - { - if (OnClosed != null) - await OnClosed.Invoke(); - } - - private async Task OnSave() - { - try - { - var content = await Editor.GetContent(); - await FileAccess.WriteFile(File.Name, content); - } - catch (Exception e) - { - Logger.Warn($"An unhandled error has occured while saving a file using access type {FileAccess.GetType().FullName}"); - Logger.Warn(e); - - await ToastService.Danger("An unknown error has occured while saving the file. Please try again later"); - return; - } - - await ToastService.Success("Successfully saved file"); - - if (CloseOnSave) - { - if (OnClosed != null) - await OnClosed.Invoke(); - } - } - - private async Task OnHotKeyPressed(string hotKey) - { - switch (hotKey) - { - case "save": - await OnSave(); - break; - case "close": - await OnClose(); - break; - } - } - - public void Dispose() - { - HotKeyService.HotKeyPressed -= OnHotKeyPressed; - } -} \ No newline at end of file diff --git a/Moonlight/Features/FileManager/UI/NewFileManager/FileManager.razor b/Moonlight/Features/FileManager/UI/NewFileManager/FileManager.razor deleted file mode 100644 index 580996ee..00000000 --- a/Moonlight/Features/FileManager/UI/NewFileManager/FileManager.razor +++ /dev/null @@ -1,364 +0,0 @@ -@using MoonCore.Helpers -@using MoonCore.Services -@using MoonCoreUI.Services -@using Moonlight.Core.Configuration -@using Moonlight.Core.Services -@using Moonlight.Features.FileManager.Interfaces -@using Moonlight.Features.FileManager.Models.Abstractions.FileAccess -@using Moonlight.Features.FileManager.Services - -@inject AlertService AlertService -@inject ToastService ToastService -@inject FileManagerInteropService FileManagerInteropService -@inject SharedFileAccessService FileAccessService -@inject ConfigService ConfigService -@inject NavigationManager Navigation -@inject PluginService PluginService -@inject IServiceProvider ServiceProvider - -@implements IDisposable - -
-
-
-
- @{ - var parts = Path - .Split("/") - .Where(x => !string.IsNullOrEmpty(x)) - .ToArray(); - - var i = 1; - } - - / - - @foreach (var part in parts) - { - var x = i + 0; - - @(part) -
/
- - i++; - } -
-
-
- @if (View != null && View.Selection.Any()) - { - foreach (var action in SelectionActions) - { - var cssClass = $"btn btn-{action.Color} mx-2"; - - - } - } - else - { - - - - - -
- - -
- } -
-
-
- -@if (ShowEditor) -{ -
- -
-} -else -{ -
- - - @foreach (var action in ContextActions) - { - if (!action.Filter.Invoke(context)) - continue; - - - - @action.Name - - } - - -
- - -
-
@FolderSelectTitle
- -
-
- -
-
- - -
- -} - -@code -{ - [Parameter] public BaseFileAccess FileAccess { get; set; } - - public FileView View { get; private set; } - private string Path = "/"; - - private IFileManagerContextAction[] ContextActions; - private IFileManagerSelectionAction[] SelectionActions; - private IFileManagerCreateAction[] CreateActions; - - // Editor - private FileEditor Editor; - private FileEntry FileToEdit; - private bool ShowEditor = false; - - // Folder select dialog - private bool FolderSelectIsOpen = false; - private SmartModal FolderSelectModal; - private BaseFileAccess FolderSelectFileAccess; - private string FolderSelectTitle; - private Func FolderSelectResult; - private FileView FolderSelectView; - private Func FolderSelectFilter => entry => entry.IsDirectory; - - private Timer? UploadTokenTimer; - - protected override async Task OnInitializedAsync() - { - // Load plugin ui and options - ContextActions = await PluginService.GetImplementations(); - SelectionActions = await PluginService.GetImplementations(); - CreateActions = await PluginService.GetImplementations(); - } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (!firstRender) - return; - - - // Setup upload url update timer - UploadTokenTimer = new(async _ => - { - await FileAccessService.Register(FileAccess); - var token = await FileAccessService.GenerateToken(FileAccess); - var url = $"/api/upload?token={token}"; - - await FileManagerInteropService.UpdateUrl("fileManager", url); - }, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5)); - - // Create initial url - await FileAccessService.Register(FileAccess); - var token = await FileAccessService.GenerateToken(FileAccess); - var url = $"/api/upload?token={token}"; - - // Refresh the file view when a upload is completed - FileManagerInteropService.OnUploadStateChanged += async () => { await View.Refresh(); }; - - // Initialize drop area & file select - await FileManagerInteropService.UpdateUrl("fileManager", url); - await FileManagerInteropService.InitDropzone("fileManagerUpload", "fileManager"); - await FileManagerInteropService.InitFileSelect("fileManagerSelect", "fileManager"); - } - - private async Task OnEntryClicked(FileEntry entry) - { - if (entry.IsFile) - { - var fileSizeInKilobytes = ByteSizeValue.FromBytes(entry.Size).KiloBytes; - - if (fileSizeInKilobytes > ConfigService.Get().Customisation.FileManager.MaxFileOpenSize) - { - await ToastService.Danger("Unable to open file as it exceeds the max file size limit"); - return; - } - - await OpenEditor(entry); - } - else - { - await FileAccess.ChangeDirectory(entry.Name); - await View.Refresh(); - - await Refresh(); - } - } - - private async Task InvokeContextAction(IFileManagerContextAction contextAction, FileEntry entry) - { - await View.HideContextMenu(); - - await contextAction.Execute(FileAccess, this, entry, ServiceProvider); - } - - private async Task InvokeSelectionAction(IFileManagerSelectionAction action) - { - await action.Execute(FileAccess, this, View.Selection, ServiceProvider); - - // Refresh resets the selection - await View.Refresh(); - } - - private async Task InvokeCreateAction(IFileManagerCreateAction action) - { - await action.Execute(FileAccess, this, ServiceProvider); - } - - private async Task OnSelectionChanged(FileEntry[] _) => await InvokeAsync(StateHasChanged); - - #region Navigation & Refreshing - - private async Task OnNavigateUpClicked() - { - await FileAccess.ChangeDirectory(".."); - await View.Refresh(); - - await Refresh(); - } - - private async Task NavigateBackToLevel(int level) - { - if (ShowEditor) // Ignore navigation events while the editor is open - return; - - var path = await FileAccess.GetCurrentDirectory(); - - var parts = path.Split("/"); - var pathToNavigate = string.Join("/", parts.Take(level + 1)) + "/"; - - await FileAccess.SetDirectory(pathToNavigate); - await View.Refresh(); - await Refresh(); - } - - private async Task ManualRefresh() - { - if (ShowEditor) // Ignore refresh while editor is open - return; - - await View.Refresh(); - await Refresh(); - - await ToastService.Info("Refreshed"); - } - - private async Task Refresh() - { - Path = await FileAccess.GetCurrentDirectory(); - - await InvokeAsync(StateHasChanged); - } - - #endregion - - #region File Editor - - public async Task OpenEditor(FileEntry entry) - { - FileToEdit = entry; - ShowEditor = true; - - await InvokeAsync(StateHasChanged); - } - - public async Task CloseEditor() - { - ShowEditor = false; - await InvokeAsync(StateHasChanged); - } - - #endregion - - #region Selects - - public async Task OpenFolderSelect(string title, Func onResult) - { - if (FolderSelectIsOpen) - await HideFolderSelect(); - - FolderSelectResult = onResult; - FolderSelectTitle = title; - - FolderSelectFileAccess = FileAccess.Clone(); - await FolderSelectFileAccess.SetDirectory("/"); - - await FolderSelectModal.Show(); - } - - public async Task HideFolderSelect() - { - await FolderSelectModal.Hide(); - FolderSelectIsOpen = false; - FolderSelectFileAccess.Dispose(); - } - - private async Task SubmitFolderSelect() - { - var path = await FolderSelectFileAccess.GetCurrentDirectory(); - - await HideFolderSelect(); - - await FolderSelectResult.Invoke(path); - } - - private async Task NavigateUpFolderSelect() - { - await FolderSelectFileAccess.ChangeDirectory(".."); - await FolderSelectView.Refresh(); - } - - private async Task EntryClickFolderSelect(FileEntry entry) - { - await FolderSelectFileAccess.ChangeDirectory(entry.Name); - await FolderSelectView.Refresh(); - } - - #endregion - - public async void Dispose() - { - if (UploadTokenTimer != null) - await UploadTokenTimer.DisposeAsync(); - - await FileAccessService.Unregister(FileAccess); - } -} \ No newline at end of file diff --git a/Moonlight/Features/FileManager/UI/NewFileManager/FileView.razor b/Moonlight/Features/FileManager/UI/NewFileManager/FileView.razor deleted file mode 100644 index 088ab16a..00000000 --- a/Moonlight/Features/FileManager/UI/NewFileManager/FileView.razor +++ /dev/null @@ -1,387 +0,0 @@ -@using MoonCore.Helpers -@using Moonlight.Features.FileManager.Models.Abstractions.FileAccess -@using BlazorContextMenu - -@inject IJSRuntime JsRuntime - -
- @if (IsLoading) - { -
- Loading... -
- } - - - - @if (ShowSelect) - { - - } - - - @if (ShowSize) - { - - } - @if (ShowDate) - { - - } - @if (EnableContextMenu) - { - - } - @if (AdditionTemplate != null) - { - - } - - - @if (Path != "/" && ShowNavigateUp) - { - - @if (ShowSelect) - { - - } - - - @if (ShowSize) - { - - } - @if (ShowDate) - { - - } - @if (EnableContextMenu) - { - - } - @if (AdditionTemplate != null) - { - - } - - } - - @foreach (var entry in Entries) - { - if (EnableContextMenu) - { - - @if (ShowSelect) - { - - } - - - @if (ShowSize) - { - - } - @if (ShowDate) - { - - } - - @if (AdditionTemplate != null) - { - @AdditionTemplate.Invoke(entry) - } - - } - else - { - - @if (ShowSelect) - { - - } - - - @if (ShowSize) - { - - } - @if (ShowDate) - { - - } - @if (AdditionTemplate != null) - { - @AdditionTemplate.Invoke(entry) - } - - } - } - -
-
- @if (IsAllSelected) - { - - } - else - { - - } -
- 		NameSizeLast modified
- - - - Back to parent folder - -
-
- @if (SelectionCache.ContainsKey(entry) && SelectionCache[entry]) - { - - } - else - { - - } -
- 		- @if (entry.IsFile) - { - - } - else - { - - } - - - @entry.Name - - - @if (entry.IsFile) - { - @Formatter.FormatSize(entry.Size) - } - - @Formatter.FormatDate(entry.LastModifiedAt) - -
- -
- @if (ContextMenuTemplate != null) - { - @ContextMenuTemplate.Invoke(entry) - } -
-
-
-
- @if (SelectionCache.ContainsKey(entry) && SelectionCache[entry]) - { - - } - else - { - - } -
- 		- @if (entry.IsFile) - { - - } - else - { - - } - - - @entry.Name - - - @if (entry.IsFile) - { - @Formatter.FormatSize(entry.Size) - } - - @Formatter.FormatDate(entry.LastModifiedAt) -
-
- -@if (EnableContextMenu && ContextMenuTemplate != null) -{ - - @if (ShowContextMenu) - { -
- @ContextMenuTemplate.Invoke(ContextMenuItem) -
- } - -} - -@code -{ - [Parameter] public RenderFragment? AdditionTemplate { get; set; } - - [Parameter] public bool ShowSize { get; set; } = true; - [Parameter] public bool ShowDate { get; set; } = true; - [Parameter] public bool ShowSelect { get; set; } = true; - [Parameter] public bool ShowNavigateUp { get; set; } = true; - - [Parameter] public RenderFragment? ContextMenuTemplate { get; set; } - [Parameter] public bool EnableContextMenu { get; set; } = false; - private bool ShowContextMenu = false; - private FileEntry ContextMenuItem; - private string ContextMenuId = "fileManagerContextMenu"; - private ContextMenu? CurrentContextMenu; - - [Parameter] public BaseFileAccess FileAccess { get; set; } - [Parameter] public Func? Filter { get; set; } - - [Parameter] public Func? OnEntryClicked { get; set; } - [Parameter] public Func? OnSelectionChanged { get; set; } - - [Parameter] public Func? OnNavigateUpClicked { get; set; } - - private bool IsLoading = false; - private string LoadingText = ""; - - private FileEntry[] Entries = Array.Empty(); - private string Path = "/"; - - private Dictionary SelectionCache = new(); - public FileEntry[] Selection => SelectionCache.Where(x => x.Value).Select(x => x.Key).ToArray(); - private bool IsAllSelected => Entries.Length != 0 && SelectionCache.Count(x => x.Value) == Entries.Length; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - await Refresh(); - } - - public async Task Refresh() - { - IsLoading = true; - LoadingText = "Loading"; - await InvokeAsync(StateHasChanged); - - // Load current directory - Path = await FileAccess.GetCurrentDirectory(); - - // Load entries - LoadingText = "Loading files and folders"; - await InvokeAsync(StateHasChanged); - - Entries = await FileAccess.List(); - - // Sort entries - LoadingText = "Sorting files and folders"; - await InvokeAsync(StateHasChanged); - - if (Filter != null) - { - Entries = Entries - .Where(x => Filter.Invoke(x)) - .ToArray(); - } - - Entries = Entries - .GroupBy(x => x.IsFile) - .OrderBy(x => x.Key) - .SelectMany(x => x.OrderBy(y => y.Name)) - .ToArray(); - - // Build selection cache - SelectionCache.Clear(); - - foreach (var entry in Entries) - SelectionCache.Add(entry, false); - - if (OnSelectionChanged != null) - await OnSelectionChanged.Invoke(Array.Empty()); - - IsLoading = false; - await InvokeAsync(StateHasChanged); - } - - private async Task HandleEntryClick(FileEntry entry) - { - if (OnEntryClicked == null) - return; - - await OnEntryClicked.Invoke(entry); - } - - private async Task NavigateUp() - { - if (OnNavigateUpClicked == null) - return; - - await OnNavigateUpClicked.Invoke(); - } - - #region Selection - - private async Task ChangeSelection(FileEntry entry, bool selectionState) - { - SelectionCache[entry] = selectionState; - await InvokeAsync(StateHasChanged); - - if (OnSelectionChanged != null) - { - await OnSelectionChanged.Invoke(SelectionCache - .Where(x => x.Value) - .Select(x => x.Key) - .ToArray() - ); - } - } - - private async Task ChangeAllSelection(bool toggle) - { - foreach (var key in SelectionCache.Keys) - SelectionCache[key] = toggle; - - await InvokeAsync(StateHasChanged); - - if (OnSelectionChanged != null) - { - await OnSelectionChanged.Invoke(SelectionCache - .Where(x => x.Value) - .Select(x => x.Key) - .ToArray() - ); - } - } - - #endregion - - #region Context Menu - - private async Task OnContextMenuAppear(MenuAppearingEventArgs data) - { - ContextMenuItem = (data.Data as FileEntry)!; - - ShowContextMenu = true; - await InvokeAsync(StateHasChanged); - } - - private async Task OnContextMenuHide() - { - ShowContextMenu = false; - await InvokeAsync(StateHasChanged); - } - - public async Task HideContextMenu() - { - ShowContextMenu = false; - await InvokeAsync(StateHasChanged); - } - - #endregion - -} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Helpers/ServerApiFileActions.cs b/Moonlight/Features/Servers/Helpers/ServerApiFileActions.cs new file mode 100644 index 00000000..631216c4 --- /dev/null +++ b/Moonlight/Features/Servers/Helpers/ServerApiFileActions.cs @@ -0,0 +1,49 @@ +using MoonCore.Helpers; +using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; +using Moonlight.Features.Servers.Exceptions; + +namespace Moonlight.Features.Servers.Helpers; + +public class ServerApiFileActions : IFileActions +{ + private readonly string Endpoint; + private readonly string Token; + private readonly int ServerId; + + private readonly HttpApiClient ApiClient; + + public ServerApiFileActions(string endpoint, string token, int serverId) + { + Endpoint = endpoint; + Token = token; + ServerId = serverId; + + ApiClient = new(endpoint + $"files/{ServerId}/", token); + } + + public async Task List(string path) => await ApiClient.Get($"list?path={path}"); + + public async Task DeleteFile(string path) => await ApiClient.DeleteAsString($"deleteFile?path={path}"); + + public async Task DeleteDirectory(string path) => await ApiClient.DeleteAsString($"deleteDirectory?path={path}"); + + public async Task Move(string from, string to) => await ApiClient.Post($"move?from={from}&to={to}"); + + public async Task CreateDirectory(string path) => await ApiClient.Post($"createDirectory?path={path}"); + + public async Task CreateFile(string path) => await ApiClient.Post($"createFile?path={path}"); + + public async Task ReadFile(string path) => await ApiClient.GetAsString($"readFile?path={path}"); + + public async Task WriteFile(string path, string content) => + await ApiClient.PostAsString($"writeFile?path={path}", content); + + public async Task ReadFileStream(string path) => await ApiClient.GetAsStream($"readFileStream?path={path}"); + + public async Task WriteFileStream(string path, Stream dataStream) => + await ApiClient.PostFile($"writeFileStream?path={path}", dataStream, "upload"); + + public IFileActions Clone() => new ServerApiFileActions(Endpoint, Token, ServerId); + + public void Dispose() => ApiClient.Dispose(); +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Helpers/ServerFtpFileActions.cs b/Moonlight/Features/Servers/Helpers/ServerFtpFileActions.cs deleted file mode 100644 index cd69d28b..00000000 --- a/Moonlight/Features/Servers/Helpers/ServerFtpFileActions.cs +++ /dev/null @@ -1,224 +0,0 @@ -using System.Net; -using System.Text; -using FluentFTP; -using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; - -namespace Moonlight.Features.Servers.Helpers; - -public class ServerFtpFileActions : IFileActions -{ - private FtpClient Client; - - private readonly string Host; - private readonly int Port; - private readonly string Username; - private readonly string Password; - private readonly int OperationTimeout; - - public ServerFtpFileActions(string host, int port, string username, string password, int operationTimeout = 5) - { - Host = host; - Port = port; - Username = username; - Password = password; - OperationTimeout = (int)TimeSpan.FromSeconds(5).TotalMilliseconds; - - Client = CreateClient(); - } - - public async Task List(string path) - { - return await ExecuteHandled(() => - { - var items = Client.GetListing(path) ?? Array.Empty(); - var result = items.Select(item => new FileEntry - { - Name = item.Name, - IsDirectory = item.Type == FtpObjectType.Directory, - IsFile = item.Type == FtpObjectType.File, - LastModifiedAt = item.Modified, - Size = item.Size - }).ToArray(); - - return Task.FromResult(result); - }); - } - - public async Task Delete(string path) - { - await ExecuteHandled(() => - { - if (Client.FileExists(path)) - Client.DeleteFile(path); - else - Client.DeleteDirectory(path); - - return Task.CompletedTask; - }); - } - - public async Task Move(string from, string to) - { - await ExecuteHandled(() => - { - var fromEntry = Client.GetObjectInfo(from); - - string dest; - - if (to.EndsWith("/")) - dest = to + Path.GetFileName(from); - else - dest = to; - - //from = CurrentDirectory + from; - //var fromWithSlash = from.StartsWith("/") ? from : "/" + from; - - if (from == dest) - return Task.CompletedTask; - - if (fromEntry.Type == FtpObjectType.Directory) - // We need to add the folder name here, because some ftp servers would refuse to move the folder if its missing - Client.MoveDirectory(from, dest); - else - // We need to add the file name here, because some ftp servers would refuse to move the file if its missing - Client.MoveFile(from, dest); - - return Task.CompletedTask; - }); - } - - public async Task CreateDirectory(string name) - { - await ExecuteHandled(() => - { - Client.CreateDirectory(name); - return Task.CompletedTask; - }); - } - - public async Task CreateFile(string name) - { - await ExecuteHandled(() => - { - using var stream = new MemoryStream(); - Client.UploadStream(stream, name); - - return Task.CompletedTask; - }); - } - - public async Task ReadFile(string name) - { - return await ExecuteHandled(async () => - { - await using var stream = Client.OpenRead(name); - using var reader = new StreamReader(stream, Encoding.UTF8); - return await reader.ReadToEndAsync(); - }); - } - - public async Task WriteFile(string name, string content) - { - await ExecuteHandled(() => - { - using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content)); - Client.UploadStream(stream, name); - - return Task.CompletedTask; - }); - } - - public async Task ReadFileStream(string name) - { - return await ExecuteHandled(() => - { - var stream = Client.OpenRead(name); - return Task.FromResult(stream); - }); - } - - public async Task WriteFileStream(string name, Stream dataStream) - { - await ExecuteHandled(() => - { - Client.UploadStream(dataStream, name, FtpRemoteExists.Overwrite); - return Task.CompletedTask; - }); - } - - public IFileActions Clone() - { - return new ServerFtpFileActions(Host, Port, Username, Password); - } - - public void Dispose() - { - Client.Dispose(); - } - - #region Helpers - - private Task EnsureConnected() - { - if (!Client.IsConnected) - Client.Connect(); - - return Task.CompletedTask; - } - - private async Task ExecuteHandled(Func func) - { - try - { - await EnsureConnected(); - await func.Invoke(); - } - catch (TimeoutException) - { - Client.Dispose(); - Client = CreateClient(); - - await EnsureConnected(); - - await func.Invoke(); - } - } - - private async Task ExecuteHandled(Func> func) - { - try - { - await EnsureConnected(); - return await func.Invoke(); - } - catch (TimeoutException) - { - Client.Dispose(); - Client = CreateClient(); - - await EnsureConnected(); - - return await func.Invoke(); - } - } - - - - private FtpClient CreateClient() - { - var client = new FtpClient(); - client.Host = Host; - client.Port = Port; - client.Credentials = new NetworkCredential(Username, Password); - client.Config.DataConnectionType = FtpDataConnectionType.AutoPassive; - - client.Config.ConnectTimeout = OperationTimeout; - client.Config.ReadTimeout = OperationTimeout; - client.Config.DataConnectionConnectTimeout = OperationTimeout; - client.Config.DataConnectionReadTimeout = OperationTimeout; - - return client; - } - - #endregion -} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Services/ServerService.cs b/Moonlight/Features/Servers/Services/ServerService.cs index 04752a2d..135f1109 100644 --- a/Moonlight/Features/Servers/Services/ServerService.cs +++ b/Moonlight/Features/Servers/Services/ServerService.cs @@ -208,12 +208,10 @@ public class ServerService await Backup.Delete(serverWithBackups, backup, false); } - public async Task OpenFileAccess(Server s) + public Task OpenFileAccess(Server s) { using var scope = ServiceProvider.CreateScope(); - var jwtService = ServiceProvider.GetRequiredService>(); - var configService = ServiceProvider.GetRequiredService>(); var serverRepo = scope.ServiceProvider.GetRequiredService>(); var server = serverRepo @@ -221,18 +219,14 @@ public class ServerService .Include(x => x.Node) .First(x => x.Id == s.Id); - var ftpLoginJwt = await jwtService.Create(data => { data.Add("ServerId", s.Id.ToString()); }, - ServersJwtType.FtpServerLogin, TimeSpan.FromMinutes(5)); - - return new BaseFileAccess( - new ServerFtpFileActions( - server.Node.Fqdn, - server.Node.FtpPort, - $"moonlight.{server.Id}", - ftpLoginJwt, - configService.Get().Customisation.FileManager.OperationTimeout - ) + var protocol = server.Node.Ssl ? "https" : "http"; + var remoteUrl = $"{protocol}://{server.Node.Fqdn}:{server.Node.HttpPort}/"; + + var result = new BaseFileAccess( + new ServerApiFileActions(remoteUrl, server.Node.Token, server.Id) ); + + return Task.FromResult(result); } public async Task GetServersList(ServerNode node, bool includeOffline = false) diff --git a/Moonlight/Features/Servers/UI/Views/Test.razor b/Moonlight/Features/Servers/UI/Views/Test.razor deleted file mode 100644 index 1c4746b9..00000000 --- a/Moonlight/Features/Servers/UI/Views/Test.razor +++ /dev/null @@ -1,12 +0,0 @@ -@page "/test" - -@using Moonlight.Features.FileManager.UI.NewFileManager -@using Moonlight.Features.FileManager.Models.Abstractions.FileAccess -@using Moonlight.Core.Helpers - - - -@code -{ - private BaseFileAccess FileAccess = new(new HostFileActions("storage")); -} diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index 3cba3716..5b2090e3 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -85,13 +85,12 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -110,6 +109,11 @@ <_ContentIncludedByDefault Remove="Features\ScheduleDesigner\UI\Components\ScheduleLinkItem.razor" /> <_ContentIncludedByDefault Remove="Features\ScheduleDesigner\UI\Components\ScheduleNodeItem.razor" /> <_ContentIncludedByDefault Remove="wwwroot\svg\logo.svg" /> + <_ContentIncludedByDefault Remove="Features\FileManager\UI\Components\Editor.razor" /> + <_ContentIncludedByDefault Remove="Features\FileManager\UI\Components\FileEditor.razor" /> + <_ContentIncludedByDefault Remove="Features\FileManager\UI\Components\FileManager.razor" /> + <_ContentIncludedByDefault Remove="Features\FileManager\UI\Components\FileUploader.razor" /> + <_ContentIncludedByDefault Remove="Features\FileManager\UI\Components\FileView.razor" />