controller: don't just try/catch everything
This commit is contained in:
parent
2d8a02692a
commit
6b25803a38
|
@ -274,9 +274,9 @@ namespace SparkleShare {
|
||||||
new object [] {folder_path, this.config}
|
new object [] {folder_path, this.config}
|
||||||
);
|
);
|
||||||
|
|
||||||
} catch {
|
} catch (Exception e) {
|
||||||
SparkleHelpers.DebugInfo ("Controller",
|
SparkleHelpers.DebugInfo ("Controller",
|
||||||
"Failed to load \"" + backend + "\" backend for \"" + folder_name + "\"");
|
"Failed to load '" + backend + "' backend for '" + folder_name + "': " + e.Message);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -512,9 +512,9 @@ namespace SparkleShare {
|
||||||
fetch_prior_history
|
fetch_prior_history
|
||||||
);
|
);
|
||||||
|
|
||||||
} catch {
|
} catch (Exception e) {
|
||||||
SparkleHelpers.DebugInfo ("Controller",
|
SparkleHelpers.DebugInfo ("Controller",
|
||||||
"Failed to load \"" + backend + "\" backend for \"" + canonical_name + "\"");
|
"Failed to load '" + backend + "' backend for '" + canonical_name + "' " + e.Message);
|
||||||
|
|
||||||
if (FolderFetchError != null)
|
if (FolderFetchError != null)
|
||||||
FolderFetchError (
|
FolderFetchError (
|
||||||
|
@ -615,7 +615,13 @@ namespace SparkleShare {
|
||||||
SparkleHelpers.ClearAttributes (this.fetcher.TargetFolder);
|
SparkleHelpers.ClearAttributes (this.fetcher.TargetFolder);
|
||||||
Directory.Move (this.fetcher.TargetFolder, target_folder_path);
|
Directory.Move (this.fetcher.TargetFolder, target_folder_path);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
SparkleHelpers.DebugInfo ("Controller", "Error moving directory: " + e.Message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
string backend = SparkleFetcherBase.GetBackend (this.fetcher.RemoteUrl.AbsolutePath);
|
string backend = SparkleFetcherBase.GetBackend (this.fetcher.RemoteUrl.AbsolutePath);
|
||||||
|
|
||||||
this.config.AddFolder (target_folder_name, this.fetcher.Identifier,
|
this.config.AddFolder (target_folder_name, this.fetcher.Identifier,
|
||||||
this.fetcher.RemoteUrl.ToString (), backend);
|
this.fetcher.RemoteUrl.ToString (), backend);
|
||||||
|
|
||||||
|
@ -635,10 +641,6 @@ namespace SparkleShare {
|
||||||
|
|
||||||
this.fetcher.Dispose ();
|
this.fetcher.Dispose ();
|
||||||
this.fetcher = null;
|
this.fetcher = null;
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
SparkleHelpers.DebugInfo ("Controller", "Error adding folder: " + e.Message);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue