controller: create and delete .tmp folder before and after fetching respectively

This commit is contained in:
Hylke Bons 2011-05-28 17:52:14 +01:00
parent 0b937a0dda
commit b33b321207

View file

@ -92,11 +92,6 @@ namespace SparkleShare {
{ {
SparklePath = SparklePaths.SparklePath; SparklePath = SparklePaths.SparklePath;
// Remove temporary file
SparkleHelpers.ClearAttributes (SparklePaths.SparkleTmpPath);
if (Directory.Exists (SparklePaths.SparkleTmpPath))
Directory.Delete (SparklePaths.SparkleTmpPath, true);
InstallLauncher (); InstallLauncher ();
EnableSystemAutostart (); EnableSystemAutostart ();
@ -911,6 +906,9 @@ namespace SparkleShare {
public void FetchFolder (string url, string name) public void FetchFolder (string url, string name)
{ {
if (!Directory.Exists (SparklePaths.SparkleTmpPath))
Directory.CreateDirectory (SparklePaths.SparkleTmpPath);
SparkleHelpers.DebugInfo ("Controller", "Formed URL: " + url); SparkleHelpers.DebugInfo ("Controller", "Formed URL: " + url);
string host = GetHost (url); string host = GetHost (url);
@ -974,7 +972,6 @@ namespace SparkleShare {
SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message); SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message);
} }
SparkleConfig.DefaultConfig.AddFolder (target_folder_name, url, backend); SparkleConfig.DefaultConfig.AddFolder (target_folder_name, url, backend);
AddRepository (target_folder_path); AddRepository (target_folder_path);
@ -990,24 +987,22 @@ namespace SparkleShare {
FolderListChanged (); FolderListChanged ();
fetcher.Dispose (); fetcher.Dispose ();
if (Directory.Exists (SparklePaths.SparkleTmpPath))
Directory.Delete (SparklePaths.SparkleTmpPath, true);
}; };
fetcher.Failed += delegate { fetcher.Failed += delegate {
EnableHostKeyCheckingForHost (host); EnableHostKeyCheckingForHost (host);
if (Directory.Exists (tmp_folder)) {
SparkleHelpers.ClearAttributes (tmp_folder);
Directory.Delete (tmp_folder, true);
SparkleHelpers.DebugInfo ("Config",
"Deleted temporary directory: " + tmp_folder);
}
if (FolderFetchError != null) if (FolderFetchError != null)
FolderFetchError (); FolderFetchError ();
fetcher.Dispose (); fetcher.Dispose ();
if (Directory.Exists (SparklePaths.SparkleTmpPath))
Directory.Delete (SparklePaths.SparkleTmpPath, true);
}; };