Implemented archiving and extracting for users
This commit is contained in:
parent
923a3c18b8
commit
fda972a90e
7 changed files with 145 additions and 9 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
@inherits ErrorBoundaryBase
|
@inherits ErrorBoundaryBase
|
||||||
|
|
||||||
@if (Crashed || CurrentException != null)
|
@if (Crashed || Exception != null)
|
||||||
{
|
{
|
||||||
if (Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development" || (IdentityService.IsLoggedIn && IdentityService.CurrentUser.Permissions >= 9000))
|
if (Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development" || (IdentityService.IsLoggedIn && IdentityService.CurrentUser.Permissions >= 9000))
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,6 +54,8 @@ public class FileManagerFeature : MoonlightFeature
|
||||||
await pluginService.RegisterImplementation<IFileManagerContextAction>(new RenameContextAction());
|
await pluginService.RegisterImplementation<IFileManagerContextAction>(new RenameContextAction());
|
||||||
await pluginService.RegisterImplementation<IFileManagerContextAction>(new MoveContextAction());
|
await pluginService.RegisterImplementation<IFileManagerContextAction>(new MoveContextAction());
|
||||||
await pluginService.RegisterImplementation<IFileManagerContextAction>(new DownloadContextAction());
|
await pluginService.RegisterImplementation<IFileManagerContextAction>(new DownloadContextAction());
|
||||||
|
await pluginService.RegisterImplementation<IFileManagerContextAction>(new ArchiveContextAction());
|
||||||
|
await pluginService.RegisterImplementation<IFileManagerContextAction>(new ExtractContextAction());
|
||||||
await pluginService.RegisterImplementation<IFileManagerContextAction>(new DeleteContextAction());
|
await pluginService.RegisterImplementation<IFileManagerContextAction>(new DeleteContextAction());
|
||||||
|
|
||||||
await pluginService.RegisterImplementation<IFileManagerSelectionAction>(new MoveSelectionAction());
|
await pluginService.RegisterImplementation<IFileManagerSelectionAction>(new MoveSelectionAction());
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
using MoonCore.Exceptions;
|
||||||
|
using MoonCore.Helpers;
|
||||||
|
using MoonCoreUI.Services;
|
||||||
|
using Moonlight.Features.FileManager.Interfaces;
|
||||||
|
using Moonlight.Features.FileManager.Models.Abstractions.FileAccess;
|
||||||
|
|
||||||
|
namespace Moonlight.Features.FileManager.Implementations;
|
||||||
|
|
||||||
|
public class ArchiveContextAction : IFileManagerContextAction
|
||||||
|
{
|
||||||
|
public string Name => "Archive";
|
||||||
|
public string Icon => "bxs-archive-in";
|
||||||
|
public string Color => "warning";
|
||||||
|
public Func<FileEntry, bool> Filter => _ => true;
|
||||||
|
|
||||||
|
public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry,
|
||||||
|
IServiceProvider provider)
|
||||||
|
{
|
||||||
|
var archiveAccess = access.Actions as IArchiveFileActions;
|
||||||
|
|
||||||
|
if (archiveAccess == null)
|
||||||
|
throw new DisplayException("This file access does not support archiving");
|
||||||
|
|
||||||
|
var alertService = provider.GetRequiredService<AlertService>();
|
||||||
|
|
||||||
|
var fileName = await alertService.Text("Enter the archive file name", "",
|
||||||
|
Formatter.FormatDate(DateTime.UtcNow) + ".tar.gz");
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(fileName) || fileName.Contains("..")) // => canceled
|
||||||
|
return;
|
||||||
|
|
||||||
|
var toastService = provider.GetRequiredService<ToastService>();
|
||||||
|
|
||||||
|
await toastService.CreateProgress("fileManagerArchive", "Archiving... Please be patient");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await archiveAccess.Archive(
|
||||||
|
access.CurrentDirectory + fileName,
|
||||||
|
new[] { access.CurrentDirectory + entry.Name }
|
||||||
|
);
|
||||||
|
|
||||||
|
await toastService.Success("Successfully created archive");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Logger.Warn($"An error occured while archiving item ({entry.Name}):");
|
||||||
|
Logger.Warn(e);
|
||||||
|
|
||||||
|
await toastService.Danger("An unknown error occured while creating archive");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
await toastService.RemoveProgress("fileManagerArchive");
|
||||||
|
}
|
||||||
|
|
||||||
|
await fileManager.View.Refresh();
|
||||||
|
}
|
||||||
|
}
|
|
@ -14,10 +14,7 @@ public class ArchiveSelectionAction : IFileManagerSelectionAction
|
||||||
public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry[] entries,
|
public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry[] entries,
|
||||||
IServiceProvider provider)
|
IServiceProvider provider)
|
||||||
{
|
{
|
||||||
if (!access.Actions.GetType().IsAssignableFrom(typeof(IArchiveFileActions)))
|
var archiveAccess = access.Actions as IArchiveFileActions;
|
||||||
throw new DisplayException("This file access does not support archiving");
|
|
||||||
|
|
||||||
var archiveAccess = access as IArchiveFileActions;
|
|
||||||
|
|
||||||
if (archiveAccess == null)
|
if (archiveAccess == null)
|
||||||
throw new DisplayException("This file access does not support archiving");
|
throw new DisplayException("This file access does not support archiving");
|
||||||
|
@ -29,10 +26,30 @@ public class ArchiveSelectionAction : IFileManagerSelectionAction
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(fileName) || fileName.Contains("..")) // => canceled
|
if (string.IsNullOrEmpty(fileName) || fileName.Contains("..")) // => canceled
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
var toastService = provider.GetRequiredService<ToastService>();
|
||||||
|
|
||||||
await archiveAccess.Archive(
|
await toastService.CreateProgress("fileManagerArchive", "Archiving... Please be patient");
|
||||||
access.CurrentDirectory + fileName,
|
|
||||||
entries.Select(x => access.CurrentDirectory + x.Name).ToArray()
|
try
|
||||||
);
|
{
|
||||||
|
await archiveAccess.Archive(
|
||||||
|
access.CurrentDirectory + fileName,
|
||||||
|
entries.Select(x => access.CurrentDirectory + x.Name).ToArray()
|
||||||
|
);
|
||||||
|
|
||||||
|
await toastService.Success("Successfully created archive");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Logger.Warn($"An error occured while archiving items ({entries.Length}):");
|
||||||
|
Logger.Warn(e);
|
||||||
|
|
||||||
|
await toastService.Danger("An unknown error occured while creating archive");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
await toastService.RemoveProgress("fileManagerArchive");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,52 @@
|
||||||
|
using MoonCore.Exceptions;
|
||||||
|
using MoonCore.Helpers;
|
||||||
|
using MoonCoreUI.Services;
|
||||||
|
using Moonlight.Features.FileManager.Interfaces;
|
||||||
|
using Moonlight.Features.FileManager.Models.Abstractions.FileAccess;
|
||||||
|
|
||||||
|
namespace Moonlight.Features.FileManager.Implementations;
|
||||||
|
|
||||||
|
public class ExtractContextAction : IFileManagerContextAction
|
||||||
|
{
|
||||||
|
public string Name => "Extract";
|
||||||
|
public string Icon => "bxs-archive-out";
|
||||||
|
public string Color => "warning";
|
||||||
|
public Func<FileEntry, bool> Filter => entry => entry.IsFile && entry.Name.EndsWith(".tar.gz");
|
||||||
|
public async Task Execute(BaseFileAccess access, UI.Components.FileManager fileManager, FileEntry entry, IServiceProvider provider)
|
||||||
|
{
|
||||||
|
var archiveAccess = access.Actions as IArchiveFileActions;
|
||||||
|
|
||||||
|
if (archiveAccess == null)
|
||||||
|
throw new DisplayException("This file access does not support archiving");
|
||||||
|
|
||||||
|
await fileManager.OpenFolderSelect("Select where you want to extract the content of the archive", async destination =>
|
||||||
|
{
|
||||||
|
var toastService = provider.GetRequiredService<ToastService>();
|
||||||
|
|
||||||
|
await toastService.CreateProgress("fileManagerExtract", "Extracting... Please be patient");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await archiveAccess.Extract(
|
||||||
|
access.CurrentDirectory + entry.Name,
|
||||||
|
destination
|
||||||
|
);
|
||||||
|
|
||||||
|
await toastService.Success("Successfully extracted archive");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Logger.Warn($"An error occured while extracting archive ({entry.Name}):");
|
||||||
|
Logger.Warn(e);
|
||||||
|
|
||||||
|
await toastService.Danger("An unknown error occured while extracting archive");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
await toastService.RemoveProgress("fileManagerExtract");
|
||||||
|
}
|
||||||
|
|
||||||
|
await fileManager.View.Refresh();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,4 +3,5 @@ namespace Moonlight.Features.FileManager.Models.Abstractions.FileAccess;
|
||||||
public interface IArchiveFileActions
|
public interface IArchiveFileActions
|
||||||
{
|
{
|
||||||
public Task Archive(string path, string[] files);
|
public Task Archive(string path, string[] files);
|
||||||
|
public Task Extract(string path, string destination);
|
||||||
}
|
}
|
|
@ -47,6 +47,11 @@ public class ServerApiFileActions : IFileActions, IArchiveFileActions
|
||||||
{
|
{
|
||||||
await ApiClient.Post($"archive?path={path}&provider=tar.gz", files);
|
await ApiClient.Post($"archive?path={path}&provider=tar.gz", files);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task Extract(string path, string destination)
|
||||||
|
{
|
||||||
|
await ApiClient.Post($"extract?path={path}&destination={destination}&provider=tar.gz");
|
||||||
|
}
|
||||||
|
|
||||||
public IFileActions Clone() => new ServerApiFileActions(Endpoint, Token, ServerId);
|
public IFileActions Clone() => new ServerApiFileActions(Endpoint, Token, ServerId);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue