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

controller: catch DirectoryNotFoundException when calculating folder size

Browse source
This commit is contained in:
Hylke Bons 2011-05-22 21:57:50 +01:00
parent e881206ab9
commit f0604837a0
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
SparkleShare/SparkleController.cs
View file

@ -142,7 +142,7 @@ namespace SparkleShare {
FolderSizeChanged (FolderSize); FolderSizeChanged (FolderSize);
}; };
// TODO: Only support removing because 1. removing causes crashes and 2. Backend will be determined in // TODO: Only support removing because 1. adding causes crashes and 2. Backend will be determined in
// the Intro and added to a table with the repo type, so we wont' know what type will be added // the Intro and added to a table with the repo type, so we wont' know what type will be added
// Add the repository when a create event occurs // Add the repository when a create event occurs
@ -235,9 +235,8 @@ namespace SparkleShare {
} }
public List <string> Folders public List <string> Folders {
{ get {
get {
List <string> folders = new List <string> (); List <string> folders = new List <string> ();
foreach (SparkleRepoBase repo in Repositories) foreach (SparkleRepoBase repo in Repositories)
@ -310,6 +309,7 @@ namespace SparkleShare {
if (change_set.IsMerge) { if (change_set.IsMerge) {
event_entry += "<dt>Merged a branch</dt>"; event_entry += "<dt>Merged a branch</dt>";
} else { } else {
if (change_set.Edited.Count > 0) { if (change_set.Edited.Count > 0) {
event_entry += "<dt>Edited</dt>"; event_entry += "<dt>Edited</dt>";
@ -517,6 +517,7 @@ namespace SparkleShare {
SparkleRepoBase repo = null; SparkleRepoBase repo = null;
if (Directory.Exists (Path.Combine (folder_path, ".git"))) { if (Directory.Exists (Path.Combine (folder_path, ".git"))) {
repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend); repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend);
} else if (Directory.Exists (Path.Combine (folder_path, ".hg"))) { } else if (Directory.Exists (Path.Combine (folder_path, ".hg"))) {
SparkleBackend hg_backend = new SparkleBackend ("Hg", new string [] {"/opt/local/bin/hg", "/usr/bin/hg"}); SparkleBackend hg_backend = new SparkleBackend ("Hg", new string [] {"/opt/local/bin/hg", "/usr/bin/hg"});
repo = new SparkleRepoHg (folder_path, hg_backend); repo = new SparkleRepoHg (folder_path, hg_backend);
@ -562,9 +563,9 @@ namespace SparkleShare {
SparkleRepoBase repo = Repositories [i]; SparkleRepoBase repo = Repositories [i];
if (repo.Name.Equals (folder_name)) { if (repo.Name.Equals (folder_name)) {
Repositories.Remove (repo);
repo.Dispose (); repo.Dispose ();
repo = null; repo = null;
Repositories.Remove (repo);
break; break;
} }
} }
@ -673,16 +674,21 @@ namespace SparkleShare {
parent.Name.Equals (".tmp")) parent.Name.Equals (".tmp"))
return 0; return 0;
foreach (FileInfo file in parent.GetFiles()) { try {
if (!file.Exists) foreach (FileInfo file in parent.GetFiles()) {
return 0; if (!file.Exists)
return 0;
size += file.Length; size += file.Length;
}
foreach (DirectoryInfo directory in parent.GetDirectories())
size += CalculateFolderSize (directory);
} catch (DirectoryNotFoundException e) {
return 0;
} }
foreach (DirectoryInfo directory in parent.GetDirectories())
size += CalculateFolderSize (directory);
return size; return size;
} }