From af768393bb4551c7b6fa47ba79233743b5e4b085 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 19 Dec 2012 21:01:55 +0100 Subject: [PATCH] fetcher: let the backend handle the parsing of the url. #1118 --- SparkleLib/SparkleFetcherBase.cs | 4 ++++ SparkleShare/SparkleControllerBase.cs | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs index 3f08c3ba..c315d0ee 100755 --- a/SparkleLib/SparkleFetcherBase.cs +++ b/SparkleLib/SparkleFetcherBase.cs @@ -107,6 +107,10 @@ namespace SparkleLib { server = "ssh://" + server; TargetFolder = target_folder; + + if (server.StartsWith ("ssh+")) + server = "ssh" + server.Substring (address.IndexOf ("://")); + RemoteUrl = new Uri (server + remote_path); IsActive = false; } diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index b5a37444..afeaeaf6 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -551,9 +551,6 @@ namespace SparkleShare { string tmp_folder = Path.Combine (tmp_path, canonical_name); string backend = SparkleFetcherBase.GetBackend (address); - if (address.StartsWith ("ssh+")) - address = "ssh" + address.Substring (address.IndexOf ("://")); - try { this.fetcher = (SparkleFetcherBase) Activator.CreateInstance ( Type.GetType ("SparkleLib." + backend + ".SparkleFetcher, SparkleLib." + backend),