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

event log: manually combine breadcrumbs. fixes #914

Browse source
This commit is contained in:
Hylke Bons 2013-02-10 16:00:55 +00:00
parent 2fc62e783c
commit 9991cab4af
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SparkleShare/SparkleEventLogController.cs
View file

@ -563,7 +563,7 @@ namespace SparkleShare {
if (string.IsNullOrEmpty (crumb))
continue;
string crumb_path = Path.Combine (new_path_root, crumb);
string crumb_path = SafeCombine (new_path_root, crumb);
if (Directory.Exists (crumb_path)) {
link += "<a href='" + crumb_path + "'>" + crumb + Path.DirectorySeparatorChar + "</a>";
@ -581,7 +581,7 @@ namespace SparkleShare {
previous_was_folder = false;
}
new_path_root = Path.Combine (new_path_root, crumb);
new_path_root = SafeCombine (new_path_root, crumb);
i++;
}
@ -589,6 +589,20 @@ namespace SparkleShare {
}
private string SafeCombine (string path1, string path2)
{
string result = path1;
if (!result.EndsWith (Path.DirectorySeparatorChar.ToString ()))
result += Path.DirectorySeparatorChar;
if (path2.StartsWith (Path.DirectorySeparatorChar.ToString ()))
path2 = path2.Substring (1);
return result + path2;
}
// All change sets that happened on a day
private class ActivityDay : List<SparkleChangeSet>
{