diff --git a/Makefile.am b/Makefile.am index b4293c03..20263993 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -basedirs = build help SparkleLib data po +basedirs = build SparkleLib data po SUBDIRS = $(basedirs) $(GUISUBDIRS) DIST_SUBDIRS = $(basedirs) SparkleShare diff --git a/NEWS b/NEWS index f4eadf4e..10bb72a0 100755 --- a/NEWS +++ b/NEWS @@ -1,4 +1,11 @@ -0.8.1 for Linux and Mac (Sun Jan 29): +0.8.2 for Linux and Mac (Sat Feb 11 2012): + + Hylke: + - Use the more reliable and less resource intensive FSEvents on Mac. + - Improvements to the reconnect mechanism of the notification system + + +0.8.1 for Linux and Mac (Sun Jan 29 2012): Hylke: - Disable the Quit menu item when a sync is going on @@ -9,7 +16,7 @@ - Close event log on Cmd+W on Mac -0.8.0 for Linux and Mac (Sun Jan 22): +0.8.0 for Linux and Mac (Sun Jan 22 2012): Hylke: - Show syncing progress in the status icon diff --git a/README.md b/README.md index 40e9d0e6..fccd50ef 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,7 @@ $ sudo apt-get install libappindicator0.1-cil-dev ```bash $ sudo yum install gtk-sharp2-devel mono-core mono-devel monodevelop \ ndesk-dbus-devel ndesk-dbus-glib-devel nautilus-python-devel nant \ - notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool intltool \ - gnome-doc-utils + notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool intltool ``` diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs index 1d975916..f688dcc1 100755 --- a/SparkleLib/Git/SparkleFetcherGit.cs +++ b/SparkleLib/Git/SparkleFetcherGit.cs @@ -79,8 +79,8 @@ namespace SparkleLib { } - base.target_folder = target_folder; - base.remote_url = uri.ToString (); + TargetFolder = target_folder; + RemoteUrl = uri.ToString (); } @@ -89,8 +89,7 @@ namespace SparkleLib { this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath, "clone " + "--progress " + // Redirects progress stats to standarderror - "\"" + base.remote_url + "\" " + - "\"" + SparkleHelpers.NormalizeSeparatorsToOS(base.target_folder) + "\""); + "\"" + RemoteUrl + "\" " + "\"" + SparkleHelpers.NormalizeSeparatorsToOS(TargetFolder) + "\""); this.git.StartInfo.RedirectStandardError = true; this.git.Start (); @@ -140,35 +139,36 @@ namespace SparkleLib { } else { InstallConfiguration (); InstallExcludeRules (); + AddWarnings (); return true; } } - public override string [] Warnings { - get { - SparkleGit git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath, - "config --global core.excludesfile"); + private void AddWarnings () + { + SparkleGit git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath, + "config --global core.excludesfile"); - git.Start (); + git.Start (); - // Reading the standard output HAS to go before - // WaitForExit, or it will hang forever on output > 4096 bytes - string output = git.StandardOutput.ReadToEnd ().Trim (); - git.WaitForExit (); + // Reading the standard output HAS to go before + // WaitForExit, or it will hang forever on output > 4096 bytes + string output = git.StandardOutput.ReadToEnd ().Trim (); + git.WaitForExit (); - if (string.IsNullOrEmpty (output)) { - return null; + if (string.IsNullOrEmpty (output)) { + return; - } else { - return new string [] { - string.Format ("You seem to have configured a system ‘gitignore’ file. " + - "This may interfere with SparkleShare.\n({0})", output) - }; - } + } else { + Warnings = new string [] { + string.Format ("You seem to have configured a system ‘gitignore’ file. " + + "This may interfere with SparkleShare.\n({0})", output) + }; } } + public override void Stop () { if (this.git != null && !this.git.HasExited) { @@ -176,7 +176,7 @@ namespace SparkleLib { this.git.Dispose (); } - base.Stop (); + Dispose (); } @@ -184,7 +184,7 @@ namespace SparkleLib { // the newly cloned repository private void InstallConfiguration () { - string repo_config_file_path = SparkleHelpers.CombineMore (base.target_folder, ".git", "config"); + string repo_config_file_path = SparkleHelpers.CombineMore (TargetFolder, ".git", "config"); string config = String.Join (Environment.NewLine, File.ReadAllLines (repo_config_file_path)); string n = Environment.NewLine; @@ -220,7 +220,7 @@ namespace SparkleLib { private void InstallExcludeRules () { DirectoryInfo info = Directory.CreateDirectory ( - SparkleHelpers.CombineMore (this.target_folder, ".git", "info")); + SparkleHelpers.CombineMore (TargetFolder, ".git", "info")); // File that lists the files we want git to ignore string exclude_rules_file_path = Path.Combine (info.FullName, "exclude"); diff --git a/SparkleLib/Git/SparkleGit.cs b/SparkleLib/Git/SparkleGit.cs index a2390f69..83e3460f 100644 --- a/SparkleLib/Git/SparkleGit.cs +++ b/SparkleLib/Git/SparkleGit.cs @@ -16,6 +16,7 @@ using System; +using System.IO; using System.Diagnostics; namespace SparkleLib { @@ -23,28 +24,58 @@ namespace SparkleLib { public class SparkleGit : Process { public static string ExecPath = null; + public static string Path = null; public SparkleGit (string path, string args) : base () { + Path = LocateGit (); + EnableRaisingEvents = true; - StartInfo.FileName = SparkleBackend.DefaultBackend.Path; + StartInfo.FileName = Path; StartInfo.RedirectStandardOutput = true; StartInfo.UseShellExecute = false; StartInfo.WorkingDirectory = path; StartInfo.CreateNoWindow = true; - if (!string.IsNullOrEmpty (ExecPath)) - StartInfo.Arguments = "--exec-path=\"" + ExecPath + "\" " + args; - else + if (string.IsNullOrEmpty (ExecPath)) StartInfo.Arguments = args; + else + StartInfo.Arguments = "--exec-path=\"" + ExecPath + "\" " + args; } new public void Start () { SparkleHelpers.DebugInfo ("Cmd", "git " + StartInfo.Arguments); - base.Start (); + + try { + base.Start (); + + } catch (Exception e) { + SparkleHelpers.DebugInfo ("Cmd", "There's a problem running Git: " + e.Message); + Environment.Exit (-1); + } + } + + + private string LocateGit () + { + if (!string.IsNullOrEmpty (Path)) + return Path; + + string [] possible_git_paths = new string [] { + "/usr/bin/git", + "/usr/local/bin/git", + "/opt/local/bin/git", + "/usr/local/git/bin/git" + }; + + foreach (string path in possible_git_paths) + if (File.Exists (path)) + return path; + + return "git"; } } } diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 52e166a8..4f7bfadd 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -17,10 +17,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; -using System.Xml; namespace SparkleLib { @@ -63,7 +61,7 @@ namespace SparkleLib { public override List ExcludePaths { get { List rules = new List (); - rules.Add (Path.DirectorySeparatorChar + ".git"); + rules.Add (".git"); return rules; } @@ -98,12 +96,12 @@ namespace SparkleLib { } - private void CalculateSizes () + private void UpdateSizes () { - double size = CalculateSize ( + double size = CalculateSizes ( new DirectoryInfo (LocalPath)); - double history_size = CalculateSize ( + double history_size = CalculateSizes ( new DirectoryInfo (Path.Combine (LocalPath, ".git"))); string size_file_path = new string [] {LocalPath, ".git", "repo_size"}.Combine (); @@ -167,32 +165,36 @@ namespace SparkleLib { } - public override bool CheckForRemoteChanges () + public override bool HasRemoteChanges { - SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Checking for remote changes..."); - SparkleGit git = new SparkleGit (LocalPath, "ls-remote " + Url + " master"); + get { + SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Checking for remote changes..."); + SparkleGit git = new SparkleGit (LocalPath, "ls-remote " + Url + " master"); + + git.Start (); + git.WaitForExit (); + + if (git.ExitCode != 0) + return false; + + string remote_revision = git.StandardOutput.ReadToEnd ().TrimEnd (); + + if (!remote_revision.StartsWith (CurrentRevision)) { + SparkleHelpers.DebugInfo ("Git", + "[" + Name + "] Remote changes found. (" + remote_revision + ")"); - git.Start (); - git.WaitForExit (); + return true; - if (git.ExitCode != 0) - return false; - - string remote_revision = git.StandardOutput.ReadToEnd ().TrimEnd (); - - if (!remote_revision.StartsWith (CurrentRevision)) { - SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_revision + ")"); - return true; - - } else { - return false; + } else { + return false; + } } } public override bool SyncUp () { - if (AnyDifferences) { + if (HasLocalChanges) { Add (); string message = FormatCommitMessage (); @@ -242,13 +244,13 @@ namespace SparkleLib { if (number >= percentage) { percentage = number; - base.OnSyncProgressChanged (percentage, speed); + base.OnProgressChanged (percentage, speed); } } git.WaitForExit (); - CalculateSizes (); + UpdateSizes (); if (git.ExitCode == 0) return true; @@ -299,13 +301,13 @@ namespace SparkleLib { if (number >= percentage) { percentage = number; - base.OnSyncProgressChanged (percentage, speed); + base.OnProgressChanged (percentage, speed); } } git.WaitForExit (); - CalculateSizes (); + UpdateSizes (); if (git.ExitCode == 0) { Rebase (); @@ -317,7 +319,7 @@ namespace SparkleLib { } - public override bool AnyDifferences { + public override bool HasLocalChanges { get { PrepareDirectories (LocalPath); @@ -412,7 +414,7 @@ namespace SparkleLib { { DisableWatching (); - if (AnyDifferences) { + if (HasLocalChanges) { Add (); string commit_message = FormatCommitMessage (); @@ -427,7 +429,7 @@ namespace SparkleLib { if (git.ExitCode != 0) { SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out..."); - while (AnyDifferences) + while (HasLocalChanges) ResolveConflict (); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved."); @@ -653,7 +655,8 @@ namespace SparkleLib { string to_file_path; if (file_path.EndsWith (".empty")) - file_path = file_path.Substring (0, file_path.Length - ".empty".Length); + file_path = file_path.Substring (0, + file_path.Length - ".empty".Length); if (change_type.Equals ("A") && !file_path.Contains (".notes")) { change_set.Added.Add (file_path); @@ -669,6 +672,14 @@ namespace SparkleLib { file_path = entry_line.Substring (42, tab_pos - 42); to_file_path = entry_line.Substring (tab_pos + 1); + if (file_path.EndsWith (".empty")) + file_path = file_path.Substring (0, + file_path.Length - ".empty".Length); + + if (to_file_path.EndsWith (".empty")) + to_file_path = to_file_path.Substring (0, + to_file_path.Length - ".empty".Length); + change_set.MovedFrom.Add (file_path); change_set.MovedTo.Add (to_file_path); } @@ -807,34 +818,15 @@ namespace SparkleLib { } - public override bool UsesNotificationCenter - { - get { - string file_path = SparkleHelpers.CombineMore (LocalPath, ".git", "disable_notification_center"); - return !File.Exists (file_path); - } - } - - - public override void CreateInitialChangeSet () - { - base.CreateInitialChangeSet (); - SyncUp (); - } - - // Recursively gets a folder's size in bytes - public override double CalculateSize (DirectoryInfo parent) + private double CalculateSizes (DirectoryInfo parent) { if (!Directory.Exists (parent.ToString ())) return 0; double size = 0; - // Ignore the temporary 'rebase-apply' and '.tmp' directories. This prevents potential - // crashes when files are being queried whilst the files have already been deleted. - if (parent.Name.Equals ("rebase-apply") || - parent.Name.Equals (".tmp")) + if (parent.Name.Equals ("rebase-apply")) return 0; try { @@ -846,7 +838,7 @@ namespace SparkleLib { } foreach (DirectoryInfo directory in parent.GetDirectories ()) - size += CalculateSize (directory); + size += CalculateSizes (directory); } catch (Exception) { return 0; diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am index 92a45ea8..30484fe1 100755 --- a/SparkleLib/Makefile.am +++ b/SparkleLib/Makefile.am @@ -6,6 +6,7 @@ SOURCES = \ Git/SparkleFetcherGit.cs \ Git/SparkleGit.cs \ Git/SparkleRepoGit.cs \ + SparkleAnnouncement.cs \ SparkleBackend.cs \ SparkleChangeSet.cs \ SparkleConfig.cs \ @@ -13,6 +14,7 @@ SOURCES = \ SparkleFetcherBase.cs \ SparkleHelpers.cs \ SparkleListenerBase.cs \ + SparkleListenerFactory.cs \ SparkleListenerTcp.cs \ SparkleRepoBase.cs \ SparkleWatcher.cs diff --git a/SparkleLib/SparkleAnnouncement.cs b/SparkleLib/SparkleAnnouncement.cs new file mode 100644 index 00000000..9ec5cf56 --- /dev/null +++ b/SparkleLib/SparkleAnnouncement.cs @@ -0,0 +1,34 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; + +namespace SparkleLib { + + public class SparkleAnnouncement { + + public readonly string FolderIdentifier; + public readonly string Message; + + + public SparkleAnnouncement (string folder_identifier, string message) + { + FolderIdentifier = folder_identifier; + Message = message; + } + } +} diff --git a/SparkleLib/SparkleBackend.cs b/SparkleLib/SparkleBackend.cs index c916fa83..8efe332c 100755 --- a/SparkleLib/SparkleBackend.cs +++ b/SparkleLib/SparkleBackend.cs @@ -21,40 +21,7 @@ using System.Runtime.InteropServices; namespace SparkleLib { - public class SparkleBackend { - - public static SparkleBackend DefaultBackend = new SparkleBackendGit (); - - public string Name; - public string Path; - - - public SparkleBackend (string name, string [] paths) - { - Name = name; - Path = "git"; - - foreach (string path in paths) { - if (File.Exists (path)) { - Path = path; - break; - } - } - } - - - public bool IsPresent { - get { - return (Path != null); - } - } - - - public bool IsUsablePath (string path) - { - return (path.Length > 0); - } - + public static class SparkleBackend { public static string Version { get { @@ -65,7 +32,7 @@ namespace SparkleLib { // Strange magic needed by Platform () [DllImport ("libc")] - static extern int uname (IntPtr buf); + private static extern int uname (IntPtr buf); // This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform, @@ -90,44 +57,4 @@ namespace SparkleLib { } } } - - - public class SparkleBackendGit : SparkleBackend { - - private static string name = "Git"; - private static string [] paths = new string [] { - "/opt/local/bin/git", - "/usr/bin/git", - "/usr/local/bin/git", - "/usr/local/git/bin/git" - }; - - public SparkleBackendGit () : base (name, paths) { } - - } - - - public class SparkleBackendHg : SparkleBackend { - - private static string name = "Hg"; - private static string [] paths = new string [] { - "/opt/local/bin/hg", - "/usr/bin/hg" - }; - - public SparkleBackendHg () : base (name, paths) { } - - } - - - public class SparkleBackendScp : SparkleBackend { - - private static string name = "Scp"; - private static string [] paths = new string [] { - "/usr/bin/scp" - }; - - public SparkleBackendScp () : base (name, paths) { } - - } } diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 4ab51170..9cbc5e2c 100755 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -29,6 +29,7 @@ namespace SparkleLib { Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "sparkleshare"); + // TODO: declare elsewhere public static SparkleConfig DefaultConfig = new SparkleConfig (default_config_path, "config.xml"); public static bool DebugMode = true; diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs index da7ce962..ec01fba5 100755 --- a/SparkleLib/SparkleFetcherBase.cs +++ b/SparkleLib/SparkleFetcherBase.cs @@ -16,9 +16,7 @@ using System; -using System.Diagnostics; using System.IO; -using System.Security.AccessControl; using System.Text.RegularExpressions; using System.Threading; @@ -37,18 +35,21 @@ namespace SparkleLib { public event FailedEventHandler Failed; public event ProgressChangedEventHandler ProgressChanged; - public string [] ExcludeRules; + public abstract bool Fetch (); + public abstract void Stop (); - protected string target_folder; - protected string remote_url; + public string TargetFolder; + public string RemoteUrl; + public string [] ExcludeRules; + public string [] Warnings; private Thread thread; public SparkleFetcherBase (string server, string remote_folder, string target_folder) { - this.target_folder = target_folder; - this.remote_url = server + "/" + remote_folder; + TargetFolder = target_folder; + RemoteUrl = server + "/" + remote_folder; ExcludeRules = new string [] { // gedit and emacs @@ -121,22 +122,18 @@ namespace SparkleLib { } - public abstract bool Fetch (); - public abstract string [] Warnings { get; } - - // Clones the remote repository public void Start () { - SparkleHelpers.DebugInfo ("Fetcher", "[" + this.target_folder + "] Fetching folder: " + this.remote_url); + SparkleHelpers.DebugInfo ("Fetcher", "[" + TargetFolder + "] Fetching folder: " + RemoteUrl); if (Started != null) Started (); - if (Directory.Exists (this.target_folder)) - Directory.Delete (this.target_folder, true); + if (Directory.Exists (TargetFolder)) + Directory.Delete (TargetFolder, true); - string host = GetHost (this.remote_url); + string host = GetHost (RemoteUrl); if (String.IsNullOrEmpty (host)) { if (Failed != null) @@ -170,20 +167,6 @@ namespace SparkleLib { } - public virtual void Stop () - { - this.thread.Abort (); - this.thread.Join (); - } - - - public string RemoteUrl { - get { - return this.remote_url; - } - } - - public void Dispose () { if (this.thread != null) { diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj index 1c708116..211a786a 100755 --- a/SparkleLib/SparkleLib.csproj +++ b/SparkleLib/SparkleLib.csproj @@ -40,12 +40,14 @@ + - + + diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs index 6d370bf5..5e92143a 100755 --- a/SparkleLib/SparkleListenerBase.cs +++ b/SparkleLib/SparkleListenerBase.cs @@ -16,76 +16,11 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Timers; -using System.Linq; namespace SparkleLib { - public class SparkleAnnouncement { - - public readonly string FolderIdentifier; - public readonly string Message; - - - public SparkleAnnouncement (string folder_identifier, string message) - { - FolderIdentifier = folder_identifier; - Message = message; - } - } - - - public static class SparkleListenerFactory { - - private static List listeners = new List (); - - public static SparkleListenerBase CreateListener (string folder_name, string folder_identifier) - { - string uri = SparkleConfig.DefaultConfig.GetFolderOptionalAttribute ( - folder_name, "announcements_url"); - - if (uri == null) { - // This is SparkleShare's centralized notification service. - // Don't worry, we only use this server as a backup if you - // don't have your own. All data needed to connect is hashed and - // we don't store any personal information ever - - uri = "tcp://notifications.sparkleshare.org:1986"; - } - - Uri announce_uri = new Uri (uri); - - // We use only one listener per server to keep - // the number of connections as low as possible - foreach (SparkleListenerBase listener in listeners) { - if (listener.Server.Equals (announce_uri)) { - SparkleHelpers.DebugInfo ("ListenerFactory", - "Refered to existing listener for " + announce_uri); - - listener.AlsoListenToBase (folder_identifier); - return (SparkleListenerBase) listener; - } - } - - // Create a new listener with the appropriate - // type if one doesn't exist yet for that server - switch (announce_uri.Scheme) { - case "tcp": - listeners.Add (new SparkleListenerTcp (announce_uri, folder_identifier)); - break; - default: - listeners.Add (new SparkleListenerTcp (announce_uri, folder_identifier)); - break; - } - - SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + announce_uri); - return (SparkleListenerBase) listeners [listeners.Count - 1]; - } - } - - // A persistent connection to the server that // listens for change notifications public abstract class SparkleListenerBase { @@ -105,8 +40,8 @@ namespace SparkleLib { public abstract void Connect (); public abstract bool IsConnected { get; } public abstract bool IsConnecting { get; } - protected abstract void Announce (SparkleAnnouncement announcent); - protected abstract void AlsoListenTo (string folder_identifier); + protected abstract void AnnounceInternal (SparkleAnnouncement announcent); + protected abstract void AlsoListenToInternal (string folder_identifier); protected List channels = new List (); @@ -143,7 +78,7 @@ namespace SparkleLib { } - public void AnnounceBase (SparkleAnnouncement announcement) + public void Announce (SparkleAnnouncement announcement) { if (!IsRecentAnnouncement (announcement)) { if (IsConnected) { @@ -151,7 +86,7 @@ namespace SparkleLib { "Announcing message " + announcement.Message + " to " + announcement.FolderIdentifier + " on " + Server); - Announce (announcement); + AnnounceInternal (announcement); AddRecentAnnouncement (announcement); } else { @@ -170,14 +105,14 @@ namespace SparkleLib { } - public void AlsoListenToBase (string channel) + public void AlsoListenTo (string channel) { if (!this.channels.Contains (channel) && IsConnected) { SparkleHelpers.DebugInfo ("Listener", "Subscribing to channel " + channel); this.channels.Add (channel); - AlsoListenTo (channel); + AlsoListenToInternal (channel); } } @@ -202,7 +137,7 @@ namespace SparkleLib { foreach (KeyValuePair item in this.queue_up) { SparkleAnnouncement announcement = item.Value; - AnnounceBase (announcement); + Announce (announcement); } this.queue_down.Clear (); @@ -210,9 +145,9 @@ namespace SparkleLib { } - public void OnDisconnected () + public void OnDisconnected (string message) { - SparkleHelpers.DebugInfo ("Listener", "Signal of " + Server + " lost"); + SparkleHelpers.DebugInfo ("Listener", "Disconnected from " + Server + ": " + message); if (Disconnected != null) Disconnected (); @@ -294,4 +229,3 @@ namespace SparkleLib { } } } - diff --git a/SparkleLib/SparkleListenerFactory.cs b/SparkleLib/SparkleListenerFactory.cs new file mode 100644 index 00000000..f6fabbcf --- /dev/null +++ b/SparkleLib/SparkleListenerFactory.cs @@ -0,0 +1,89 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.Collections.Generic; + +namespace SparkleLib { + + public static class SparkleListenerFactory { + + private static List listeners = new List (); + + + public static SparkleListenerBase CreateListener (string folder_name, string folder_identifier) + { + // Check if the user wants to use a global custom notification service + string uri = SparkleConfig.DefaultConfig.GetConfigOption ("announcements_url"); + + // Check if the user wants a use a custom notification service for this folder + if (string.IsNullOrEmpty (uri)) + uri = SparkleConfig.DefaultConfig.GetFolderOptionalAttribute ( + folder_name, "announcements_url"); + + // Fall back to the fallback service is neither is the case + if (string.IsNullOrEmpty (uri)) { + // This is SparkleShare's centralized notification service. + // It communicates "It's time to sync!" signals between clients. + // + // Here's how it works: the client listens to a channel (the + // folder identifier, a SHA-1 hash) for when it's time to sync. + // Clients also send the current revision hash to the channel + // for other clients to pick up when you've synced up any + // changes. + // + // Please see the SparkleShare wiki if you wish to run + // your own service instead + + uri = "tcp://notifications.sparkleshare.org:1986"; + } + + Uri announce_uri = new Uri (uri); + + // We use only one listener per notification service to keep + // the number of connections as low as possible + foreach (SparkleListenerBase listener in listeners) { + if (listener.Server.Equals (announce_uri)) { + SparkleHelpers.DebugInfo ("ListenerFactory", + "Refered to existing " + announce_uri.Scheme + + " listener for " + announce_uri); + + // We already seem to have a listener for this server, + // refer to the existing one instead + listener.AlsoListenTo (folder_identifier); + return (SparkleListenerBase) listener; + } + } + + // Create a new listener with the appropriate + // type if one doesn't exist yet for that server + switch (announce_uri.Scheme) { + case "tcp": + listeners.Add (new SparkleListenerTcp (announce_uri, folder_identifier)); + break; + default: + listeners.Add (new SparkleListenerTcp (announce_uri, folder_identifier)); + break; + } + + SparkleHelpers.DebugInfo ("ListenerFactory", + "Issued new " + announce_uri.Scheme + " listener for " + announce_uri); + + return (SparkleListenerBase) listeners [listeners.Count - 1]; + } + } +} diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs index 1849802c..1bb38a1d 100755 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -16,23 +16,20 @@ using System; -using System.IO; +using System.Net.Sockets; using System.Text; using System.Threading; -using System.Net.Sockets; -using System.Security.Cryptography; -using System.Collections.Generic; -using System.Xml.Serialization; namespace SparkleLib { public class SparkleListenerTcp : SparkleListenerBase { private Socket socket; - private Object socket_lock = new Object (); private Thread thread; - private bool is_connected = false; - private bool is_connecting = false; + private Object socket_lock = new Object (); + private bool is_connected = false; + private bool is_connecting = false; + private DateTime last_ping = DateTime.Now; public SparkleListenerTcp (Uri server, string folder_identifier) : @@ -60,83 +57,138 @@ namespace SparkleLib { // Starts a new thread and listens to the channel public override void Connect () { - SparkleHelpers.DebugInfo ("ListenerTcp", "Connecting to " + Server.Host); - this.is_connecting = true; this.thread = new Thread ( new ThreadStart (delegate { + int port = Server.Port; + + if (port < 0) + port = 1986; + try { - // Connect and subscribe to the channel - int port = Server.Port; - - if (port < 0) - port = 9999; - - lock (this.socket_lock) { this.socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { - - ReceiveTimeout = 30 * 1000 + ReceiveTimeout = 5 * 1000, + SendTimeout = 5 * 1000 }; + // Try to connect to the server this.socket.Connect (Server.Host, port); this.is_connecting = false; - this.is_connected = true; + this.is_connected = true; OnConnected (); - foreach (string channel in base.channels) { - SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - this.socket.Send (Encoding.UTF8.GetBytes ("subscribe " + channel + "\n")); - } + // Subscribe to channels of interest to us + foreach (string channel in base.channels) + AlsoListenToInternal (channel); } - - byte [] bytes = new byte [4096]; - - // List to the channels, this blocks the thread - while (this.socket.Connected) { - int bytes_read = this.socket.Receive (bytes); - - if (bytes_read > 0) { - string received = Encoding.UTF8.GetString (bytes); - string line = received.Substring (0, received.IndexOf ("\n")); - - if (!line.Contains ("!")) - continue; - - string folder_identifier = line.Substring (0, line.IndexOf ("!")); - string message = CleanMessage (line.Substring (line.IndexOf ("!") + 1)); - - if (!folder_identifier.Equals ("debug") && - !String.IsNullOrEmpty (message)) { - - OnAnnouncement (new SparkleAnnouncement (folder_identifier, message)); - } - - } else { - SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket"); - - lock (this.socket_lock) { - this.socket.Close (); - this.is_connected = false; - - OnDisconnected (); - } - } - } - - SparkleHelpers.DebugInfo ("ListenerTcp", "Disconnected from " + Server.Host); - } catch (SocketException e) { - SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message); - this.is_connected = false; + this.is_connected = false; this.is_connecting = false; - OnDisconnected (); + this.socket.Dispose (); + + OnDisconnected (e.Message); + return; + } + + + byte [] bytes = new byte [4096]; + int bytes_read = 0; + this.last_ping = DateTime.Now; + + // Wait for messages + while (this.is_connected) { + + // This blocks the thread + int i = 0; + while (this.socket.Available < 1) { + Thread.Sleep (1000); + i++; + + try { + // We've timed out, let's ping the server to + // see if the connection is still up + if (i == 180) { + SparkleHelpers.DebugInfo ("ListenerTcp", + "Pinging " + Server); + + byte [] ping_bytes = Encoding.UTF8.GetBytes ("ping\n"); + byte [] pong_bytes = new byte [4096]; + + lock (this.socket_lock) + this.socket.Send (ping_bytes); + + if (this.socket.Receive (pong_bytes) < 1) + // 10057 means "Socket is not connected" + throw new SocketException (10057); + + SparkleHelpers.DebugInfo ("ListenerTcp", + "Received pong from " + Server); + + i = 0; + this.last_ping = DateTime.Now; + + } else { + // Check when the last ping occured. If it's + // significantly longer than our regular interval the + // system likely woke up from sleep and we want to + // simulate a disconnect + int sleepiness = DateTime.Compare ( + this.last_ping.AddMilliseconds (180 * 1000 * 1.2), + DateTime.Now + ); + + if (sleepiness <= 0) { + SparkleHelpers.DebugInfo ("ListenerTcp", + "System woke up from sleep"); + + // 10057 means "Socket is not connected" + throw new SocketException (10057); + } + } + + // The ping failed: disconnect completely + } catch (SocketException) { + this.is_connected = false; + this.is_connecting = false;; + + this.socket.Dispose (); + + OnDisconnected ("Ping timeout"); + return; + } + } + + + if (this.socket.Available > 0) + lock (this.socket_lock) + bytes_read = this.socket.Receive (bytes); + + + // Parse the received message + if (bytes_read > 0) { + string received = Encoding.UTF8.GetString (bytes); + string line = received.Substring (0, received.IndexOf ("\n")); + + if (!line.Contains ("!")) + continue; + + string folder_identifier = line.Substring (0, line.IndexOf ("!")); + string message = CleanMessage (line.Substring (line.IndexOf ("!") + 1)); + + if (!folder_identifier.Equals ("debug") && + !String.IsNullOrEmpty (message)) { + + // We have a message! + OnAnnouncement (new SparkleAnnouncement (folder_identifier, message)); + } + } } }) ); @@ -145,28 +197,29 @@ namespace SparkleLib { } - protected override void AlsoListenTo (string folder_identifier) + protected override void AlsoListenToInternal (string folder_identifier) { + SparkleHelpers.DebugInfo ("ListenerTcp", + "Subscribing to channel " + folder_identifier + " on " + Server); + string to_send = "subscribe " + folder_identifier + "\n"; try { - lock (this.socket_lock) { + lock (this.socket_lock) this.socket.Send (Encoding.UTF8.GetBytes (to_send)); - } + + this.last_ping = DateTime.Now; } catch (SocketException e) { - SparkleHelpers.DebugInfo ("ListenerTcp", - "Could not connect to " + Server + ": " + e.Message); - this.is_connected = false; this.is_connecting = false; - OnDisconnected (); + OnDisconnected (e.Message); } } - protected override void Announce (SparkleAnnouncement announcement) + protected override void AnnounceInternal (SparkleAnnouncement announcement) { string to_send = "announce " + announcement.FolderIdentifier + " " + announcement.Message + "\n"; @@ -175,14 +228,13 @@ namespace SparkleLib { lock (this.socket_lock) this.socket.Send (Encoding.UTF8.GetBytes (to_send)); - } catch (SocketException e) { - SparkleHelpers.DebugInfo ("ListenerTcp", - "Could not connect to " + Server + ": " + e.Message); + this.last_ping = DateTime.Now; + } catch (SocketException e) { this.is_connected = false; this.is_connecting = false; - OnDisconnected (); + OnDisconnected (e.Message); } } diff --git a/SparkleLib/SparkleOptions.cs b/SparkleLib/SparkleOptions.cs deleted file mode 100755 index b071c429..00000000 --- a/SparkleLib/SparkleOptions.cs +++ /dev/null @@ -1,1101 +0,0 @@ -// -// Options.cs -// -// Authors: -// Jonathan Pryor -// -// Copyright (C) 2008 Novell (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// Compile With: -// gmcs -debug+ -r:System.Core Options.cs -o:NDesk.Options.dll -// gmcs -debug+ -d:LINQ -r:System.Core Options.cs -o:NDesk.Options.dll -// -// The LINQ version just changes the implementation of -// OptionSet.Parse(IEnumerable), and confers no semantic changes. - -// -// A Getopt::Long-inspired option parsing library for C#. -// -// NDesk.Options.OptionSet is built upon a key/value table, where the -// key is a option format string and the value is a delegate that is -// invoked when the format string is matched. -// -// Option format strings: -// Regex-like BNF Grammar: -// name: .+ -// type: [=:] -// sep: ( [^{}]+ | '{' .+ '}' )? -// aliases: ( name type sep ) ( '|' name type sep )* -// -// Each '|'-delimited name is an alias for the associated action. If the -// format string ends in a '=', it has a required value. If the format -// string ends in a ':', it has an optional value. If neither '=' or ':' -// is present, no value is supported. `=' or `:' need only be defined on one -// alias, but if they are provided on more than one they must be consistent. -// -// Each alias portion may also end with a "key/value separator", which is used -// to split option values if the option accepts > 1 value. If not specified, -// it defaults to '=' and ':'. If specified, it can be any character except -// '{' and '}' OR the *string* between '{' and '}'. If no separator should be -// used (i.e. the separate values should be distinct arguments), then "{}" -// should be used as the separator. -// -// Options are extracted either from the current option by looking for -// the option name followed by an '=' or ':', or is taken from the -// following option IFF: -// - The current option does not contain a '=' or a ':' -// - The current option requires a value (i.e. not a Option type of ':') -// -// The `name' used in the option format string does NOT include any leading -// option indicator, such as '-', '--', or '/'. All three of these are -// permitted/required on any named option. -// -// Option bundling is permitted so long as: -// - '-' is used to start the option group -// - all of the bundled options are a single character -// - at most one of the bundled options accepts a value, and the value -// provided starts from the next character to the end of the string. -// -// This allows specifying '-a -b -c' as '-abc', and specifying '-D name=value' -// as '-Dname=value'. -// -// Option processing is disabled by specifying "--". All options after "--" -// are returned by OptionSet.Parse() unchanged and unprocessed. -// -// Unprocessed options are returned from OptionSet.Parse(). -// -// Examples: -// int verbose = 0; -// OptionSet p = new OptionSet () -// .Add ("v", v => ++verbose) -// .Add ("name=|value=", v => Console.WriteLine (v)); -// p.Parse (new string[]{"-v", "--v", "/v", "-name=A", "/name", "B", "extra"}); -// -// The above would parse the argument string array, and would invoke the -// lambda expression three times, setting `verbose' to 3 when complete. -// It would also print out "A" and "B" to standard output. -// The returned array would contain the string "extra". -// -// C# 3.0 collection initializers are supported and encouraged: -// var p = new OptionSet () { -// { "h|?|help", v => ShowHelp () }, -// }; -// -// System.ComponentModel.TypeConverter is also supported, allowing the use of -// custom data types in the callback type; TypeConverter.ConvertFromString() -// is used to convert the value option to an instance of the specified -// type: -// -// var p = new OptionSet () { -// { "foo=", (Foo f) => Console.WriteLine (f.ToString ()) }, -// }; -// -// Random other tidbits: -// - Boolean options (those w/o '=' or ':' in the option format string) -// are explicitly enabled if they are followed with '+', and explicitly -// disabled if they are followed with '-': -// string a = null; -// var p = new OptionSet () { -// { "a", s => a = s }, -// }; -// p.Parse (new string[]{"-a"}); // sets v != null -// p.Parse (new string[]{"-a+"}); // sets v != null -// p.Parse (new string[]{"-a-"}); // sets v == null -// - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Globalization; -using System.IO; -using System.Runtime.Serialization; -using System.Security.Permissions; -using System.Text; -using System.Text.RegularExpressions; - -#if LINQ -using System.Linq; -#endif - -#if TEST -using NDesk.Options; -#endif - -#if NDESK_OPTIONS -namespace NDesk.Options -#else -namespace SparkleLib.Options -#endif -{ - public class OptionValueCollection : IList, IList { - - List values = new List (); - OptionContext c; - - internal OptionValueCollection (OptionContext c) - { - this.c = c; - } - - #region ICollection - void ICollection.CopyTo (Array array, int index) {(values as ICollection).CopyTo (array, index);} - bool ICollection.IsSynchronized {get {return (values as ICollection).IsSynchronized;}} - object ICollection.SyncRoot {get {return (values as ICollection).SyncRoot;}} - #endregion - - #region ICollection - public void Add (string item) {values.Add (item);} - public void Clear () {values.Clear ();} - public bool Contains (string item) {return values.Contains (item);} - public void CopyTo (string[] array, int arrayIndex) {values.CopyTo (array, arrayIndex);} - public bool Remove (string item) {return values.Remove (item);} - public int Count {get {return values.Count;}} - public bool IsReadOnly {get {return false;}} - #endregion - - #region IEnumerable - IEnumerator IEnumerable.GetEnumerator () {return values.GetEnumerator ();} - #endregion - - #region IEnumerable - public IEnumerator GetEnumerator () {return values.GetEnumerator ();} - #endregion - - #region IList - int IList.Add (object value) {return (values as IList).Add (value);} - bool IList.Contains (object value) {return (values as IList).Contains (value);} - int IList.IndexOf (object value) {return (values as IList).IndexOf (value);} - void IList.Insert (int index, object value) {(values as IList).Insert (index, value);} - void IList.Remove (object value) {(values as IList).Remove (value);} - void IList.RemoveAt (int index) {(values as IList).RemoveAt (index);} - bool IList.IsFixedSize {get {return false;}} - object IList.this [int index] {get {return this [index];} set {(values as IList)[index] = value;}} - #endregion - - #region IList - public int IndexOf (string item) {return values.IndexOf (item);} - public void Insert (int index, string item) {values.Insert (index, item);} - public void RemoveAt (int index) {values.RemoveAt (index);} - - private void AssertValid (int index) - { - if (c.Option == null) - throw new InvalidOperationException ("OptionContext.Option is null."); - if (index >= c.Option.MaxValueCount) - throw new ArgumentOutOfRangeException ("index"); - if (c.Option.OptionValueType == OptionValueType.Required && - index >= values.Count) - throw new OptionException (string.Format ( - c.OptionSet.MessageLocalizer ("Missing required value for option '{0}'."), c.OptionName), - c.OptionName); - } - - public string this [int index] { - get { - AssertValid (index); - return index >= values.Count ? null : values [index]; - } - set { - values [index] = value; - } - } - #endregion - - public List ToList () - { - return new List (values); - } - - public string[] ToArray () - { - return values.ToArray (); - } - - public override string ToString () - { - return string.Join (", ", values.ToArray ()); - } - } - - public class OptionContext { - private Option option; - private string name; - private int index; - private OptionSet set; - private OptionValueCollection c; - - public OptionContext (OptionSet set) - { - this.set = set; - this.c = new OptionValueCollection (this); - } - - public Option Option { - get {return option;} - set {option = value;} - } - - public string OptionName { - get {return name;} - set {name = value;} - } - - public int OptionIndex { - get {return index;} - set {index = value;} - } - - public OptionSet OptionSet { - get {return set;} - } - - public OptionValueCollection OptionValues { - get {return c;} - } - } - - public enum OptionValueType { - None, - Optional, - Required, - } - - public abstract class Option { - string prototype, description; - string[] names; - OptionValueType type; - int count; - string[] separators; - - protected Option (string prototype, string description) - : this (prototype, description, 1) - { - } - - protected Option (string prototype, string description, int maxValueCount) - { - if (prototype == null) - throw new ArgumentNullException ("prototype"); - if (prototype.Length == 0) - throw new ArgumentException ("Cannot be the empty string.", "prototype"); - if (maxValueCount < 0) - throw new ArgumentOutOfRangeException ("maxValueCount"); - - this.prototype = prototype; - this.names = prototype.Split ('|'); - this.description = description; - this.count = maxValueCount; - this.type = ParsePrototype (); - - if (this.count == 0 && type != OptionValueType.None) - throw new ArgumentException ( - "Cannot provide maxValueCount of 0 for OptionValueType.Required or " + - "OptionValueType.Optional.", - "maxValueCount"); - if (this.type == OptionValueType.None && maxValueCount > 1) - throw new ArgumentException ( - string.Format ("Cannot provide maxValueCount of {0} for OptionValueType.None.", maxValueCount), - "maxValueCount"); - if (Array.IndexOf (names, "<>") >= 0 && - ((names.Length == 1 && this.type != OptionValueType.None) || - (names.Length > 1 && this.MaxValueCount > 1))) - throw new ArgumentException ( - "The default option handler '<>' cannot require values.", - "prototype"); - } - - public string Prototype {get {return prototype;}} - public string Description {get {return description;}} - public OptionValueType OptionValueType {get {return type;}} - public int MaxValueCount {get {return count;}} - - public string[] GetNames () - { - return (string[]) names.Clone (); - } - - public string[] GetValueSeparators () - { - if (separators == null) - return new string [0]; - return (string[]) separators.Clone (); - } - - protected static T Parse (string value, OptionContext c) - { - Type tt = typeof (T); - bool nullable = tt.IsValueType && tt.IsGenericType && - !tt.IsGenericTypeDefinition && - tt.GetGenericTypeDefinition () == typeof (Nullable<>); - Type targetType = nullable ? tt.GetGenericArguments () [0] : typeof (T); - TypeConverter conv = TypeDescriptor.GetConverter (targetType); - T t = default (T); - try { - if (value != null) - t = (T) conv.ConvertFromString (value); - } - catch (Exception e) { - throw new OptionException ( - string.Format ( - c.OptionSet.MessageLocalizer ("Could not convert string `{0}' to type {1} for option `{2}'."), - value, targetType.Name, c.OptionName), - c.OptionName, e); - } - return t; - } - - internal string[] Names {get {return names;}} - internal string[] ValueSeparators {get {return separators;}} - - static readonly char[] NameTerminator = new char[]{'=', ':'}; - - private OptionValueType ParsePrototype () - { - char type = '\0'; - List seps = new List (); - for (int i = 0; i < names.Length; ++i) { - string name = names [i]; - if (name.Length == 0) - throw new ArgumentException ("Empty option names are not supported.", "prototype"); - - int end = name.IndexOfAny (NameTerminator); - if (end == -1) - continue; - names [i] = name.Substring (0, end); - if (type == '\0' || type == name [end]) - type = name [end]; - else - throw new ArgumentException ( - string.Format ("Conflicting option types: '{0}' vs. '{1}'.", type, name [end]), - "prototype"); - AddSeparators (name, end, seps); - } - - if (type == '\0') - return OptionValueType.None; - - if (count <= 1 && seps.Count != 0) - throw new ArgumentException ( - string.Format ("Cannot provide key/value separators for Options taking {0} value(s).", count), - "prototype"); - if (count > 1) { - if (seps.Count == 0) - this.separators = new string[]{":", "="}; - else if (seps.Count == 1 && seps [0].Length == 0) - this.separators = null; - else - this.separators = seps.ToArray (); - } - - return type == '=' ? OptionValueType.Required : OptionValueType.Optional; - } - - private static void AddSeparators (string name, int end, ICollection seps) - { - int start = -1; - for (int i = end+1; i < name.Length; ++i) { - switch (name [i]) { - case '{': - if (start != -1) - throw new ArgumentException ( - string.Format ("Ill-formed name/value separator found in \"{0}\".", name), - "prototype"); - start = i+1; - break; - case '}': - if (start == -1) - throw new ArgumentException ( - string.Format ("Ill-formed name/value separator found in \"{0}\".", name), - "prototype"); - seps.Add (name.Substring (start, i-start)); - start = -1; - break; - default: - if (start == -1) - seps.Add (name [i].ToString ()); - break; - } - } - if (start != -1) - throw new ArgumentException ( - string.Format ("Ill-formed name/value separator found in \"{0}\".", name), - "prototype"); - } - - public void Invoke (OptionContext c) - { - OnParseComplete (c); - c.OptionName = null; - c.Option = null; - c.OptionValues.Clear (); - } - - protected abstract void OnParseComplete (OptionContext c); - - public override string ToString () - { - return Prototype; - } - } - - [Serializable] - public class OptionException : Exception { - private string option; - - public OptionException () - { - } - - public OptionException (string message, string optionName) - : base (message) - { - this.option = optionName; - } - - public OptionException (string message, string optionName, Exception innerException) - : base (message, innerException) - { - this.option = optionName; - } - - protected OptionException (SerializationInfo info, StreamingContext context) - : base (info, context) - { - this.option = info.GetString ("OptionName"); - } - - public string OptionName { - get {return this.option;} - } - - [SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)] - public override void GetObjectData (SerializationInfo info, StreamingContext context) - { - base.GetObjectData (info, context); - info.AddValue ("OptionName", option); - } - } - - public delegate void OptionAction (TKey key, TValue value); - - public class OptionSet : KeyedCollection - { - public OptionSet () - : this (delegate (string f) {return f;}) - { - } - - public OptionSet (Converter localizer) - { - this.localizer = localizer; - } - - Converter localizer; - - public Converter MessageLocalizer { - get {return localizer;} - } - - protected override string GetKeyForItem (Option item) - { - if (item == null) - throw new ArgumentNullException ("option"); - if (item.Names != null && item.Names.Length > 0) - return item.Names [0]; - // This should never happen, as it's invalid for Option to be - // constructed w/o any names. - throw new InvalidOperationException ("Option has no names!"); - } - - [Obsolete ("Use KeyedCollection.this[string]")] - protected Option GetOptionForName (string option) - { - if (option == null) - throw new ArgumentNullException ("option"); - try { - return base [option]; - } - catch (KeyNotFoundException) { - return null; - } - } - - protected override void InsertItem (int index, Option item) - { - base.InsertItem (index, item); - AddImpl (item); - } - - protected override void RemoveItem (int index) - { - base.RemoveItem (index); - Option p = Items [index]; - // KeyedCollection.RemoveItem() handles the 0th item - for (int i = 1; i < p.Names.Length; ++i) { - Dictionary.Remove (p.Names [i]); - } - } - - protected override void SetItem (int index, Option item) - { - base.SetItem (index, item); - RemoveItem (index); - AddImpl (item); - } - - private void AddImpl (Option option) - { - if (option == null) - throw new ArgumentNullException ("option"); - List added = new List (option.Names.Length); - try { - // KeyedCollection.InsertItem/SetItem handle the 0th name. - for (int i = 1; i < option.Names.Length; ++i) { - Dictionary.Add (option.Names [i], option); - added.Add (option.Names [i]); - } - } - catch (Exception) { - foreach (string name in added) - Dictionary.Remove (name); - throw; - } - } - - public new OptionSet Add (Option option) - { - base.Add (option); - return this; - } - - sealed class ActionOption : Option { - Action action; - - public ActionOption (string prototype, string description, int count, Action action) - : base (prototype, description, count) - { - if (action == null) - throw new ArgumentNullException ("action"); - this.action = action; - } - - protected override void OnParseComplete (OptionContext c) - { - action (c.OptionValues); - } - } - - public OptionSet Add (string prototype, Action action) - { - return Add (prototype, null, action); - } - - public OptionSet Add (string prototype, string description, Action action) - { - if (action == null) - throw new ArgumentNullException ("action"); - Option p = new ActionOption (prototype, description, 1, - delegate (OptionValueCollection v) { action (v [0]); }); - base.Add (p); - return this; - } - - public OptionSet Add (string prototype, OptionAction action) - { - return Add (prototype, null, action); - } - - public OptionSet Add (string prototype, string description, OptionAction action) - { - if (action == null) - throw new ArgumentNullException ("action"); - Option p = new ActionOption (prototype, description, 2, - delegate (OptionValueCollection v) {action (v [0], v [1]);}); - base.Add (p); - return this; - } - - sealed class ActionOption : Option { - Action action; - - public ActionOption (string prototype, string description, Action action) - : base (prototype, description, 1) - { - if (action == null) - throw new ArgumentNullException ("action"); - this.action = action; - } - - protected override void OnParseComplete (OptionContext c) - { - action (Parse (c.OptionValues [0], c)); - } - } - - sealed class ActionOption : Option { - OptionAction action; - - public ActionOption (string prototype, string description, OptionAction action) - : base (prototype, description, 2) - { - if (action == null) - throw new ArgumentNullException ("action"); - this.action = action; - } - - protected override void OnParseComplete (OptionContext c) - { - action ( - Parse (c.OptionValues [0], c), - Parse (c.OptionValues [1], c)); - } - } - - public OptionSet Add (string prototype, Action action) - { - return Add (prototype, null, action); - } - - public OptionSet Add (string prototype, string description, Action action) - { - return Add (new ActionOption (prototype, description, action)); - } - - public OptionSet Add (string prototype, OptionAction action) - { - return Add (prototype, null, action); - } - - public OptionSet Add (string prototype, string description, OptionAction action) - { - return Add (new ActionOption (prototype, description, action)); - } - - protected virtual OptionContext CreateOptionContext () - { - return new OptionContext (this); - } - -#if LINQ - public List Parse (IEnumerable arguments) - { - bool process = true; - OptionContext c = CreateOptionContext (); - c.OptionIndex = -1; - var def = GetOptionForName ("<>"); - var unprocessed = - from argument in arguments - where ++c.OptionIndex >= 0 && (process || def != null) - ? process - ? argument == "--" - ? (process = false) - : !Parse (argument, c) - ? def != null - ? Unprocessed (null, def, c, argument) - : true - : false - : def != null - ? Unprocessed (null, def, c, argument) - : true - : true - select argument; - List r = unprocessed.ToList (); - if (c.Option != null) - c.Option.Invoke (c); - return r; - } -#else - public List Parse (IEnumerable arguments) - { - OptionContext c = CreateOptionContext (); - c.OptionIndex = -1; - bool process = true; - List unprocessed = new List (); - Option def = Contains ("<>") ? this ["<>"] : null; - foreach (string argument in arguments) { - ++c.OptionIndex; - if (argument == "--") { - process = false; - continue; - } - if (!process) { - Unprocessed (unprocessed, def, c, argument); - continue; - } - if (!Parse (argument, c)) - Unprocessed (unprocessed, def, c, argument); - } - if (c.Option != null) - c.Option.Invoke (c); - return unprocessed; - } -#endif - - private static bool Unprocessed (ICollection extra, Option def, OptionContext c, string argument) - { - if (def == null) { - extra.Add (argument); - return false; - } - c.OptionValues.Add (argument); - c.Option = def; - c.Option.Invoke (c); - return false; - } - - private readonly Regex ValueOption = new Regex ( - @"^(?--|-|/)(?[^:=]+)((?[:=])(?.*))?$"); - - protected bool GetOptionParts (string argument, out string flag, out string name, out string sep, out string value) - { - if (argument == null) - throw new ArgumentNullException ("argument"); - - flag = name = sep = value = null; - Match m = ValueOption.Match (argument); - if (!m.Success) { - return false; - } - flag = m.Groups ["flag"].Value; - name = m.Groups ["name"].Value; - if (m.Groups ["sep"].Success && m.Groups ["value"].Success) { - sep = m.Groups ["sep"].Value; - value = m.Groups ["value"].Value; - } - return true; - } - - protected virtual bool Parse (string argument, OptionContext c) - { - if (c.Option != null) { - ParseValue (argument, c); - return true; - } - - string f, n, s, v; - if (!GetOptionParts (argument, out f, out n, out s, out v)) - return false; - - Option p; - if (Contains (n)) { - p = this [n]; - c.OptionName = f + n; - c.Option = p; - switch (p.OptionValueType) { - case OptionValueType.None: - c.OptionValues.Add (n); - c.Option.Invoke (c); - break; - case OptionValueType.Optional: - case OptionValueType.Required: - ParseValue (v, c); - break; - } - return true; - } - // no match; is it a bool option? - if (ParseBool (argument, n, c)) - return true; - // is it a bundled option? - if (ParseBundledValue (f, string.Concat (n + s + v), c)) - return true; - - return false; - } - - private void ParseValue (string option, OptionContext c) - { - if (option != null) - foreach (string o in c.Option.ValueSeparators != null - ? option.Split (c.Option.ValueSeparators, StringSplitOptions.None) - : new string[]{option}) { - c.OptionValues.Add (o); - } - if (c.OptionValues.Count == c.Option.MaxValueCount || - c.Option.OptionValueType == OptionValueType.Optional) - c.Option.Invoke (c); - else if (c.OptionValues.Count > c.Option.MaxValueCount) { - throw new OptionException (localizer (string.Format ( - "Error: Found {0} option values when expecting {1}.", - c.OptionValues.Count, c.Option.MaxValueCount)), - c.OptionName); - } - } - - private bool ParseBool (string option, string n, OptionContext c) - { - Option p; - string rn; - if (n.Length >= 1 && (n [n.Length-1] == '+' || n [n.Length-1] == '-') && - Contains ((rn = n.Substring (0, n.Length-1)))) { - p = this [rn]; - string v = n [n.Length-1] == '+' ? option : null; - c.OptionName = option; - c.Option = p; - c.OptionValues.Add (v); - p.Invoke (c); - return true; - } - return false; - } - - private bool ParseBundledValue (string f, string n, OptionContext c) - { - if (f != "-") - return false; - for (int i = 0; i < n.Length; ++i) { - Option p; - string opt = f + n [i].ToString (); - string rn = n [i].ToString (); - if (!Contains (rn)) { - if (i == 0) - return false; - throw new OptionException (string.Format (localizer ( - "Cannot bundle unregistered option '{0}'."), opt), opt); - } - p = this [rn]; - switch (p.OptionValueType) { - case OptionValueType.None: - Invoke (c, opt, n, p); - break; - case OptionValueType.Optional: - case OptionValueType.Required: { - string v = n.Substring (i+1); - c.Option = p; - c.OptionName = opt; - ParseValue (v.Length != 0 ? v : null, c); - return true; - } - default: - throw new InvalidOperationException ("Unknown OptionValueType: " + p.OptionValueType); - } - } - return true; - } - - private static void Invoke (OptionContext c, string name, string value, Option option) - { - c.OptionName = name; - c.Option = option; - c.OptionValues.Add (value); - option.Invoke (c); - } - - private const int OptionWidth = 29; - - public void WriteOptionDescriptions (TextWriter o) - { - foreach (Option p in this) { - int written = 0; - if (!WriteOptionPrototype (o, p, ref written)) - continue; - - if (written < OptionWidth) - o.Write (new string (' ', OptionWidth - written)); - else { - o.WriteLine (); - o.Write (new string (' ', OptionWidth)); - } - - bool indent = false; - string prefix = new string (' ', OptionWidth+2); - foreach (string line in GetLines (localizer (GetDescription (p.Description)))) { - if (indent) - o.Write (prefix); - o.WriteLine (line); - indent = true; - } - } - } - - bool WriteOptionPrototype (TextWriter o, Option p, ref int written) - { - string[] names = p.Names; - - int i = GetNextOptionIndex (names, 0); - if (i == names.Length) - return false; - - if (names [i].Length == 1) { - Write (o, ref written, " -"); - Write (o, ref written, names [0]); - } - else { - Write (o, ref written, " --"); - Write (o, ref written, names [0]); - } - - for ( i = GetNextOptionIndex (names, i+1); - i < names.Length; i = GetNextOptionIndex (names, i+1)) { - Write (o, ref written, ", "); - Write (o, ref written, names [i].Length == 1 ? "-" : "--"); - Write (o, ref written, names [i]); - } - - if (p.OptionValueType == OptionValueType.Optional || - p.OptionValueType == OptionValueType.Required) { - if (p.OptionValueType == OptionValueType.Optional) { - Write (o, ref written, localizer ("[")); - } - Write (o, ref written, localizer ("=" + GetArgumentName (0, p.MaxValueCount, p.Description))); - string sep = p.ValueSeparators != null && p.ValueSeparators.Length > 0 - ? p.ValueSeparators [0] - : " "; - for (int c = 1; c < p.MaxValueCount; ++c) { - Write (o, ref written, localizer (sep + GetArgumentName (c, p.MaxValueCount, p.Description))); - } - if (p.OptionValueType == OptionValueType.Optional) { - Write (o, ref written, localizer ("]")); - } - } - return true; - } - - static int GetNextOptionIndex (string[] names, int i) - { - while (i < names.Length && names [i] == "<>") { - ++i; - } - return i; - } - - static void Write (TextWriter o, ref int n, string s) - { - n += s.Length; - o.Write (s); - } - - private static string GetArgumentName (int index, int maxIndex, string description) - { - if (description == null) - return maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1); - string[] nameStart; - if (maxIndex == 1) - nameStart = new string[]{"{0:", "{"}; - else - nameStart = new string[]{"{" + index + ":"}; - for (int i = 0; i < nameStart.Length; ++i) { - int start, j = 0; - do { - start = description.IndexOf (nameStart [i], j); - } while (start >= 0 && j != 0 ? description [j++ - 1] == '{' : false); - if (start == -1) - continue; - int end = description.IndexOf ("}", start); - if (end == -1) - continue; - return description.Substring (start + nameStart [i].Length, end - start - nameStart [i].Length); - } - return maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1); - } - - private static string GetDescription (string description) - { - if (description == null) - return string.Empty; - StringBuilder sb = new StringBuilder (description.Length); - int start = -1; - for (int i = 0; i < description.Length; ++i) { - switch (description [i]) { - case '{': - if (i == start) { - sb.Append ('{'); - start = -1; - } - else if (start < 0) - start = i + 1; - break; - case '}': - if (start < 0) { - if ((i+1) == description.Length || description [i+1] != '}') - throw new InvalidOperationException ("Invalid option description: " + description); - ++i; - sb.Append ("}"); - } - else { - sb.Append (description.Substring (start, i - start)); - start = -1; - } - break; - case ':': - if (start < 0) - goto default; - start = i + 1; - break; - default: - if (start < 0) - sb.Append (description [i]); - break; - } - } - return sb.ToString (); - } - - private static IEnumerable GetLines (string description) - { - if (string.IsNullOrEmpty (description)) { - yield return string.Empty; - yield break; - } - int length = 80 - OptionWidth - 1; - int start = 0, end; - do { - end = GetLineEnd (start, length, description); - char c = description [end-1]; - if (char.IsWhiteSpace (c)) - --end; - bool writeContinuation = end != description.Length && !IsEolChar (c); - string line = description.Substring (start, end - start) + - (writeContinuation ? "-" : ""); - yield return line; - start = end; - if (char.IsWhiteSpace (c)) - ++start; - length = 80 - OptionWidth - 2 - 1; - } while (end < description.Length); - } - - private static bool IsEolChar (char c) - { - return !char.IsLetterOrDigit (c); - } - - private static int GetLineEnd (int start, int length, string description) - { - int end = System.Math.Min (start + length, description.Length); - int sep = -1; - for (int i = start; i < end; ++i) { - if (description [i] == '\n') - return i+1; - if (IsEolChar (description [i])) - sep = i+1; - } - if (sep == -1 || end == description.Length) - return end; - return sep; - } - } -} - diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index 6cf73a1e..8d797c75 100755 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -23,7 +23,6 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Timers; -using System.Xml; namespace SparkleLib { @@ -39,45 +38,28 @@ namespace SparkleLib { private TimeSpan short_interval = new TimeSpan (0, 0, 3, 0); private TimeSpan long_interval = new TimeSpan (0, 0, 10, 0); - - private SparkleWatcher watcher; private TimeSpan poll_interval; + private SparkleWatcher watcher; + private SparkleListenerBase listener; private System.Timers.Timer local_timer = new System.Timers.Timer () { Interval = 0.25 * 1000 }; private System.Timers.Timer remote_timer = new System.Timers.Timer () { Interval = 10 * 1000 }; - private DateTime last_poll = DateTime.Now; - private List sizebuffer = new List (); - private bool has_changed = false; - private Object change_lock = new Object (); - private Object watch_lock = new Object (); - private double progress_percentage = 0.0; - private string progress_speed = ""; + private DateTime last_poll = DateTime.Now; + private List size_buffer = new List (); + private Object change_lock = new Object (); + private Object watch_lock = new Object (); + private double progress_percentage = 0.0; + private string progress_speed = ""; + private bool has_changed = false; + private bool is_buffering = false; + private bool server_online = true; + private SyncStatus status; - protected SparkleListenerBase listener; - protected SyncStatus status; - protected bool is_buffering = false; - protected bool server_online = true; - - public readonly string LocalPath; - public readonly string Name; - public readonly Uri Url; - - public abstract bool AnyDifferences { get; } - public abstract string Identifier { get; } - public abstract string CurrentRevision { get; } - public abstract bool SyncUp (); - public abstract bool SyncDown (); - public abstract double CalculateSize (DirectoryInfo parent); - public abstract bool HasUnsyncedChanges { get; set; } - public abstract List ExcludePaths { get; } - - public abstract double Size { get; } - public abstract double HistorySize { get; } public delegate void SyncStatusChangedEventHandler (SyncStatus new_status); public event SyncStatusChangedEventHandler SyncStatusChanged; - public delegate void SyncProgressChangedEventHandler (double percentage, string speed); - public event SyncProgressChangedEventHandler SyncProgressChanged; + public delegate void ProgressChangedEventHandler (double percentage, string speed); + public event ProgressChangedEventHandler ProgressChanged; public delegate void NewChangeSetEventHandler (SparkleChangeSet change_set); public event NewChangeSetEventHandler NewChangeSet; @@ -92,6 +74,68 @@ namespace SparkleLib { public event ChangesDetectedEventHandler ChangesDetected; + public readonly string LocalPath; + public readonly string Name; + public readonly Uri Url; + + public abstract string Identifier { get; } + public abstract string CurrentRevision { get; } + public abstract double Size { get; } + public abstract double HistorySize { get; } + public abstract List ExcludePaths { get; } + public abstract bool HasUnsyncedChanges { get; set; } + public abstract bool HasLocalChanges { get; } + public abstract bool HasRemoteChanges { get; } + public abstract bool SyncUp (); + public abstract bool SyncDown (); + public abstract List GetChangeSets (int count); + + + public bool ServerOnline { + get { + return this.server_online; + } + } + + public SyncStatus Status { + get { + return this.status; + } + } + + public double ProgressPercentage { + get { + return this.progress_percentage; + } + } + + public string ProgressSpeed { + get { + return this.progress_speed; + } + } + + public virtual string [] UnsyncedFilePaths { + get { + return new string [0]; + } + } + + public bool IsSyncing { + get { + return (Status == SyncStatus.SyncUp || + Status == SyncStatus.SyncDown || + this.is_buffering); + } + } + + public bool IsBuffering { + get { + return this.is_buffering; + } + } + + public SparkleRepoBase (string path) { LocalPath = path; @@ -121,7 +165,7 @@ namespace SparkleLib { if (time_to_poll) { this.last_poll = DateTime.Now; - if (CheckForRemoteChanges ()) + if (HasRemoteChanges) SyncDownBase (); } @@ -139,7 +183,7 @@ namespace SparkleLib { { // Sync up everything that changed // since we've been offline - if (AnyDifferences) { + if (HasLocalChanges) { DisableWatching (); SyncUpBase (); @@ -154,96 +198,15 @@ namespace SparkleLib { } - public bool ServerOnline { - get { - return this.server_online; - } - } - - - public SyncStatus Status { - get { - return this.status; - } - } - - - public double ProgressPercentage { - get { - return this.progress_percentage; - } - } - - - public string ProgressSpeed { - get { - return this.progress_speed; - } - } - - - public virtual string [] UnsyncedFilePaths { - get { - return new string [0]; - } - } - - - public string Domain { - get { - Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)"); - Match match = regex.Match (SparkleConfig.DefaultConfig.GetUrlForFolder (Name)); - - if (match.Success) - return match.Groups [2].Value; - else - return null; - } - } - - protected void OnConflictResolved () { - HasUnsyncedChanges = true; + HasUnsyncedChanges = true; // ? if (ConflictResolved != null) ConflictResolved (); } - public virtual bool CheckForRemoteChanges () // TODO: HasRemoteChanges { get; } - { - return true; - } - - - public virtual List GetChangeSets (int count) { - return null; - } - - - public virtual bool UsesNotificationCenter { - get { - return true; - } - } - - - public string RemoteName { - get { - string url = SparkleConfig.DefaultConfig.GetUrlForFolder (Name); - return Path.GetFileNameWithoutExtension (url); - } - } - - - public bool IsBuffering { - get { - return this.is_buffering; - } - } - - // Disposes all resourses of this object public void Dispose () { @@ -253,114 +216,6 @@ namespace SparkleLib { } - private void CreateWatcher () - { - this.watcher = new SparkleWatcher (LocalPath); - this.watcher.ChangeEvent += delegate (FileSystemEventArgs args) { - OnFileActivity (args); - }; - } - - - public void CreateListener () - { - this.listener = SparkleListenerFactory.CreateListener (Name, Identifier); - - if (this.listener.IsConnected) { - this.poll_interval = this.long_interval; - - new Thread (new ThreadStart (delegate { - if (!IsSyncing && CheckForRemoteChanges ()) - SyncDownBase (); - })).Start (); - } - - // Stop polling when the connection to the irc channel is succesful - this.listener.Connected += delegate { - this.poll_interval = this.long_interval; - this.last_poll = DateTime.Now; - - if (!IsSyncing) { - - // Check for changes manually one more time - if (CheckForRemoteChanges ()) - SyncDownBase (); - - // Push changes that were made since the last disconnect - if (HasUnsyncedChanges) - SyncUpBase (); - } - }; - - // Start polling when the connection to the irc channel is lost - this.listener.Disconnected += delegate { - this.poll_interval = this.short_interval; - SparkleHelpers.DebugInfo (Name, "Falling back to polling"); - }; - - // Fetch changes when there is a message in the irc channel - this.listener.Received += delegate (SparkleAnnouncement announcement) { - string identifier = Identifier; - - if (announcement.FolderIdentifier.Equals (identifier) && - !announcement.Message.Equals (CurrentRevision)) { - - while (this.IsSyncing) - System.Threading.Thread.Sleep (100); - - SparkleHelpers.DebugInfo ("Listener", "Syncing due to announcement"); - SyncDownBase (); - - } else { - if (announcement.FolderIdentifier.Equals (identifier)) - SparkleHelpers.DebugInfo ("Listener", "Not syncing, message is for current revision"); - } - }; - - // Start listening - if (!this.listener.IsConnected && !this.listener.IsConnecting) - this.listener.Connect (); - } - - - public bool IsSyncing { - get { - return (Status == SyncStatus.SyncUp || - Status == SyncStatus.SyncDown || - this.is_buffering); - } - } - - - private void CheckForChanges () - { - lock (this.change_lock) { - if (this.has_changed) { - if (this.sizebuffer.Count >= 4) - this.sizebuffer.RemoveAt (0); - - DirectoryInfo dir_info = new DirectoryInfo (LocalPath); - this.sizebuffer.Add (CalculateSize (dir_info)); - - if (this.sizebuffer.Count >= 4 && - this.sizebuffer [0].Equals (this.sizebuffer [1]) && - this.sizebuffer [1].Equals (this.sizebuffer [2]) && - this.sizebuffer [2].Equals (this.sizebuffer [3])) { - - SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Changes have settled."); - this.is_buffering = false; - this.has_changed = false; - - DisableWatching (); - while (AnyDifferences) - SyncUpBase (); - EnableWatching (); - } - } - } - } - - // Starts a timer when something changes public void OnFileActivity (FileSystemEventArgs args) { @@ -378,7 +233,7 @@ namespace SparkleLib { WatcherChangeTypes wct = args.ChangeType; - if (AnyDifferences) { + if (HasLocalChanges) { this.is_buffering = true; // We want to disable wathcing temporarily, but @@ -440,6 +295,44 @@ namespace SparkleLib { } + public void AddNote (string revision, string note) + { + string notes_path = Path.Combine (LocalPath, ".notes"); + + if (!Directory.Exists (notes_path)) + Directory.CreateDirectory (notes_path); + + // Add a timestamp in seconds since unix epoch + int timestamp = (int) (DateTime.UtcNow - new DateTime (1970, 1, 1)).TotalSeconds; + + string n = Environment.NewLine; + note = "" + n + + " " + n + + " " + SparkleConfig.DefaultConfig.User.Name + "" + n + + " " + SparkleConfig.DefaultConfig.User.Email + "" + n + + " " + n + + " " + timestamp + "" + n + + " " + note + "" + n + + "" + n; + + string note_name = revision + SHA1 (timestamp.ToString () + note); + string note_path = Path.Combine (notes_path, note_name); + + StreamWriter writer = new StreamWriter (note_path); + writer.Write (note); + writer.Close (); + + + // The watcher doesn't like .*/ so we need to trigger + // a change manually + FileSystemEventArgs args = new FileSystemEventArgs (WatcherChangeTypes.Changed, + notes_path, note_name); + + OnFileActivity (args); + SparkleHelpers.DebugInfo ("Note", "Added note to " + revision); + } + + private void SyncUpBase () { try { @@ -459,7 +352,7 @@ namespace SparkleLib { if (SyncStatusChanged != null) SyncStatusChanged (SyncStatus.Idle); - this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision)); + this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision)); } else { SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Error"); @@ -474,7 +367,7 @@ namespace SparkleLib { if (SyncStatusChanged != null) SyncStatusChanged (SyncStatus.Idle); - this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision)); + this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision)); } else { this.server_online = false; @@ -561,7 +454,106 @@ namespace SparkleLib { } - public void DisableWatching () + private void CreateWatcher () + { + this.watcher = new SparkleWatcher (LocalPath); + this.watcher.ChangeEvent += delegate (FileSystemEventArgs args) { + OnFileActivity (args); + }; + } + + + private void CreateListener () + { + this.listener = SparkleListenerFactory.CreateListener (Name, Identifier); + + if (this.listener.IsConnected) { + this.poll_interval = this.long_interval; + + new Thread (new ThreadStart (delegate { + if (!IsSyncing && HasRemoteChanges) + SyncDownBase (); + })).Start (); + } + + // Stop polling when the connection to the irc channel is succesful + this.listener.Connected += delegate { + this.poll_interval = this.long_interval; + this.last_poll = DateTime.Now; + + if (!IsSyncing) { + + // Check for changes manually one more time + if (HasRemoteChanges) + SyncDownBase (); + + // Push changes that were made since the last disconnect + if (HasUnsyncedChanges) + SyncUpBase (); + } + }; + + // Start polling when the connection to the irc channel is lost + this.listener.Disconnected += delegate { + this.poll_interval = this.short_interval; + SparkleHelpers.DebugInfo (Name, "Falling back to polling"); + }; + + // Fetch changes when there is a message in the irc channel + this.listener.Received += delegate (SparkleAnnouncement announcement) { + string identifier = Identifier; + + if (announcement.FolderIdentifier.Equals (identifier) && + !announcement.Message.Equals (CurrentRevision)) { + + while (this.IsSyncing) + System.Threading.Thread.Sleep (100); + + SparkleHelpers.DebugInfo ("Listener", "Syncing due to announcement"); + SyncDownBase (); + + } else { + if (announcement.FolderIdentifier.Equals (identifier)) + SparkleHelpers.DebugInfo ("Listener", "Not syncing, message is for current revision"); + } + }; + + // Start listening + if (!this.listener.IsConnected && !this.listener.IsConnecting) + this.listener.Connect (); + } + + + private void CheckForChanges () + { + lock (this.change_lock) { + if (this.has_changed) { + if (this.size_buffer.Count >= 4) + this.size_buffer.RemoveAt (0); + + DirectoryInfo dir_info = new DirectoryInfo (LocalPath); + this.size_buffer.Add (CalculateSize (dir_info)); + + if (this.size_buffer.Count >= 4 && + this.size_buffer [0].Equals (this.size_buffer [1]) && + this.size_buffer [1].Equals (this.size_buffer [2]) && + this.size_buffer [2].Equals (this.size_buffer [3])) { + + SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Changes have settled."); + this.is_buffering = false; + this.has_changed = false; + + DisableWatching (); + while (HasLocalChanges) + SyncUpBase (); + EnableWatching (); + } + } + } + } + + + protected void DisableWatching () { lock (this.watch_lock) { this.watcher.EnableRaisingEvents = false; @@ -570,7 +562,7 @@ namespace SparkleLib { } - public void EnableWatching () + protected void EnableWatching () { lock (this.watch_lock) { this.watcher.EnableRaisingEvents = true; @@ -579,17 +571,39 @@ namespace SparkleLib { } + private DateTime progress_last_change = DateTime.Now; + private TimeSpan progress_change_interval = new TimeSpan (0, 0, 0, 1); + + protected void OnProgressChanged (double progress_percentage, string progress_speed) + { + if (DateTime.Compare (this.progress_last_change, + DateTime.Now.Subtract (this.progress_change_interval)) < 0) { + + if (ProgressChanged != null) { + if (progress_percentage == 100.0) + progress_percentage = 99.0; + + this.progress_percentage = progress_percentage; + this.progress_speed = progress_speed; + this.progress_last_change = DateTime.Now; + + ProgressChanged (progress_percentage, progress_speed); + } + } + } + + // Create an initial change set when the // user has fetched an empty remote folder - public virtual void CreateInitialChangeSet () + private void CreateInitialChangeSet () { string file_path = Path.Combine (LocalPath, "SparkleShare.txt"); TextWriter writer = new StreamWriter (file_path); + writer.WriteLine ("Congratulations, you've successfully created a SparkleShare repository!"); writer.WriteLine (""); writer.WriteLine ("Any files you add or change in this folder will be automatically synced to "); - writer.WriteLine (SparkleConfig.DefaultConfig.GetUrlForFolder (Name) + " and everyone connected to it."); - // TODO: Url property? ^ + writer.WriteLine (Url + " and everyone connected to it."); writer.WriteLine (""); writer.WriteLine ("SparkleShare is a Free and Open Source software program that helps people "); @@ -600,66 +614,8 @@ namespace SparkleLib { writer.WriteLine (""); writer.Close (); - } - - public void AddNote (string revision, string note) - { - string notes_path = Path.Combine (LocalPath, ".notes"); - - if (!Directory.Exists (notes_path)) - Directory.CreateDirectory (notes_path); - - // Add a timestamp in seconds since unix epoch - int timestamp = (int) (DateTime.UtcNow - new DateTime (1970, 1, 1)).TotalSeconds; - - string n = Environment.NewLine; - note = "" + n + - " " + n + - " " + SparkleConfig.DefaultConfig.User.Name + "" + n + - " " + SparkleConfig.DefaultConfig.User.Email + "" + n + - " " + n + - " " + timestamp + "" + n + - " " + note + "" + n + - "" + n; - - string note_name = revision + SHA1 (timestamp.ToString () + note); - string note_path = Path.Combine (notes_path, note_name); - - StreamWriter writer = new StreamWriter (note_path); - writer.Write (note); - writer.Close (); - - - // The watcher doesn't like .*/ so we need to trigger - // a change manually - FileSystemEventArgs args = new FileSystemEventArgs (WatcherChangeTypes.Changed, - notes_path, note_name); - - OnFileActivity (args); - SparkleHelpers.DebugInfo ("Note", "Added note to " + revision); - } - - - private DateTime progress_last_change = DateTime.Now; - private TimeSpan progress_change_interval = new TimeSpan (0, 0, 0, 1); - - protected void OnSyncProgressChanged (double progress_percentage, string progress_speed) - { - if (DateTime.Compare (this.progress_last_change, - DateTime.Now.Subtract (this.progress_change_interval)) < 0) { - - if (SyncProgressChanged != null) { - if (progress_percentage == 100.0) - progress_percentage = 99.0; - - this.progress_percentage = progress_percentage; - this.progress_speed = progress_speed; - this.progress_last_change = DateTime.Now; - - SyncProgressChanged (progress_percentage, progress_speed); - } - } + SyncUp (); } @@ -671,5 +627,35 @@ namespace SparkleLib { Byte[] encoded_bytes = sha1.ComputeHash (bytes); return BitConverter.ToString (encoded_bytes).ToLower ().Replace ("-", ""); } + + + // Recursively gets a folder's size in bytes + private double CalculateSize (DirectoryInfo parent) + { + if (!Directory.Exists (parent.ToString ())) + return 0; + + double size = 0; + + if (ExcludePaths.Contains (parent.Name)) + return 0; + + try { + foreach (FileInfo file in parent.GetFiles()) { + if (!file.Exists) + return 0; + + size += file.Length; + } + + foreach (DirectoryInfo directory in parent.GetDirectories ()) + size += CalculateSize (directory); + + } catch (Exception) { + return 0; + } + + return size; + } } } diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index 27d5715b..069ba2e2 100755 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -19,12 +19,11 @@ using System; using System.Drawing; using System.IO; -using MonoMac.Foundation; using MonoMac.AppKit; +using MonoMac.Foundation; using MonoMac.ObjCRuntime; using MonoMac.WebKit; - namespace SparkleShare { public class SparkleAbout : NSWindow { @@ -54,9 +53,12 @@ namespace SparkleShare { BackingType = NSBackingStore.Buffered; CreateAbout (); - OrderFrontRegardless (); + + NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); MakeKeyAndOrderFront (this); + OrderFrontRegardless (); + Program.UI.UpdateDockIconVisibility (); Controller.NewVersionEvent += delegate (string new_version) { diff --git a/SparkleShare/Mac/SparkleController.cs b/SparkleShare/Mac/SparkleController.cs index 9c9b0669..d0fb3cb2 100755 --- a/SparkleShare/Mac/SparkleController.cs +++ b/SparkleShare/Mac/SparkleController.cs @@ -44,8 +44,8 @@ namespace SparkleShare { string content_path = Directory.GetParent (System.AppDomain.CurrentDomain.BaseDirectory).ToString (); - string app_path = Directory.GetParent (content_path).ToString (); - string growl_path = Path.Combine (app_path, "Frameworks", "Growl.framework", "Growl"); + string app_path = Directory.GetParent (content_path).ToString (); + string growl_path = Path.Combine (app_path, "Frameworks", "Growl.framework", "Growl"); // Needed for Growl @@ -54,7 +54,7 @@ namespace SparkleShare { // Let's use the bundled git first - SparkleBackend.DefaultBackend.Path = + SparkleGit.Path = Path.Combine (NSBundle.MainBundle.ResourcePath, "git", "libexec", "git-core", "git"); @@ -68,7 +68,13 @@ namespace SparkleShare { { base.Initialize (); - this.watcher.Changed += delegate (string path) { + this.watcher.Changed += delegate (object sender, SparkleMacWatcherEventArgs args) { + string path = args.Path; + + // Don't even bother with paths in .git/ + if (path.Contains (".git")) + return; + string repo_name; if (path.Contains ("/")) @@ -77,17 +83,20 @@ namespace SparkleShare { repo_name = path; // Ignore changes in the root of each subfolder, these - // are already handled bu the repository + // are already handled by the repository if (Path.GetFileNameWithoutExtension (path).Equals (repo_name)) return; repo_name = repo_name.Trim ("/".ToCharArray ()); - FileSystemEventArgs args = new FileSystemEventArgs (WatcherChangeTypes.Changed, - Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, path), Path.GetFileName (path)); + FileSystemEventArgs fse_args = new FileSystemEventArgs ( + WatcherChangeTypes.Changed, + Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, path), + Path.GetFileName (path) + ); foreach (SparkleRepoBase repo in Repositories) { if (repo.Name.Equals (repo_name)) - repo.OnFileActivity (args); + repo.OnFileActivity (fse_args); } }; } diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs index c46f53fd..a12d2c52 100755 --- a/SparkleShare/Mac/SparkleEventLog.cs +++ b/SparkleShare/Mac/SparkleEventLog.cs @@ -134,7 +134,8 @@ namespace SparkleShare { this.progress_indicator = new NSProgressIndicator () { Style = NSProgressIndicatorStyle.Spinning, - Frame = new RectangleF (this.web_view.Frame.Width / 2 - 10, this.web_view.Frame.Height / 2 + 10, 20, 20) + Frame = new RectangleF (this.web_view.Frame.Width / 2 - 10, + this.web_view.Frame.Height / 2 + 10, 20, 20) }; this.progress_indicator.StartAnimation (this); @@ -226,15 +227,24 @@ namespace SparkleShare { html = html.Replace ("", "#0085cf"); html = html.Replace ("", "#009ff8"); html = html.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png")); + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps","avatar-default.png")); + html = html.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-added-12.png")); + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps", "document-added-12.png")); + html = html.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-deleted-12.png")); + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps", "document-deleted-12.png")); + html = html.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-edited-12.png")); + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps", "document-edited-12.png")); + html = html.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-moved-12.png")); + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps", "document-moved-12.png")); InvokeOnMainThread (delegate { if (this.progress_indicator.Superview == ContentView) diff --git a/SparkleShare/Mac/SparkleMacWatcher.cs b/SparkleShare/Mac/SparkleMacWatcher.cs index 75123de2..4ef3d91b 100755 --- a/SparkleShare/Mac/SparkleMacWatcher.cs +++ b/SparkleShare/Mac/SparkleMacWatcher.cs @@ -14,88 +14,216 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . - +// Originally taken from: +// https://github.com/jesse99/Continuum/blob/master/source/shared/DirectoryWatcher.cs +// Modified to use MonoMac and integrate into SparkleShare + +// Copyright (C) 2008 Jesse Jones +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.InteropServices; using System.IO; using System.Threading; using System.Timers; +using MonoMac.AppKit; +using MonoMac.Foundation; + namespace SparkleShare { - public class SparkleMacWatcher { + [Serializable] + public sealed class SparkleMacWatcherEventArgs : EventArgs { - public delegate void ChangedEventHandler (string path); - public event ChangedEventHandler Changed; + public string Path { get; private set; } - private FileSystemInfo last_changed; - private Thread thread; - private int poll_count = 0; + + public SparkleMacWatcherEventArgs (string path) + { + Path = path; + } + } + + + public sealed class SparkleMacWatcher : IDisposable + { + public event EventHandler Changed; + public string Path { get; private set; } + + + [Flags] + [Serializable] + private enum FSEventStreamCreateFlags : uint + { + kFSEventStreamCreateFlagNone = 0x00000000, + kFSEventStreamCreateFlagUseCFTypes = 0x00000001, + kFSEventStreamCreateFlagNoDefer = 0x00000002, + kFSEventStreamCreateFlagWatchRoot = 0x00000004, + } + + private DateTime last_found_timestamp; + private IntPtr m_stream; + private FSEventStreamCallback m_callback; // need to keep a reference around so that it isn't GC'ed + private static readonly IntPtr kCFRunLoopDefaultMode = (new NSString ("kCFRunLoopDefaultMode")).Handle; + private ulong kFSEventStreamEventIdSinceNow = 0xFFFFFFFFFFFFFFFFUL; + + private delegate void FSEventStreamCallback ( + IntPtr streamRef, + IntPtr clientCallBackInfo, + int numEvents, + IntPtr eventPaths, + IntPtr eventFlags, + IntPtr eventIds); + + + ~SparkleMacWatcher () + { + Dispose (false); + } public SparkleMacWatcher (string path) { - this.thread = new Thread (new ThreadStart (delegate { - DateTime timestamp; - DirectoryInfo parent = new DirectoryInfo (path); - this.last_changed = new DirectoryInfo (path); + Path = path; + m_callback = DoCallback; - while (true) { - timestamp = this.last_changed.LastWriteTime; - GetLastChange (parent); + NSString [] s = new NSString [1]; + s [0] = new NSString (path); + NSArray path_p = NSArray.FromNSObjects (s); - if (DateTime.Compare (this.last_changed.LastWriteTime, timestamp) != 0) { - string relative_path = this.last_changed.FullName.Substring (path.Length + 1); + m_stream = FSEventStreamCreate ( // note that the stream will always be valid + IntPtr.Zero, // allocator + m_callback, // callback + IntPtr.Zero, // context + path_p.Handle, // pathsToWatch + kFSEventStreamEventIdSinceNow, // sinceWhen + 2, // latency (in seconds) + FSEventStreamCreateFlags.kFSEventStreamCreateFlagNone); // flags - if (Changed != null) - Changed (relative_path); - } + FSEventStreamScheduleWithRunLoop ( + m_stream, // streamRef + CFRunLoopGetMain(), // runLoop + kCFRunLoopDefaultMode); // runLoopMode - Thread.Sleep (7500); - this.poll_count++; - } - })); - - this.thread.Start (); - } - - - private void GetLastChange (DirectoryInfo parent) - { - try { - if (DateTime.Compare (parent.LastWriteTime, this.last_changed.LastWriteTime) > 0) - this.last_changed = parent; - - foreach (DirectoryInfo info in parent.GetDirectories ()) { - if (!info.FullName.Contains ("/.")) { - if (DateTime.Compare (info.LastWriteTime, this.last_changed.LastWriteTime) > 0) - this.last_changed = info; - - GetLastChange (info); - } - } - - if (this.poll_count >= 8) { - foreach (FileInfo info in parent.GetFiles ()) { - if (!info.FullName.Contains ("/.")) { - if (DateTime.Compare (info.LastWriteTime, this.last_changed.LastWriteTime) > 0) - this.last_changed = info; - } - } - - this.poll_count = 0; - } - - } catch (Exception) { - // Don't care... + bool started = FSEventStreamStart (m_stream); + if (!started) { + GC.SuppressFinalize (this); + throw new InvalidOperationException ("Failed to start FSEvent stream for " + path); } + } public void Dispose () { - this.thread.Join (); - this.thread.Abort (); + Dispose (true); + GC.SuppressFinalize (this); } + + + private void Dispose (bool disposing) + { + if (m_stream != IntPtr.Zero) { + FSEventStreamStop (m_stream); + FSEventStreamInvalidate (m_stream); + FSEventStreamRelease (m_stream); + + m_stream = IntPtr.Zero; + } + } + + + private void checkDirectory (string dir) + { + DirectoryInfo parent = new DirectoryInfo (dir); + + if (!parent.FullName.Contains ("/.") && + DateTime.Compare (parent.LastWriteTime, this.last_found_timestamp) > 0) { + + last_found_timestamp = parent.LastWriteTime; + } + } + + + private void DoCallback (IntPtr streamRef, IntPtr clientCallBackInfo, + int numEvents, IntPtr eventPaths, IntPtr eventFlags, IntPtr eventIds) + { + int bytes = Marshal.SizeOf (typeof (IntPtr)); + string [] paths = new string [numEvents]; + + for (int i = 0; i < numEvents; ++i) { + IntPtr p = Marshal.ReadIntPtr (eventPaths, i * bytes); + paths [i] = Marshal.PtrToStringAnsi (p); + checkDirectory (paths [i]); + } + + var handler = Changed; + if (handler != null) { + string path = paths [0]; + path = path.Substring (Path.Length); + path = path.Trim ("/".ToCharArray ()); + handler (this, new SparkleMacWatcherEventArgs (path)); + } + + GC.KeepAlive (this); + } + + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + private extern static IntPtr CFRunLoopGetMain (); + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + private extern static IntPtr FSEventStreamCreate ( + IntPtr allocator, + FSEventStreamCallback callback, + IntPtr context, + IntPtr pathsToWatch, + ulong sinceWhen, + double latency, + FSEventStreamCreateFlags flags); + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + private extern static void FSEventStreamScheduleWithRunLoop ( + IntPtr streamRef, + IntPtr runLoop, + IntPtr runLoopMode); + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + [return: MarshalAs (UnmanagedType.U1)] + private extern static bool FSEventStreamStart ( + IntPtr streamRef); + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + private extern static void FSEventStreamStop ( + IntPtr streamRef); + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + private extern static void FSEventStreamInvalidate ( + IntPtr streamRef); + + [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")] + private extern static void FSEventStreamRelease ( + IntPtr streamRef); } } diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 0a62e312..23783cbb 100755 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -11,7 +11,7 @@ SparkleShare SparkleShare v4.0 - 0.8.1 + 0.8.2 true @@ -59,7 +59,7 @@ False - + False ..\..\bin\SparkleLib.dll diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/Mac/SparkleShare.sln index fc841f19..6ad0b1a6 100644 --- a/SparkleShare/Mac/SparkleShare.sln +++ b/SparkleShare/Mac/SparkleShare.sln @@ -16,6 +16,6 @@ Global EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = SparkleShare.csproj - version = 0.8.1 + version = 0.8.2 EndGlobalSection EndGlobal diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 0d89e9b1..231fe902 100755 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -33,6 +33,7 @@ namespace SparkleShare { public SparkleStatusIconController Controller = new SparkleStatusIconController (); + // TODO: Fix case private Timer Animation; private int FrameNumber; private string StateText; diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index f4a4330d..ad557503 100755 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -39,7 +39,5 @@ include $(top_srcdir)/build/build.mk bin_SCRIPTS = sparkleshare -dist_man_MANS = $(top_srcdir)/man/sparkleshare.1 - Applicationsdir = $(datadir)/applications dist_Applications_DATA = sparkleshare.desktop diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs index 573dbd0c..9b64536d 100644 --- a/SparkleShare/Program.cs +++ b/SparkleShare/Program.cs @@ -23,7 +23,6 @@ using System.Runtime.InteropServices; using System.Text; using Mono.Unix; -//using Mono.Unix.Native; using SparkleLib; namespace SparkleShare { @@ -88,10 +87,10 @@ namespace SparkleShare { Console.WriteLine (_("This is free software, and you are welcome to redistribute it ")); Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details.")); Console.WriteLine (" "); - Console.WriteLine (_("SparkleShare automatically syncs Git repositories in ")); - Console.WriteLine (_("the ~/SparkleShare folder with their remote origins.")); + Console.WriteLine (_("SparkleShare is a collaboration and sharing tool that is ")); + Console.WriteLine (_("designed to keep things simple and to stay out of your way.")); Console.WriteLine (" "); - Console.WriteLine (_("Usage: sparkleshare [start|stop|restart] [OPTION]...")); + Console.WriteLine (_("Usage: sparkleshare [start|stop|restart|version] [OPTION]...")); Console.WriteLine (_("Sync SparkleShare folder with remote repositories.")); Console.WriteLine (" "); Console.WriteLine (_("Arguments:")); @@ -107,24 +106,5 @@ namespace SparkleShare { Console.WriteLine (_("SparkleShare " + Defines.VERSION)); Environment.Exit (0); } - - - // Strange magic needed by SetProcessName () -// [DllImport ("libc")] -// private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); - - - // Sets the Unix process name to 'sparkleshare' instead of 'mono' -/* private static void SetProcessName (string name) - { - try { - if (prctl (15, Encoding.ASCII.GetBytes (name + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero) != 0) - throw new ApplicationException ("Error setting process name: " + - Mono.Unix.Native.Stdlib.GetLastError ()); - - } catch (EntryPointNotFoundException) { - Console.WriteLine ("SetProcessName: Entry point not found"); - } - } */ } } diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 9457b579..23b156f8 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -42,9 +42,6 @@ namespace SparkleShare { public double ProgressPercentage = 0.0; public string ProgressSpeed = ""; - public event OnQuitWhileSyncingHandler OnQuitWhileSyncing; - public delegate void OnQuitWhileSyncingHandler (); - public event FolderFetchedEventHandler FolderFetched; public delegate void FolderFetchedEventHandler (string [] warnings); @@ -132,10 +129,9 @@ namespace SparkleShare { }; - SparkleInviteListener invite_listener = new SparkleInviteListener (1986); + SparkleInviteListener invite_listener = new SparkleInviteListener (1987); invite_listener.InviteReceived += delegate (SparkleInvite invite) { - if (OnInvite != null && !FirstRun) OnInvite (invite); }; @@ -303,8 +299,8 @@ namespace SparkleShare { if (DateTime.Compare (existing_set.Timestamp, change_set.Timestamp) < 1) { existing_set.FirstTimestamp = existing_set.Timestamp; - existing_set.Timestamp = change_set.Timestamp; - existing_set.Revision = change_set.Revision; + existing_set.Timestamp = change_set.Timestamp; + existing_set.Revision = change_set.Revision; } else { existing_set.FirstTimestamp = change_set.Timestamp; @@ -351,37 +347,40 @@ namespace SparkleShare { } else { if (change_set.Edited.Count > 0) { foreach (string file_path in change_set.Edited) { - string absolute_file_path = new string [] {SparkleConfig.DefaultConfig.FoldersPath, - change_set.Folder, file_path}.Combine (); - - if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; - else - event_entry += "
" + file_path + "
"; + event_entry += "
"; + + event_entry += FormatBreadCrumbs ( + Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder), + file_path + ); + + event_entry += "
"; } } if (change_set.Added.Count > 0) { foreach (string file_path in change_set.Added) { - string absolute_file_path = new string [] {SparkleConfig.DefaultConfig.FoldersPath, - change_set.Folder, file_path}.Combine (); - - if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; - else - event_entry += "
" + file_path + "
"; + event_entry += "
"; + + event_entry += FormatBreadCrumbs ( + Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder), + file_path + ); + + event_entry += "
"; } } if (change_set.Deleted.Count > 0) { foreach (string file_path in change_set.Deleted) { - string absolute_file_path = new string [] {SparkleConfig.DefaultConfig.FoldersPath, - change_set.Folder, file_path}.Combine (); - - if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; - else - event_entry += "
" + file_path + "
"; + event_entry += "
"; + + event_entry += FormatBreadCrumbs ( + Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder), + file_path + ); + + event_entry += "
"; } } @@ -390,21 +389,19 @@ namespace SparkleShare { foreach (string file_path in change_set.MovedFrom) { string to_file_path = change_set.MovedTo [i]; - string absolute_file_path = new string [] {SparkleConfig.DefaultConfig.FoldersPath, - change_set.Folder, file_path}.Combine (); + event_entry += "
"; + event_entry += FormatBreadCrumbs ( + Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder), + file_path + ); - string absolute_to_file_path = new string [] {SparkleConfig.DefaultConfig.FoldersPath, - change_set.Folder, to_file_path}.Combine (); + event_entry += "
"; + event_entry += FormatBreadCrumbs ( + Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder), + to_file_path + ); - if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; - else - event_entry += "
" + file_path + "
"; - - if (File.Exists (absolute_to_file_path)) - event_entry += "" + to_file_path + "
"; - else - event_entry += to_file_path + ""; + event_entry += ""; i++; } @@ -620,7 +617,7 @@ namespace SparkleShare { } }; - repo.SyncProgressChanged += delegate (double percentage, string speed) { + repo.ProgressChanged += delegate (double percentage, string speed) { ProgressPercentage = percentage; ProgressSpeed = speed; @@ -785,13 +782,6 @@ namespace SparkleShare { } - public bool BackendIsPresent { - get { - return SparkleBackend.DefaultBackend.IsPresent; - } - } - - // Looks up the user's name from the global configuration public string UserName { @@ -1099,16 +1089,6 @@ namespace SparkleShare { } - // Creates an MD5 hash of input - private string GetMD5 (string s) - { - MD5 md5 = new MD5CryptoServiceProvider (); - Byte[] bytes = ASCIIEncoding.Default.GetBytes (s); - Byte[] encoded_bytes = md5.ComputeHash (bytes); - return BitConverter.ToString (encoded_bytes).ToLower ().Replace ("-", ""); - } - - // Checks whether there are any folders syncing and // quits if safe public void TryQuit () @@ -1118,9 +1098,6 @@ namespace SparkleShare { repo.Status == SyncStatus.SyncDown || repo.IsBuffering) { - if (OnQuitWhileSyncing != null) - OnQuitWhileSyncing (); - return; } } @@ -1166,6 +1143,55 @@ namespace SparkleShare { int number = 3 + int.Parse (numbers); return this.tango_palette [number % this.tango_palette.Length]; } + + + // Creates an MD5 hash of input + private string GetMD5 (string s) + { + MD5 md5 = new MD5CryptoServiceProvider (); + Byte[] bytes = ASCIIEncoding.Default.GetBytes (s); + Byte[] encoded_bytes = md5.ComputeHash (bytes); + return BitConverter.ToString (encoded_bytes).ToLower ().Replace ("-", ""); + } + + + private string FormatBreadCrumbs (string path_root, string path) + { + string link = ""; + string [] crumbs = path.Split (Path.DirectorySeparatorChar); + + int i = 0; + string new_path_root = path_root; + bool previous_was_folder = false; + foreach (string crumb in crumbs) { + + if (string.IsNullOrEmpty (crumb)) + continue; + + string crumb_path = Path.Combine (new_path_root, crumb); + + if (Directory.Exists (crumb_path)) { + link += "" + crumb + Path.DirectorySeparatorChar + ""; + previous_was_folder = true; + + } else if (File.Exists (crumb_path)) { + link += "" + crumb + ""; + previous_was_folder = false; + + } else { + if (i > 0 && !previous_was_folder) + link += Path.DirectorySeparatorChar; + + link += crumb; + previous_was_folder = false; + } + + new_path_root = Path.Combine (new_path_root, crumb); + i++; + } + + return link; + } } diff --git a/SparkleShare/SparkleInvite.cs b/SparkleShare/SparkleInvite.cs index 40b36a97..ca660648 100644 --- a/SparkleShare/SparkleInvite.cs +++ b/SparkleShare/SparkleInvite.cs @@ -60,7 +60,37 @@ namespace SparkleShare { public SparkleInvite (string xml_file_path) { - // TODO + XmlDocument xml_document = new XmlDocument (); + XmlNode node; + + string host = "", path = "", token = ""; + + try { + xml_document.Load (xml_file_path); + + node = xml_document.SelectSingleNode ("/sparkleshare/invite/host/text()"); + if (node != null) { host = node.Value; } + + node = xml_document.SelectSingleNode ("/sparkleshare/invite/path/text()"); + if (node != null) { path = node.Value; } + + node = xml_document.SelectSingleNode ("/sparkleshare/invite/token/text()"); + if (node != null) { token = node.Value; } + + } catch (XmlException e) { + SparkleHelpers.DebugInfo ("Invite", "Invalid XML: " + e.Message); + return; + } + + + if (path.StartsWith ("/")) + path = path.Substring (1); + + if (!host.EndsWith ("/")) + host = host + "/"; + + FullAddress = new Uri ("ssh://" + host + path); + Token = token; } } @@ -168,9 +198,8 @@ namespace SparkleShare { XmlDocument xml_document = new XmlDocument (); XmlNode node; - string host = ""; - string path = ""; - string token = ""; + + string host = "", path = "", token = ""; try { xml_document.LoadXml (invite_xml); @@ -185,7 +214,7 @@ namespace SparkleShare { if (node != null) { token = node.Value; } } catch (XmlException e) { - SparkleHelpers.DebugInfo ("Invite", "Not valid XML: " + received_message + " " + e.Message); + SparkleHelpers.DebugInfo ("Invite", "Invalid XML: " + received_message + " " + e.Message); return; } diff --git a/SparkleShare/SparklePlugin.cs b/SparkleShare/SparklePlugin.cs index e77fc15d..3868438b 100644 --- a/SparkleShare/SparklePlugin.cs +++ b/SparkleShare/SparklePlugin.cs @@ -16,56 +16,83 @@ using System; -using System.IO; using System.Xml; namespace SparkleShare { public class SparklePlugin { - public string Name; - public string Description; - public string ImagePath; - public string Backend; + public string Name { + get { + return GetValue ("info", "name"); + } + } - public string Address; - public string AddressExample; - public string Path; - public string PathExample; + public string Description { + get { + return GetValue ("info", "description"); + } + } + public string ImagePath { + get { + return System.IO.Path.Combine ( + this.plugin_directory, + GetValue ("info", "icon") + ); + } + } + + public string Backend { + get { + return GetValue ("info", "backend"); + } + } + + public string Address { + get { + return GetValue ("address", "value"); + } + } + + public string AddressExample { + get { + return GetValue ("address", "example"); + } + } + + public string Path { + get { + return GetValue ("path", "value"); + } + } + + public string PathExample { + get { + return GetValue ("path", "example"); + } + } + + + private XmlDocument xml = new XmlDocument (); + private string plugin_directory; public SparklePlugin (string plugin_path) { - string plugin_directory = System.IO.Path.GetDirectoryName (plugin_path); + this.plugin_directory = System.IO.Path.GetDirectoryName (plugin_path); + this.xml.Load (plugin_path); + } - XmlDocument xml = new XmlDocument (); - xml.Load (plugin_path); - XmlNode node; + private string GetValue (string a, string b) + { + XmlNode node = this.xml.SelectSingleNode ( + "/sparkleshare/plugin/" + a + "/" + b + "/text()"); - node = xml.SelectSingleNode ("/sparkleshare/plugin/info/name/text()"); - if (node != null) { Name = node.Value; } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/info/description/text()"); - if (node != null) { Description = node.Value; } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/info/icon/text()"); - if (node != null) { ImagePath = System.IO.Path.Combine (plugin_directory, node.Value); } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/info/backend/text()"); - if (node != null) { Backend = node.Value; } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/address/value/text()"); - if (node != null) { Address = node.Value; } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/address/example/text()"); - if (node != null) { AddressExample = node.Value; } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/path/value/text()"); - if (node != null) { Path = node.Value; } - - node = xml.SelectSingleNode ("/sparkleshare/plugin/path/example/text()"); - if (node != null) { PathExample = node.Value; } + if (node != null) + return node.Value; + else + return null; } } } diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs index a678b419..81ccb866 100644 --- a/SparkleShare/SparkleStatusIcon.cs +++ b/SparkleShare/SparkleStatusIcon.cs @@ -33,12 +33,11 @@ namespace SparkleShare { public SparkleStatusIconController Controller = new SparkleStatusIconController (); - // TODO: fix case - private Timer Animation; - private Gdk.Pixbuf [] AnimationFrames; - private int FrameNumber; - private string StateText; - private Menu Menu; + private Timer animation; + private Gdk.Pixbuf [] animation_frames; + private int frame_number; + private string state_text; + private Menu menu; private MenuItem quit_item; #if HAVE_APP_INDICATOR @@ -56,8 +55,8 @@ namespace SparkleShare { public SparkleStatusIcon () { - AnimationFrames = CreateAnimationFrames (); - Animation = CreateAnimation (); + CreateAnimationFrames (); + CreateAnimation (); #if HAVE_APP_INDICATOR this.indicator = new ApplicationIndicator ("sparkleshare", @@ -70,13 +69,13 @@ namespace SparkleShare { this.status_icon.Activate += ShowMenu; // Primary mouse button click this.status_icon.PopupMenu += ShowMenu; // Secondary mouse button click - this.status_icon.Pixbuf = AnimationFrames [0]; + this.status_icon.Pixbuf = this.animation_frames [0]; #endif if (Controller.Folders.Length == 0) - StateText = _("Welcome to SparkleShare!"); + this.state_text = _("Welcome to SparkleShare!"); else - StateText = _("Up to date") + Controller.FolderSize; + this.state_text = _("Up to date") + Controller.FolderSize; CreateMenu (); @@ -85,7 +84,7 @@ namespace SparkleShare { Application.Invoke (delegate { if (this.quit_item != null) { this.quit_item.Sensitive = quit_item_enabled; - Menu.ShowAll (); + this.menu.ShowAll (); } }); }; @@ -95,17 +94,17 @@ namespace SparkleShare { switch (state) { case IconState.Idle: - Animation.Stop (); + this.animation.Stop (); if (Controller.Folders.Length == 0) - StateText = _("Welcome to SparkleShare!"); + this.state_text = _("Welcome to SparkleShare!"); else - StateText = _("Up to date") + Controller.FolderSize; + this.state_text = _("Up to date") + Controller.FolderSize; #if HAVE_APP_INDICATOR this.indicator.IconName = "process-syncing-sparkleshare-i"; #else - this.status_icon.Pixbuf = AnimationFrames [0]; + this.status_icon.Pixbuf = this.animation_frames [0]; #endif UpdateStateText (); @@ -115,22 +114,22 @@ namespace SparkleShare { case IconState.Syncing: - StateText = _("Syncing… ") + + this.state_text = _("Syncing… ") + Controller.ProgressPercentage + "% " + Controller.ProgressSpeed; UpdateStateText (); - if (!Animation.Enabled) - Animation.Start (); + if (!this.animation.Enabled) + this.animation.Start (); break; case IconState.Error: - Animation.Stop (); + this.animation.Stop (); - StateText = _("Not everything is synced"); + this.state_text = _("Not everything is synced"); UpdateStateText (); CreateMenu (); @@ -143,7 +142,7 @@ namespace SparkleShare { break; } - Menu.ShowAll (); + this.menu.ShowAll (); }); }; } @@ -151,47 +150,43 @@ namespace SparkleShare { // Slices up the graphic that contains the // animation frames. - private Gdk.Pixbuf [] CreateAnimationFrames () + private void CreateAnimationFrames () { - Gdk.Pixbuf [] animation_frames = new Gdk.Pixbuf [5]; + this.animation_frames = new Gdk.Pixbuf [5]; Gdk.Pixbuf frames_pixbuf = SparkleUIHelpers.GetIcon ("process-syncing-sparkleshare", 24); - for (int i = 0; i < animation_frames.Length; i++) + for (int i = 0; i < this.animation_frames.Length; i++) animation_frames [i] = new Gdk.Pixbuf (frames_pixbuf, (i * 24), 0, 24, 24); - - return animation_frames; } - // Creates the Animation that handles the syncing animation - private Timer CreateAnimation () + // Creates the animation that handles the syncing animation + private void CreateAnimation () { - FrameNumber = 0; + this.frame_number = 0; - Timer Animation = new Timer () { + this.animation = new Timer () { Interval = 35 }; - Animation.Elapsed += delegate { - if (FrameNumber < AnimationFrames.Length - 1) - FrameNumber++; + this.animation.Elapsed += delegate { + if (this.frame_number < this.animation_frames.Length - 1) + this.frame_number++; else - FrameNumber = 0; + this.frame_number = 0; string icon_name = "process-syncing-sparkleshare-"; - for (int i = 0; i <= FrameNumber; i++) + for (int i = 0; i <= this.frame_number; i++) icon_name += "i"; Application.Invoke (delegate { #if HAVE_APP_INDICATOR this.indicator.IconName = icon_name; #else - this.status_icon.Pixbuf = AnimationFrames [FrameNumber]; + this.status_icon.Pixbuf = this.animation_frames [this.frame_number]; #endif }); }; - - return Animation; } @@ -199,15 +194,15 @@ namespace SparkleShare { // user clicks the status icon public void CreateMenu () { - Menu = new Menu (); + this.menu = new Menu (); // The menu item showing the status and size of the SparkleShare folder - MenuItem status_menu_item = new MenuItem (StateText) { + MenuItem status_menu_item = new MenuItem (this.state_text) { Sensitive = false }; - Menu.Add (status_menu_item); - Menu.Add (new SeparatorMenuItem ()); + this.menu.Add (status_menu_item); + this.menu.Add (new SeparatorMenuItem ()); ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare"){ Image = new Image (SparkleUIHelpers.GetIcon ("folder-sparkleshare", 16)) @@ -217,7 +212,7 @@ namespace SparkleShare { Program.Controller.OpenSparkleShareFolder (); }; - Menu.Add (folder_item); + this.menu.Add (folder_item); if (Program.Controller.Folders.Count > 0) { @@ -239,7 +234,7 @@ namespace SparkleShare { }; subfolder_item.Activated += OpenFolderDelegate (folder_name); - Menu.Add (subfolder_item); + this.menu.Add (subfolder_item); } } else { @@ -247,10 +242,10 @@ namespace SparkleShare { Sensitive = false }; - Menu.Add (no_folders_item); + this.menu.Add (no_folders_item); } - Menu.Add (new SeparatorMenuItem ()); + this.menu.Add (new SeparatorMenuItem ()); // Opens the wizard to add a new remote folder MenuItem sync_item = new MenuItem (_("Add Hosted Project…")); @@ -274,8 +269,8 @@ namespace SparkleShare { }); }; - Menu.Add (sync_item); - Menu.Add (new SeparatorMenuItem ()); + this.menu.Add (sync_item); + this.menu.Add (new SeparatorMenuItem ()); MenuItem recent_events_item = new MenuItem (_("Open Recent Events")); @@ -291,7 +286,7 @@ namespace SparkleShare { }); }; - Menu.Add (recent_events_item); + this.menu.Add (recent_events_item); MenuItem notify_item; @@ -305,8 +300,8 @@ namespace SparkleShare { CreateMenu (); }; - Menu.Add (notify_item); - Menu.Add (new SeparatorMenuItem ()); + this.menu.Add (notify_item); + this.menu.Add (new SeparatorMenuItem ()); // A menu item that takes the user to http://www.sparkleshare.org/ MenuItem about_item = new MenuItem (_("About SparkleShare")); @@ -321,8 +316,8 @@ namespace SparkleShare { }); }; - Menu.Add (about_item); - Menu.Add (new SeparatorMenuItem ()); + this.menu.Add (about_item); + this.menu.Add (new SeparatorMenuItem ()); // A menu item that quits the application this.quit_item = new MenuItem (_("Quit")) { @@ -333,11 +328,11 @@ namespace SparkleShare { Program.Controller.Quit (); }; - Menu.Add (this.quit_item); - Menu.ShowAll (); + this.menu.Add (this.quit_item); + this.menu.ShowAll (); #if HAVE_APP_INDICATOR - this.indicator.Menu = Menu; + this.indicator.Menu = this.menu; #endif } @@ -354,15 +349,15 @@ namespace SparkleShare { public void UpdateStateText () { - ((Menu.Children [0] as MenuItem).Child as Label).Text = StateText; - Menu.ShowAll (); + ((this.menu.Children [0] as MenuItem).Child as Label).Text = this.state_text; + this.menu.ShowAll (); } #if !HAVE_APP_INDICATOR // Makes the menu visible private void ShowMenu (object o, EventArgs args) { - Menu.Popup (null, null, SetPosition, 0, Global.CurrentEventTime); + this.menu.Popup (null, null, SetPosition, 0, Global.CurrentEventTime); } diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index abe44ed1..be435328 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -69,12 +69,9 @@ namespace SparkleShare { Setup = new SparkleSetup (); Setup.Controller.ShowSetupPage (); } - - Program.Controller.OnQuitWhileSyncing += delegate { - // TODO: Pop up a warning when quitting whilst syncing - }; } + // Runs the application public void Run () { diff --git a/SparkleShare/sparkleshare.in b/SparkleShare/sparkleshare.in index 619f98b5..f79db46b 100755 --- a/SparkleShare/sparkleshare.in +++ b/SparkleShare/sparkleshare.in @@ -42,7 +42,7 @@ stop() { rm -f ${pidfile} echo "Done." else - echo "SparkleShare is not running, removing stale pid file." + echo "SparkleShare is not running, removing stale pid file..." rm -f ${pidfile} fi else @@ -64,14 +64,10 @@ case $1 in help|--help|-h) mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --help ;; - -d|--disable-gui) - mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --disable-gui - ;; - -v|--version) + version|--version|-v) mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --version ;; *) - echo "Usage: sparkleshare {start|stop|restart|help}" + echo "Usage: sparkleshare {start|stop|restart|help|version}" ;; esac - diff --git a/configure.ac b/configure.ac index c88fdda9..ac6a1f62 100755 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. m4_define([sparkleshare_version], - [0.8.1]) + [0.8.2]) m4_define([sparkleshare_asm_version], - [0.8.1]) + [0.8.2]) AC_PREREQ([2.54]) AC_INIT([SparkleShare], sparkleshare_version) @@ -154,7 +154,6 @@ data/Makefile data/icons/Makefile data/html/Makefile data/plugins/Makefile -help/Makefile SparkleLib/AssemblyInfo.cs SparkleLib/Defines.cs SparkleLib/Makefile @@ -176,7 +175,6 @@ Configuration: Build Gtk+ UI : ${enable_gtkui} Nautilus 2.x plugin : ${have_nautilus2_python} Nautilus 3.x plugin : ${have_nautilus3_python} - User Help : ${enable_user_help} (requires gnome-doc-utils >= 0.17.3) " diff --git a/data/html/event-log.html b/data/html/event-log.html index 50f0cdc9..484cc240 100755 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -139,6 +139,7 @@ a:hover { color: ; + text-decoration: underline; } .event-timestamp { diff --git a/help/C/account-creation.page b/help/C/account-creation.page deleted file mode 100755 index 4c976af5..00000000 --- a/help/C/account-creation.page +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Add the location of your remote folders. - - - Paul Cutler - pcutler@gnome.org - - - - - - Account Setup - -

Insert how to setup your accounts here) -

- -

Insert more help here, if needed. -

- - diff --git a/help/C/advanced.page b/help/C/advanced.page deleted file mode 100755 index a75e3a3e..00000000 --- a/help/C/advanced.page +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Get help for advanced actions. - - - Paul Cutler - pcutler@gnome.org - - - - - - Advanced Options and Help - -
- - TBD - - TBD -
- - diff --git a/help/C/index.page b/help/C/index.page deleted file mode 100755 index 21761b56..00000000 --- a/help/C/index.page +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Paul Cutler - pcutler@gnome.org - - - - - - SparkleShare - -
- Account Setup -
- -
- Sync and Share Files -
- -
- Advanced options and help -
- -
- Common Problems -
- - diff --git a/help/C/introduction.page b/help/C/introduction.page deleted file mode 100755 index 2515ce2f..00000000 --- a/help/C/introduction.page +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - Introduction to SparkleShare. - - - Paul Cutler - pcutler@gnome.org - - - - - - Introduction - -

- SparkleShare is an application that allows you to easily - sync and share your files and folders. SparkeShare uses the - distributed version control system Git to keep a record - of all the changes in your files, making it easy to easily go back - to an earlier version of the file if you make a mistake. -

- -
- <gui>SparkleShare</gui> screenshot - SparkleShare - -

Sparkleshare

- -
- - diff --git a/help/C/legal.xml b/help/C/legal.xml deleted file mode 100755 index 86d6173a..00000000 --- a/help/C/legal.xml +++ /dev/null @@ -1,9 +0,0 @@ - -

This work is licensed under a -Creative Commons -Attribution-Share Alike 3.0 Unported License.

-

As a special exception, the copyright holders give you permission to copy, -modify, and distribute the example code contained in this document under the -terms of your choosing, without restriction.

- diff --git a/help/C/share.page b/help/C/share.page deleted file mode 100755 index 95e95c56..00000000 --- a/help/C/share.page +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Sync and share your folders and files. - - - Paul Cutler - pcutler@gnome.org - - - - - - Sync and share your files and folders - -

Insert help here. -

- -

-

- - diff --git a/help/Makefile.am b/help/Makefile.am deleted file mode 100755 index 7fa2e1e9..00000000 --- a/help/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -if HAVE_GNOME_DOC_UTILS -include $(top_srcdir)/gnome-doc-utils.make - -DOC_ID = sparkleshare - -DOC_INCLUDES = legal.xml - -DOC_PAGES = account-creation.page \ - advanced.page \ - index.page \ - introduction.page \ - share.page - -DOC_LINGUAS = - -dist-hook: doc-dist-hook -endif diff --git a/man/sparkleshare.1 b/man/sparkleshare.1 deleted file mode 100755 index 20e11ef2..00000000 --- a/man/sparkleshare.1 +++ /dev/null @@ -1,36 +0,0 @@ -.TH sparkleshare 1 "August 16, 2010" "version 0.2" "USER COMMANDS" -.SH NAME -sparkleshare \- sharing work made easy -.SH SYNOPSIS -.B sparkleshare -[start|stop|restart|help] -.SH DESCRIPTION -A file sharing system for the desktop that retains a full history of -changes made, and allows work to be sychronized across many systems. -Based on the underlying `git' version control system, sparkleshare is -fast and secure, but the interface is straightforward enough for all -to use. -.SH OPTIONS -.TP -start -Start the sparkleshare system, presenting an introductory dialog if -this is the first time that it has been run. -.TP -stop -Stop sparkleshare, halting all current file sharing and no longer watch -for changes in the configured shares. -.TP -restart -Restart sparkleshare. -.SH RETURN VALUES -Currently sparkleshare only ever returns 0 on exit. -.SH FILES -.TP -~/SparkleShare -Directories set up to be shared are placed under this directory. -.SH BUGS -SparkleShare is currently under development, it is likely that there -are a number of bugs present in the system. Since the underlying -file sharing is simply based on `git', even if SparkleShare itself fails, -the data is retrievable in an open format. On-disk corruption is -extremely unlikely.