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

config: allow to specify a custom path for each folder. Closes #680

Browse source
This commit is contained in:
Hylke Bons 2012-04-15 19:03:36 +02:00
parent f65401a237
commit 37f8e050c6
5 changed files with 63 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -629,7 +629,7 @@ namespace SparkleLib.Git {
if (match.Success) { if (match.Success) {
SparkleChangeSet change_set = new SparkleChangeSet (); SparkleChangeSet change_set = new SparkleChangeSet ();
change_set.Folder = Name; change_set.Folder = new SparkleFolder (Name);
change_set.Revision = match.Groups [1].Value; change_set.Revision = match.Groups [1].Value;
change_set.User = new SparkleUser (match.Groups [2].Value, match.Groups [3].Value); change_set.User = new SparkleUser (match.Groups [2].Value, match.Groups [3].Value);
change_set.IsMagical = is_merge_commit; change_set.IsMagical = is_merge_commit;

10
SparkleLib/SparkleChangeSet.cs
View file

@ -25,7 +25,7 @@ namespace SparkleLib {
public SparkleUser User = new SparkleUser ("Unknown", "Unknown"); public SparkleUser User = new SparkleUser ("Unknown", "Unknown");
public string Folder; public SparkleFolder Folder;
public string Revision; public string Revision;
public DateTime Timestamp; public DateTime Timestamp;
public DateTime FirstTimestamp; public DateTime FirstTimestamp;
@ -74,6 +74,7 @@ namespace SparkleLib {
} }
// TODO: Move to its own file (and update all .csproj files)
public class SparkleFolder { public class SparkleFolder {
public string Name; public string Name;
@ -81,7 +82,12 @@ namespace SparkleLib {
public string FullPath { public string FullPath {
get { get {
return Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, Name); string custom_path = SparkleConfig.DefaultConfig.GetFolderOptionalAttribute (Name, "path");
if (custom_path != null)
return Path.Combine (custom_path, Name);
else
return Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, Name);
} }
} }

10
SparkleLib/SparkleConfig.cs
View file

@ -256,13 +256,6 @@ namespace SparkleLib {
} }
public bool FolderExists (string name)
{
XmlNode folder = GetFolder (name);
return (folder != null);
}
public string GetBackendForFolder (string name) public string GetBackendForFolder (string name)
{ {
return GetFolderValue (name, "backend"); return GetFolderValue (name, "backend");
@ -292,6 +285,7 @@ namespace SparkleLib {
} }
Save (); Save ();
return true; return true;
} }
@ -314,7 +308,7 @@ namespace SparkleLib {
private XmlNode GetFolder (string name) private XmlNode GetFolder (string name)
{ {
return SelectSingleNode (String.Format("/sparkleshare/folder[name='{0}']", name)); return SelectSingleNode (string.Format ("/sparkleshare/folder[name='{0}']", name));
} }

2
SparkleShare/Mac/SparkleController.cs
View file

@ -185,7 +185,7 @@ namespace SparkleShare {
} }
} }
public override void OpenFolder (string path) public override void OpenFolder (string path)
{ {
path = path.Replace (" ", "\\ "); // Escape space-characters path = path.Replace (" ", "\\ "); // Escape space-characters

135
SparkleShare/SparkleControllerBase.cs
View file

@ -115,11 +115,9 @@ namespace SparkleShare {
get { get {
List<string> unsynced_folders = new List<string> (); List<string> unsynced_folders = new List<string> ();
lock (this.repo_lock) { foreach (SparkleRepoBase repo in Repositories) {
foreach (SparkleRepoBase repo in Repositories) { if (repo.HasUnsyncedChanges)
if (repo.HasUnsyncedChanges) unsynced_folders.Add (repo.Name);
unsynced_folders.Add (repo.Name);
}
} }
return unsynced_folders; return unsynced_folders;
@ -278,15 +276,13 @@ namespace SparkleShare {
{ {
List<SparkleChangeSet> list = new List<SparkleChangeSet> (); List<SparkleChangeSet> list = new List<SparkleChangeSet> ();
lock (this.repo_lock) { foreach (SparkleRepoBase repo in Repositories) {
foreach (SparkleRepoBase repo in Repositories) { List<SparkleChangeSet> change_sets = repo.GetChangeSets (30);
List<SparkleChangeSet> change_sets = repo.GetChangeSets (30);
if (change_sets != null)
if (change_sets != null) list.AddRange (change_sets);
list.AddRange (change_sets); else
else SparkleHelpers.DebugInfo ("Log", "Could not create log for " + repo.Name);
SparkleHelpers.DebugInfo ("Log", "Could not create log for " + repo.Name);
}
} }
list.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp))); list.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp)));
@ -304,14 +300,12 @@ namespace SparkleShare {
if (name == null) if (name == null)
return GetLog (); return GetLog ();
string path = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, name); string path = new SparkleFolder (name).FullPath;
int log_size = 50; int log_size = 50;
lock (this.repo_lock) { foreach (SparkleRepoBase repo in Repositories) {
foreach (SparkleRepoBase repo in Repositories) { if (repo.LocalPath.Equals (path))
if (repo.LocalPath.Equals (path)) return repo.GetChangeSets (log_size);
return repo.GetChangeSets (log_size);
}
} }
return null; return null;
@ -347,7 +341,7 @@ namespace SparkleShare {
foreach (SparkleChangeSet existing_set in stored_activity_day) { foreach (SparkleChangeSet existing_set in stored_activity_day) {
if (change_set.User.Name.Equals (existing_set.User.Name) && if (change_set.User.Name.Equals (existing_set.User.Name) &&
change_set.User.Email.Equals (existing_set.User.Email) && change_set.User.Email.Equals (existing_set.User.Email) &&
change_set.Folder.Equals (existing_set.Folder)) { change_set.Folder.FullPath.Equals (existing_set.Folder.FullPath)) {
existing_set.Added.AddRange (change_set.Added); existing_set.Added.AddRange (change_set.Added);
existing_set.Edited.AddRange (change_set.Edited); existing_set.Edited.AddRange (change_set.Edited);
@ -410,12 +404,7 @@ namespace SparkleShare {
if (change_set.Added.Count > 0) { if (change_set.Added.Count > 0) {
foreach (string file_path in change_set.Added) { foreach (string file_path in change_set.Added) {
event_entry += "<dd class='document added'>"; event_entry += "<dd class='document added'>";
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, file_path);
event_entry += FormatBreadCrumbs (
Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
file_path
);
event_entry += "</dd>"; event_entry += "</dd>";
} }
} }
@ -423,12 +412,7 @@ namespace SparkleShare {
if (change_set.Edited.Count > 0) { if (change_set.Edited.Count > 0) {
foreach (string file_path in change_set.Edited) { foreach (string file_path in change_set.Edited) {
event_entry += "<dd class='document edited'>"; event_entry += "<dd class='document edited'>";
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, file_path);
event_entry += FormatBreadCrumbs (
Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
file_path
);
event_entry += "</dd>"; event_entry += "</dd>";
} }
} }
@ -436,12 +420,7 @@ namespace SparkleShare {
if (change_set.Deleted.Count > 0) { if (change_set.Deleted.Count > 0) {
foreach (string file_path in change_set.Deleted) { foreach (string file_path in change_set.Deleted) {
event_entry += "<dd class='document deleted'>"; event_entry += "<dd class='document deleted'>";
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, file_path);
event_entry += FormatBreadCrumbs (
Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
file_path
);
event_entry += "</dd>"; event_entry += "</dd>";
} }
} }
@ -451,18 +430,9 @@ namespace SparkleShare {
foreach (string file_path in change_set.MovedFrom) { foreach (string file_path in change_set.MovedFrom) {
string to_file_path = change_set.MovedTo [i]; string to_file_path = change_set.MovedTo [i];
event_entry += "<dd class='document moved'>"; event_entry += "<dd class='document moved'>";
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, file_path);
event_entry += FormatBreadCrumbs (
Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
file_path
);
event_entry += "<br>"; event_entry += "<br>";
event_entry += FormatBreadCrumbs ( event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, file_path);
Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
to_file_path
);
event_entry += "</dd>"; event_entry += "</dd>";
i++; i++;
@ -492,10 +462,10 @@ namespace SparkleShare {
.Replace ("<!-- $event-user-name -->", change_set.User.Name) .Replace ("<!-- $event-user-name -->", change_set.User.Name)
.Replace ("<!-- $event-avatar-url -->", change_set_avatar) .Replace ("<!-- $event-avatar-url -->", change_set_avatar)
.Replace ("<!-- $event-time -->", timestamp) .Replace ("<!-- $event-time -->", timestamp)
.Replace ("<!-- $event-folder -->", change_set.Folder) .Replace ("<!-- $event-folder -->", change_set.Folder.Name)
.Replace ("<!-- $event-url -->", change_set.Url.ToString ()) .Replace ("<!-- $event-url -->", change_set.Url.ToString ())
.Replace ("<!-- $event-revision -->", change_set.Revision) .Replace ("<!-- $event-revision -->", change_set.Revision)
.Replace ("<!-- $event-folder-color -->", AssignColor (change_set.Folder)); .Replace ("<!-- $event-folder-color -->", AssignColor (change_set.Folder.Name));
} }
string day_entry = ""; string day_entry = "";
@ -554,17 +524,15 @@ namespace SparkleShare {
bool has_syncing_repos = false; bool has_syncing_repos = false;
bool has_unsynced_repos = false; bool has_unsynced_repos = false;
lock (this.repo_lock) { foreach (SparkleRepoBase repo in Repositories) {
foreach (SparkleRepoBase repo in Repositories) { if (repo.Status == SyncStatus.SyncDown ||
if (repo.Status == SyncStatus.SyncDown || repo.Status == SyncStatus.SyncUp ||
repo.Status == SyncStatus.SyncUp || repo.IsBuffering) {
repo.IsBuffering) {
has_syncing_repos = true;
has_syncing_repos = true;
} else if (repo.HasUnsyncedChanges) {
} else if (repo.HasUnsyncedChanges) { has_unsynced_repos = true;
has_unsynced_repos = true;
}
} }
} }
@ -656,18 +624,21 @@ namespace SparkleShare {
{ {
string folder_name = Path.GetFileName (folder_path); string folder_name = Path.GetFileName (folder_path);
lock (this.repo_lock) { for (int i = 0; i < Repositories.Length; i++) {
for (int i = 0; i < this.repositories.Count; i++) { SparkleRepoBase repo = Repositories [i];
SparkleRepoBase repo = this.repositories [i];
if (repo.Name.Equals (folder_name)) {
if (repo.Name.Equals (folder_name)) { repo.Dispose ();
repo.Dispose ();
lock (this.repo_lock) {
this.repositories.Remove (repo); this.repositories.Remove (repo);
repo = null;
break;
} }
repo = null;
break;
} }
} }
} }
@ -1092,27 +1063,23 @@ namespace SparkleShare {
// quits if safe // quits if safe
public void TryQuit () public void TryQuit ()
{ {
lock (this.repo_lock) { foreach (SparkleRepoBase repo in Repositories) {
foreach (SparkleRepoBase repo in Repositories) { if (repo.Status == SyncStatus.SyncUp ||
if (repo.Status == SyncStatus.SyncUp || repo.Status == SyncStatus.SyncDown ||
repo.Status == SyncStatus.SyncDown || repo.IsBuffering) {
repo.IsBuffering) {
return;
return;
}
} }
} }
Quit (); Quit ();
} }
public virtual void Quit () public virtual void Quit ()
{ {
lock (this.repo_lock) { foreach (SparkleRepoBase repo in Repositories)
foreach (SparkleRepoBase repo in Repositories) repo.Dispose ();
repo.Dispose ();
}
Environment.Exit (0); Environment.Exit (0);
} }