Rewrite FTP util and add SFTP support

Author: js6pak

Spedit.csproj

@@ -64,7 +64,6 @@
     <None Include="Deploy\DotNetChecker.nsh" />
     <None Include="Deploy\FileAssociation.nsh" />
     <None Include="Deploy\SPEdit.nsi" />
-    <None Include="packages.config" />
     <None Include="Resources\Misc\Templates\CSSCSGOTemplate.sp" />
     <None Include="Resources\Misc\Templates\EmptyScriptTemplate.sp" />
     <None Include="Resources\Misc\Templates\OldSyntaxCSSCSGOTemplate.sp" />
@@ -75,15 +74,6 @@
     <None Include="Resources\Misc\Templates\TFTemplate.sp" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
-    </Reference>
-    <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="QueryMaster">
@@ -649,6 +639,20 @@
     <Content Include="Resources\lang_0_spedit.xml" />
     <Content Include="Resources\lang_0_spedit_entryTemplate.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AvalonEdit">
+      <Version>6.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Extended.Wpf.Toolkit">
+      <Version>3.8.0</Version>
+    </PackageReference>
+    <PackageReference Include="MahApps.Metro">
+      <Version>1.6.5</Version>
+    </PackageReference>
+    <PackageReference Include="SSH.NET">
+      <Version>2016.1.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

UI/MainWindowSPCompiler.cs

@@ -299,7 +299,7 @@ public void FTPUpload_Plugins()
                         }
 						try
 						{
-							ftp.upload(uploadDir, nonUploadedFiles[i]);
+							ftp.Upload(uploadDir, nonUploadedFiles[i]);
 							stringOutput.AppendLine($"{Program.Translations.Uploaded}: " + nonUploadedFiles[i]);
 						}
 						catch (Exception e)

Utils/FTP.cs

@@ -1,59 +1,46 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Net;
 using System.Text;
+using Renci.SshNet;
 
 namespace Spedit.Utils
 {
     public class FTP
     {
-        private string host = null;
-        private string user = null;
-        private string pass = null;
-        private FtpWebRequest ftpRequest = null;
-        private Stream ftpStream = null;
-        private int bufferSize = 2048;
+        private readonly string _host;
+        private readonly string _user;
+        private readonly string _pass;
 
-        public FTP(string hostIP, string userName, string password) { host = hostIP; user = userName; pass = password; }
+        public FTP(string host, string user, string password) { _host = host; _user = user; _pass = password; }
 
-        //thanks to: http://www.codeproject.com/Tips/443588/Simple-Csharp-FTP-Class
-        public void upload(string remoteFile, string localFile)
+        public void Upload(string remoteFile, string localFile)
         {
-			StringBuilder requestUri = new StringBuilder(host);
-			if (host[host.Length - 1] == '/')
-			{
-				if (remoteFile[0] == '/')
-				{ requestUri.Append(remoteFile.Substring(1)); }
-				else
-				{ requestUri.Append(remoteFile); }
-			}
-			else
-			{
-				if (remoteFile[0] == '/')
-				{ requestUri.Append(remoteFile); }
-				else
-				{
-					requestUri.Append("/");
-					requestUri.Append(remoteFile);
-				}
-			}
-            ftpRequest = (FtpWebRequest)FtpWebRequest.Create(requestUri.ToString());
-            ftpRequest.Credentials = new NetworkCredential(user, pass);
-            ftpRequest.UseBinary = true;
-            ftpRequest.UsePassive = true;
-            ftpRequest.KeepAlive = true;
-            ftpRequest.Method = WebRequestMethods.Ftp.UploadFile;
-            ftpStream = ftpRequest.GetRequestStream();
-            FileStream localFileStream = new FileStream(localFile, FileMode.Open);
-            byte[] byteBuffer = new byte[bufferSize];
-            int bytesSent = localFileStream.Read(byteBuffer, 0, bufferSize);
-            while (bytesSent != 0)
+            var requestUri = new UriBuilder(_host) { Path = remoteFile }.Uri;
+
+            if (requestUri.Scheme == "sftp")
+            {
+                var connectionInfo = new ConnectionInfo(requestUri.Host, requestUri.Port == -1 ? 22 : requestUri.Port, _user, new PasswordAuthenticationMethod(_user, _pass));
+                using (var sftp = new SftpClient(connectionInfo))
+                {
+                    sftp.Connect();
+
+                    using (var stream = File.OpenRead(localFile))
+                    {
+                        sftp.UploadFile(stream, remoteFile, true);
+                    }
+
+                    sftp.Disconnect();
+                }
+            }
+            else
             {
-                ftpStream.Write(byteBuffer, 0, bytesSent);
-                bytesSent = localFileStream.Read(byteBuffer, 0, bufferSize);
+                using (var client = new WebClient())
+                {
+                    client.Credentials = new NetworkCredential(_user, _pass);
+                    client.UploadFile(requestUri, WebRequestMethods.Ftp.UploadFile, localFile);
+                }
             }
-            localFileStream.Close();
-            ftpStream.Close();
-            ftpRequest = null;
         }
-    } 
+    }
 }