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

Fixed moving items to the location they are currently at

Browse source
This commit is contained in:
Marcel Baumgartner 2024-02-11 16:38:28 +01:00
parent fada1a11b0
commit aaf4c05630
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Moonlight/Features/Servers/Helpers/ServerFtpFileAccess.cs
View file

@ -1,6 +1,7 @@
using System.Net; using System.Net;
using System.Text; using System.Text;
using FluentFTP; using FluentFTP;
using MoonCore.Helpers;
using Moonlight.Features.FileManager.Models.Abstractions.FileAccess; using Moonlight.Features.FileManager.Models.Abstractions.FileAccess;
namespace Moonlight.Features.Servers.Helpers; namespace Moonlight.Features.Servers.Helpers;
@ -94,12 +95,18 @@ public class ServerFtpFileAccess : IFileAccess
{ {
var fromEntry = Client.GetObjectInfo(from); var fromEntry = Client.GetObjectInfo(from);
var dest = to + Path.GetFileName(from);
var fromWithSlash = from.StartsWith("/") ? from : "/" + from;
if (fromWithSlash == dest)
return Task.CompletedTask;
if (fromEntry.Type == FtpObjectType.Directory) 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 // We need to add the folder name here, because some ftp servers would refuse to move the folder if its missing
Client.MoveDirectory(from, to + Path.GetFileName(from)); Client.MoveDirectory(from, dest);
else else
// We need to add the file name here, because some ftp servers would refuse to move the file if its missing // We need to add the file name here, because some ftp servers would refuse to move the file if its missing
Client.MoveFile(from, to + Path.GetFileName(from)); Client.MoveFile(from, dest);
return Task.CompletedTask; return Task.CompletedTask;
}); });