fetcher git: Use MD5 explicitly as the openssl digest for en/decryption. See #1855

Update SparkleBubbles.cs: Change behavior on NotificationClosed #1669

.github/CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hi@planetpeanut.uk. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

.github/CONTRIBUTING.md

@@ -1,14 +0,0 @@
-Hey there!
-
-I'm Hylke, the creator of this project. It's about time I wrote something up about how to contribute to SparkleShare, so here goes...
-
-Contributions to SparkleShare are always welcome! I'm not a great coder. I like to design icons and interfaces, so there are always bugs or things that can be done better. Take a look at the [list of open issues](https://github.com/hbons/SparkleShare/issues). Smaller issues or places where refactoring is needed are marked with `FIXME` or `TODO` in the source code. If you have a fix for SparkleShare, simply open a pull request against the master branch (keeping in mind the [[coding style]]) and if you think your change is significant enough to be copyrighted, feel free to add your name and email to the `AUTHORS` file. Releases are done at least once a month, so there won't be long waits for bug fixes.
-
-SparkleShare tries to keep things simple and to stay out of people's way. Features are only added if they are essential and helpful to a majority of users. If you have a feature that you'd like to be added, please open an issue first, so there can be a discussion whether the feature is actually needed (or it may be it can be done in some other way); do not waste work on a feature that isn't actually desired. By limiting the amount of features, we can spend more time on making the core features solid in order to help people get things done.
-
-Often requests come in to add preferences. I'm very pleased that we've been able to solve most problems reported and features requested without adding a "preference". Currently SparkleShare has only one preference: enabling/disabling notifications. Hopefully it will stay this way and we can withhold from adding a preference panel of some kind (but I can't rule it out). Figuring out how things can be done without burdening people with a preference is much more challenging and rewarding in my opinion. [Free Software UI](http://ometer.com/free-software-ui.html) is a great article about this topic and I recommend reading it.
-
-Looking forward to your contributions! :)
-
-Hylke
-

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: hbons

.github/ISSUE_TEMPLATE.md

@@ -1,20 +0,0 @@
-You can find session logs by date and version information in:
-~/.config/org.sparkleshare.SparkleShare/logs/ on Linux and macOS
-C:\Users\YOUR_USERNAME\AppData\Roaming\org.sparkleshare.SparkleShare\logs\ on Windows
-
-To help us help you, please include the logs from around the time the issue occurred, as well as the SparkleShare version and info about your OS (displayed at the top of the log files). Then, tell us roughly in these steps what went wrong:
-
-
-### What happened:
-…
-
-### What I expected to happen:
-…
-
-### This happens when:
-1. …
-2. …
-3. …
-
-
-Thanks for reporting your issue or feature request, it helps lots!

.gitignore

@@ -12,14 +12,31 @@
 *.sln.cache
 *.user
 *.resources
+Makefile.in
+Makefile
+intltool-*
+configure
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+aclocal.m4
+autom4te.cache/
 bin/
-build/
 obj/
-git-*
-Sparkles/InstallationInfo.Directory.cs
+install-sh
+libtool
+ltmain.sh
+missing
+build/m4/shave/shave
+build/m4/*.m4
+build/m4/shave/shave-libtool
+SparkleLib/Defines.cs
 SparkleShare/Linux/sparkleshare
 SparkleShare/Mac/git*
-SparkleShare/Mac/*.tar.gz
+gnome-doc-utils.make
 /sparkleshare-*
 desktop.ini
 _ReSharper.*
@@ -28,13 +45,4 @@ _ReSharper.*
 *.wixpdb
 *.wxs
 *.dotCover
-SparkleShare/Windows/build/
-.vs/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
 

.travis.yml

@@ -1,34 +0,0 @@
-language: csharp
-
-matrix:
-  include:
-    - os: linux
-      services:
-        - docker
-    - os: osx
-      sudo: required
-
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ubuntu:xenial ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then wget https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-3.0.0.393.pkg ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then sudo installer -pkg xamarin.mac*.pkg -target / ; fi
-
-script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build --file scripts/ci/Dockerfile --tag sparkleshare:nightly . ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then msbuild /p:Configuration=ReleaseMac SparkleShare.sln ; fi
-
-before_deploy:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DEPLOY_FILE=`docker run --name container sparkleshare:nightly find / -name sparkleshare*.tar.gz` ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker cp container:${DEPLOY_FILE} ./ ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv sparkleshare*.tar.gz sparkleshare-linux-nightly-${TRAVIS_COMMIT}.tar.gz ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then mv SparkleShare/Mac/bin/ReleaseMac/SparkleShare.app . ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then zip --recurse-paths sparkleshare-mac-nightly-${TRAVIS_COMMIT}.zip SparkleShare.app ; fi
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/f1a1178baa78d1162385
-    on_success: change
-    on_failure: always
-    on_start: never
-

Makefile.am

@@ -0,0 +1,23 @@
+basedirs = build SparkleLib SparkleLib/Git
+
+SUBDIRS = $(basedirs) $(GUISUBDIRS)
+DIST_SUBDIRS = $(basedirs) SparkleShare
+
+EXTRA_DIST = \
+	News.txt \
+        README.md \
+	legal/License_for_SparkleShare.txt \
+	legal/License_for_SparkleLib.txt \
+	legal/Trademark.txt \
+	legal/Authors.txt \
+	SparkleShare/Linux/README.md \
+	SparkleShare/Linux/sparkleshare.appdata.xml
+
+DISTCLEANFILES = \
+	intltool-extract        \
+	intltool-merge          \
+	intltool-update		\
+	gnome-doc-utils.make
+
+clean-local:
+	rm -rf $(top_builddir)/bin

News.txt

@@ -1,64 +1,6 @@
-3.38.0 (Sun 29 Nov, 2020):
-
-    - Added support for LibRAavatar
-    - Updated Gravatar cert fingerprint
-    - Removed planio from supported presets
-    - Support default branches that are not named 'master'
-    - Added support for nightly Flatpak builds
-
-
-3.28.0 (Sat 14 Jul, 2018):
-
-    Fixed a bunch of crashes and lots of under-the-hood improvements.
-    SparkleShare will now follow the GNOME release schedule and version 
-    number scheme as much as possible.
-
-    Please make sure to install the AppIndicator Support GNOME Shell extension
-    (https://extensions.gnome.org/extension/615/appindicator-support/) to display
-    status icons in GNOME 3.26 or later. Or start with --status-icon=gtk.
-
-    Linux:
-    - Use the Meson build system
-    - Use appindicator as the default status icon
-    - Fix event log parsing for newer versions of Git
-    - Flatpak improvements
-
-    macOS:
-    - Fix the system font in eventlog and related crash
-    - Fix hang when quitting the app
-
-    Special thanks to Thiago Santos and Renpytom for supporting the project on Patreon.
-
-
-2.0.1 (Tue 19 Dec, 2017):
-
-    - Fix files created by conflict resolution being moved to the root folder
-    - On conflicts, both diverging versions plus the original version are kept
-    - New app icon on Mac
-
-
-2.0.0 for Linux, Mac and Windows (Sun Sep 10, 2017):
-
-    SparkleShare 2.0 is a clean break and will be incompatible with 
-    the 1.x series. Repositories added using 1.0 will likely not work
-    and will have to be re-synced to take advantage of 2.0 features.
-
-    Hylke:
-    - Flatpak version now available
-    - Support for Git LFS managed repositories
-    - Updated Linux app icon by Sam Hewitt
-    - Projects are now grouped by host/organisation
-    - Prefer to use the "SparkleShare" branch if it exists remotely
-    - Added a GitLab preset
-    - Add an entry to GNOME's System Settings to manage notifications
-    - Encrypt names and emails in history of encrypted projects
-    - When conflicts are resolved "SparkleShare" is now the author and 
-      merge commits will be hidden from the log
-    - Fix conflict resolution on encrypted files
-    - Use a standalone SSH configuration instead of ssh-agent
-    - Use SHA256 instead of MD5 for SSH fingerprinting
-    - Dropped limited HTTPS support
-    - Dropped insecure DSA key support
+1.5.1 (Sun Jul 15):
+     Hylke:
+     - Fix an encryption compatibility issue with different versions of OpenSSL. See #1855
 
 
 1.5.0 for Linux, Mac and Windows (Tue Dec 22, 2015):

README.md

@@ -1,54 +1,34 @@
-# [SparkleShare](https://www.sparkleshare.org/)
+# SparkleShare
 
-[SparkleShare](https://www.sparkleshare.org/) is a file sharing and collaboration app. It works just like Dropbox, and you can run it on your own server. It's available for Linux distributions, macOS, and Windows.
+SparkleShare is an Open Source collaboration and sharing tool that is designed to keep things simple and to stay out of your way. It's available for Linux distributions, Mac, and Windows.
 
-![Banner](https://raw.githubusercontent.com/hbons/SparkleShare/master/SparkleShare/Common/Images/readme-banner.png)
+![Banner](https://raw.githubusercontent.com/hbons/SparkleShare/master/SparkleShare/Common/Pixmaps/tutorial-slide-2%402x.png)
 
-You can support this project through [💕 GitHub Sponsors](https://github.com/sponsors/hbons).
 
 ## How does it work?
 
 SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or "projects") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file.
 
-## Install on Ubuntu or Fedora
 
-You can install the package from your distribution (likely old and not updated often), but we recommend to get our Flatpak with automatic updates to always enjoy the latest and greatest:
+## Setting up a host
 
-```bash
-flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak install flathub org.sparkleshare.SparkleShare
-```
-
-Now you can run SparkleShare from the apps menu.
-
-**Note:** by default SparkleShare uses an AppIndicator status icon on Linux. If you use GNOME on a distribution other than Ubuntu, please install the [AppIndicator extension](https://extensions.gnome.org/extension/615/appindicator-support/). If you don't use GNOME, you can start SparkleShare with `--status-icon=gtk`.
+SparkleShare uses the version control system [Git](https://git-scm.com/) under the hood, so setting up a host yourself is relatively easy. Using your own host gives you more privacy and control, as well as lots of cheap storage space and higher transfer speeds. We've made a simple [script](https://github.com/hbons/Dazzle) that does the hard work for you. If you need to manage a lot of projects and/or users it may be worth setting up a [GitLab](https://www.gitlabhq.com) instance.
 
 
-## Install on macOS
-
-Download the app from the [releases page](https://github.com/hbons/SparkleShare/releases).
+## Free and Open Source
+`SparkleShare` is Free and Open Source software and licensed under the [GNU General Public License version 3 or later](legal/License_for_SparkleShare.txt). You are welcome to change and redistribute it under certain conditions. Its library `SparkleLib` is licensed under the [GNU Lesser General Public License version 3 or later](legal/License_for_SparkleLib.txt).
 
 
-## Set up a host
+## Compiling from source
 
-Under the hood SparkleShare uses the version control system [Git](https://git-scm.com/) and the large files extension [Git LFS](https://git-lfs.github.com), so setting up a host yourself is relatively easy. Using your own host gives you more privacy and control, as well as lots of cheap storage space and higher transfer speeds. We've made a simple [script](https://github.com/hbons/Dazzle) that does the hard work for you. If you need to manage a lot of projects and/or users we recommend hosting a [GitLab Community Edition](https://about.gitlab.com/installation/) instance.
+Here are instructions to build SparkleShare on [Linux distributions](SparkleShare/Linux/README.md), [Mac](SparkleShare/Mac/README.md), and [Windows](SparkleShare/Windows/README.md). Make sure to have the `git` package installed when you're building on Linux.
 
 
-## Build from source
-`SparkleShare` is Free and Open Source software and licensed under the [GNU GPLv3 or later](LICENSE.md). You are welcome to change and redistribute it under certain conditions. Its library `Sparkles` is licensed under the [GNU LGPLv3 or later](LICENSE_Sparkles.md).
-
-Here are instructions to build SparkleShare on [Linux distributions](SparkleShare/Linux/README.md), [macOS](SparkleShare/Mac/README.md), and [Windows](SparkleShare/Windows/README.md).
-
-
-[![Build Status](https://travis-ci.org/hbons/SparkleShare.svg?branch=master)](https://travis-ci.org/hbons/SparkleShare)
-[![Join the chat at https://gitter.im/hbons/SparkleShare](https://badges.gitter.im/hbons/SparkleShare.svg)](https://gitter.im/hbons/SparkleShare?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 ## Useful links
-- [sparkleshare.org](https://www.sparkleshare.org/)
-- [@SparkleShare](https://www.twitter.com/SparkleShare), [@hbons](https://www.twitter.com/hbons)
-- Community chatroom on [Gitter](https://www.gitter.im/hbons/SparkleShare)
-- [Wiki](https://www.github.com/hbons/SparkleShare/wiki)
+[Website](http://www.sparkleshare.org/), [Twitter](https://www.twitter.com/SparkleShare), [Wiki](https://www.github.com/hbons/SparkleShare/wiki), and [Source Code](https://www.github.com/hbons/SparkleShare). Join the chat: #sparkleshare on irc.gnome.org.
 
 
+## Finally
+
 Have fun, make awesome. :)
 

SparkleLib/Defines.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -15,15 +15,17 @@
 //   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
+using System;
 using System.Reflection;
 
-[assembly:AssemblyTitle ("Sparkles")]
-[assembly:AssemblyVersion ("3.38.0")]
+[assembly:AssemblyTitle ("SparkleLib")]
+[assembly:AssemblyVersion ("1.5.1")]
 [assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")]
+[assembly:AssemblyTrademark ("SparkleShare is a trademark of SparkleShare Ltd.")]
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public partial class InstallationInfo {
-        public const string Directory = "/usr/local/share/sparkleshare";
+    public class Defines {
+        public const string INSTALL_DIR = "/usr/share/sparkleshare";
     }
 }

SparkleLib/Defines.cs.in

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -15,16 +15,17 @@
 //   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
+using System;
 using System.Reflection;
 
-[assembly:AssemblyTitle ("Sparkles")]
+[assembly:AssemblyTitle ("SparkleLib")]
 [assembly:AssemblyVersion ("@VERSION@")]
 [assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")]
+[assembly:AssemblyTrademark ("SparkleShare is a trademark of SparkleShare Ltd.")]
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public partial class InstallationInfo {
-        public const string Directory = "@ABS_INSTALL_DIR@";
+    public class Defines {
+        public const string INSTALL_DIR = "@expanded_datadir@/sparkleshare";
     }
 }
-

SparkleLib/Git/Makefile.am

@@ -0,0 +1,22 @@
+ASSEMBLY = SparkleLib.Git
+TARGET = library
+
+LINK = -r:$(DIR_BIN)/SparkleLib.dll
+
+SOURCES =  \
+	SparkleGit.cs \
+	SparkleFetcherGit.cs \
+	SparkleRepoGit.cs
+
+
+install-data-hook:
+	for ASM in $(EXTRA_BUNDLE); do \
+		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+	done;
+
+uninstall-hook:
+	for ASM in $(EXTRA_BUNDLE); do \
+		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+	done;
+
+include $(top_srcdir)/build/build.mk

SparkleLib/Git/SparkleFetcherGit.cs

@@ -0,0 +1,450 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser 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 <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading;
+using SparkleLib;
+
+namespace SparkleLib.Git {
+
+    public class SparkleFetcher : SparkleFetcherSSH {
+
+        private SparkleGit git;
+        private bool use_git_bin;
+        private string cached_salt;
+
+        private Regex progress_regex = new Regex (@"([0-9]+)%", RegexOptions.Compiled);
+        private Regex speed_regex    = new Regex (@"([0-9\.]+) ([KM])iB/s", RegexOptions.Compiled);
+
+        private bool crypto_password_is_hashed = true;
+
+        private string crypto_salt {
+            get {
+                if (!string.IsNullOrEmpty (this.cached_salt))
+                    return this.cached_salt;
+
+                // Check if the repo's salt is stored in a branch...
+                SparkleGit git   = new SparkleGit (TargetFolder, "ls-remote --heads");
+                string branches  = git.StartAndReadStandardOutput ();
+                Regex salt_regex = new Regex ("refs/heads/salt-([0-9a-f]+)");
+				Match salt_match = salt_regex.Match (branches);
+
+				if (salt_match.Success)
+					this.cached_salt = salt_match.Groups [1].Value;
+
+                // ...if not, create a new salt for the repo
+                if (string.IsNullOrEmpty (this.cached_salt)) {
+                    this.cached_salt      = GenerateCryptoSalt ();
+                    string salt_file_path = new string [] { TargetFolder, ".git", "salt" }.Combine ();
+
+                    // Temporarily store the salt in a file, so the Repo object can
+                    // push it to a branch on the host later
+                    File.WriteAllText (salt_file_path, this.cached_salt);
+                }
+
+                return this.cached_salt;
+            }
+        }
+
+
+        public SparkleFetcher (SparkleFetcherInfo info) : base (info)
+        {
+            if (RemoteUrl.ToString ().StartsWith ("ssh+"))
+                RemoteUrl = new Uri ("ssh" + RemoteUrl.ToString ().Substring (RemoteUrl.ToString ().IndexOf ("://")));
+
+            Uri uri = RemoteUrl;
+
+            if (!uri.Scheme.Equals ("ssh") && !uri.Scheme.Equals ("https") &&
+                !uri.Scheme.Equals ("http") && !uri.Scheme.Equals ("git")) {
+
+                uri = new Uri ("ssh://" + uri);
+            }
+
+            if (uri.Host.Equals ("gitorious.org") && !uri.Scheme.StartsWith ("http")) {
+                if (!uri.AbsolutePath.Equals ("/") &&
+                    !uri.AbsolutePath.EndsWith (".git")) {
+
+                    uri = new Uri ("ssh://git@gitorious.org" + uri.AbsolutePath + ".git");
+
+                } else {
+                    uri = new Uri ("ssh://git@gitorious.org" + uri.AbsolutePath);
+                }
+
+            } else if (uri.Host.Equals ("github.com") && !uri.Scheme.StartsWith ("http")) {
+                uri = new Uri ("ssh://git@github.com" + uri.AbsolutePath);
+
+            } else if (uri.Host.Equals ("bitbucket.org") && !uri.Scheme.StartsWith ("http")) {
+                // Nothing really
+
+            } else {
+                if (string.IsNullOrEmpty (uri.UserInfo) && !uri.Scheme.StartsWith ("http")) {
+                    if (uri.Port == -1)
+                        uri = new Uri (uri.Scheme + "://storage@" + uri.Host + uri.AbsolutePath);
+                    else
+                        uri = new Uri (uri.Scheme + "://storage@" + uri.Host + ":" + uri.Port + uri.AbsolutePath);
+                }
+
+                this.use_git_bin = false; // TODO
+            }
+
+            RemoteUrl = uri;
+        }
+
+
+        public override bool Fetch ()
+        {
+            if (!base.Fetch ())
+                return false;
+
+            if (FetchPriorHistory) {
+                this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
+                    "clone --progress --no-checkout \"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
+
+            } else {
+                this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
+                    "clone --progress --no-checkout --depth=1 \"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
+            }
+
+            this.git.StartInfo.RedirectStandardError = true;
+            this.git.Start ();
+
+            double percentage = 1.0;
+
+            DateTime last_change     = DateTime.Now;
+            TimeSpan change_interval = new TimeSpan (0, 0, 0, 1);
+
+            try {
+                while (!this.git.StandardError.EndOfStream) {
+                    string line = this.git.StandardError.ReadLine ();
+                    Match match = this.progress_regex.Match (line);
+
+                    double number = 0.0;
+                    double speed  = 0.0;
+                    if (match.Success) {
+                        try {
+                            number = double.Parse (match.Groups [1].Value, new CultureInfo ("en-US"));
+
+                        } catch (FormatException) {
+                            SparkleLogger.LogInfo ("Git", "Error parsing progress: \"" + match.Groups [1] + "\"");
+                        }
+
+                        // The pushing progress consists of two stages: the "Compressing
+                        // objects" stage which we count as 20% of the total progress, and
+                        // the "Writing objects" stage which we count as the last 80%
+                        if (line.Contains ("Compressing")) {
+                            // "Compressing objects" stage
+                            number = (number / 100 * 20);
+
+                        } else {
+                            // "Writing objects" stage
+                            number = (number / 100 * 80 + 20);
+                            Match speed_match = this.speed_regex.Match (line);
+
+                            if (speed_match.Success) {
+                                try {
+                                    speed = double.Parse (speed_match.Groups [1].Value, new CultureInfo ("en-US")) * 1024;
+
+                                } catch (FormatException) {
+                                    SparkleLogger.LogInfo ("Git", "Error parsing speed: \"" + speed_match.Groups [1] + "\"");
+                                }
+
+                                if (speed_match.Groups [2].Value.Equals ("M"))
+                                    speed = speed * 1024;
+                            }
+                        }
+
+                    } else {
+                        SparkleLogger.LogInfo ("Fetcher", line);
+                        line = line.Trim (new char [] {' ', '@'});
+
+                        if (line.StartsWith ("fatal:", StringComparison.InvariantCultureIgnoreCase) ||
+                            line.StartsWith ("error:", StringComparison.InvariantCultureIgnoreCase)) {
+
+                            base.errors.Add (line);
+
+                        } else if (line.StartsWith ("WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!")) {
+                            base.errors.Add ("warning: Remote host identification has changed!");
+
+                        } else if (line.StartsWith ("WARNING: POSSIBLE DNS SPOOFING DETECTED!")) {
+                            base.errors.Add ("warning: Possible DNS spoofing detected!");
+                        }
+                    }
+
+                    if (number >= percentage) {
+                        percentage = number;
+
+                        if (DateTime.Compare (last_change, DateTime.Now.Subtract (change_interval)) < 0) {
+                            base.OnProgressChanged (percentage, speed);
+                            last_change = DateTime.Now;
+                        }
+                    }
+                }
+
+            } catch (Exception) {
+                IsActive = false;
+                return false;
+            }
+
+            this.git.WaitForExit ();
+
+            if (this.git.ExitCode == 0) {
+                while (percentage < 100) {
+                    percentage += 25;
+
+                    if (percentage >= 100)
+                        break;
+
+                    Thread.Sleep (500);
+                    base.OnProgressChanged (percentage, 0);
+                }
+
+                base.OnProgressChanged (100, 0);
+
+                InstallConfiguration ();
+                InstallExcludeRules ();
+                InstallAttributeRules ();
+
+                return true;
+
+            } else {
+                return false;
+            }
+        }
+
+
+        public override bool IsFetchedRepoEmpty {
+            get {
+                SparkleGit git = new SparkleGit (TargetFolder, "rev-parse HEAD");
+                git.StartAndWaitForExit ();
+
+                return (git.ExitCode != 0);
+            }
+        }
+
+
+        public override void EnableFetchedRepoCrypto (string password)
+        {
+            // Set up the encryption filter
+            SparkleGit git_config_smudge = new SparkleGit (TargetFolder,
+                "config filter.encryption.smudge \"openssl enc -d -aes-256-cbc -base64 -S -md md5 " + this.crypto_salt +
+                " -pass file:.git/info/encryption_password\"");
+
+            SparkleGit git_config_clean = new SparkleGit (TargetFolder,
+                "config filter.encryption.clean  \"openssl enc -e -aes-256-cbc -base64 -S -md md5 " + this.crypto_salt +
+                " -pass file:.git/info/encryption_password\"");
+
+            git_config_smudge.StartAndWaitForExit ();
+            git_config_clean.StartAndWaitForExit ();
+
+            // Pass all files through the encryption filter
+            string git_attributes_file_path = new string [] { TargetFolder, ".git", "info", "attributes" }.Combine ();
+            File.WriteAllText (git_attributes_file_path, "\n* filter=encryption");
+
+            // Store the password
+            string password_file_path = new string [] { TargetFolder, ".git", "info", "encryption_password" }.Combine ();
+
+            if (this.crypto_password_is_hashed)
+                File.WriteAllText (password_file_path, password.SHA256 (this.crypto_salt));
+            else
+                File.WriteAllText (password_file_path, password);
+        }
+
+
+        public override bool IsFetchedRepoPasswordCorrect (string password)
+        {
+            string password_check_file_path = Path.Combine (TargetFolder, ".sparkleshare");
+
+            if (!File.Exists (password_check_file_path)) {
+                SparkleGit git = new SparkleGit (TargetFolder, "show HEAD:.sparkleshare");
+                string output = git.StartAndReadStandardOutput ();
+
+                if (git.ExitCode == 0)
+                    File.WriteAllText (password_check_file_path, output);
+                else
+                    return false;
+            }
+
+            Process process = new Process ();
+            process.EnableRaisingEvents              = true;
+            process.StartInfo.FileName               = "openssl";
+            process.StartInfo.WorkingDirectory       = TargetFolder;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.CreateNoWindow         = true;
+
+            string [] possible_passwords = new string [] {
+                password.SHA256 (this.crypto_salt),
+                password
+            };
+
+            int i = 0;
+            foreach (string possible_password in possible_passwords) {
+                process.StartInfo.Arguments = "enc -d -aes-256-cbc -base64 -pass pass:\"" + possible_password + "\"" +
+                    " -in \"" + password_check_file_path + "\"";
+
+                SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (process.StartInfo.WorkingDirectory),
+                    System.IO.Path.GetFileName (process.StartInfo.FileName) + " " + process.StartInfo.Arguments);
+
+                process.Start ();
+                process.WaitForExit ();
+
+                if (process.ExitCode == 0) {
+                    if (i > 0)
+                        this.crypto_password_is_hashed = false;
+
+                    File.Delete (password_check_file_path);
+                    return true;
+                }
+
+                i++;
+            }
+
+            return false;
+        }
+
+
+        public override void Stop ()
+        {
+            try {
+                if (this.git != null && !this.git.HasExited) {
+                    this.git.Kill ();
+                    this.git.Dispose ();
+                }
+
+            } catch (Exception e) {
+                SparkleLogger.LogInfo ("Fetcher", "Failed to dispose properly", e);
+            }
+
+            if (Directory.Exists (TargetFolder)) {
+                try {
+                    Directory.Delete (TargetFolder, true /* Recursive */ );
+                    SparkleLogger.LogInfo ("Fetcher", "Deleted '" + TargetFolder + "'");
+
+                } catch (Exception e) {
+                    SparkleLogger.LogInfo ("Fetcher", "Failed to delete '" + TargetFolder + "'", e);
+                }
+            }
+        }
+
+
+        public override void Complete ()
+        {
+            if (!IsFetchedRepoEmpty) {
+                SparkleGit git = new SparkleGit (TargetFolder, "checkout --quiet HEAD");
+                git.StartAndWaitForExit ();
+            }
+
+            base.Complete ();
+        }
+
+
+        private void InstallConfiguration ()
+        {
+            string [] settings = new string [] {
+                "core.autocrlf input",
+                "core.quotepath false", // Don't quote "unusual" characters in path names
+                "core.ignorecase false", // Be case sensitive explicitly to work on Mac
+                "core.filemode false", // Ignore permission changes
+                "core.precomposeunicode true", // Use the same Unicode form on all filesystems
+                "core.safecrlf false",
+                "core.excludesfile \"\"",
+                "core.packedGitLimit 128m", // Some memory limiting options
+                "core.packedGitWindowSize 128m",
+                "pack.deltaCacheSize 128m",
+                "pack.packSizeLimit 128m",
+                "pack.windowMemory 128m",
+                "push.default matching"
+            };
+
+            if (SparkleBackend.Platform == PlatformID.Win32NT)
+                settings [0] = "core.autocrlf true";
+
+            foreach (string setting in settings) {
+                SparkleGit git_config = new SparkleGit (TargetFolder, "config " + setting);
+                git_config.StartAndWaitForExit ();
+            }
+
+            if (this.use_git_bin)
+                InstallGitBinConfiguration ();
+        }
+
+
+        public void InstallGitBinConfiguration ()
+        {
+            string [] settings = new string [] {
+                "core.bigFileThreshold 1024g",
+                "filter.bin.clean \"git bin clean %f\"",
+                "filter.bin.smudge \"git bin smudge\""
+            };
+
+            foreach (string setting in settings) {
+                SparkleGit git_config = new SparkleGit (TargetFolder, "config " + setting);
+                git_config.StartAndWaitForExit ();
+            }
+        }
+
+
+        // Add a .gitignore file to the repo
+        private void InstallExcludeRules ()
+        {
+            string git_info_path = new string [] { TargetFolder, ".git", "info" }.Combine ();
+
+            if (!Directory.Exists (git_info_path))
+                Directory.CreateDirectory (git_info_path);
+
+            string exclude_rules           = string.Join (Environment.NewLine, ExcludeRules);
+            string exclude_rules_file_path = new string [] { git_info_path, "exclude" }.Combine ();
+
+            File.WriteAllText (exclude_rules_file_path, exclude_rules);
+        }
+
+
+        private void InstallAttributeRules ()
+        {
+            string attribute_rules_file_path = new string [] { TargetFolder, ".git", "info", "attributes" }.Combine ();
+            TextWriter writer                = new StreamWriter (attribute_rules_file_path);
+
+            if (this.use_git_bin) {
+                writer.WriteLine ("* filter=bin binary");
+
+            } else {
+                // Compile a list of files we don't want Git to compress.
+                // Not compressing already compressed files decreases memory usage and increases speed
+                string [] extensions = new string [] {
+                    "jpg", "jpeg", "png", "tiff", "gif", // Images
+                    "flac", "mp3", "ogg", "oga", // Audio
+                    "avi", "mov", "mpg", "mpeg", "mkv", "ogv", "ogx", "webm", // Video
+                    "zip", "gz", "bz", "bz2", "rpm", "deb", "tgz", "rar", "ace", "7z", "pak", "tc", "iso", ".dmg" // Archives
+                };
+
+                foreach (string extension in extensions) {
+                    writer.WriteLine ("*." + extension + " -delta");
+                    writer.WriteLine ("*." + extension.ToUpper () + " -delta");
+                }
+
+                writer.WriteLine ("*.txt text");
+                writer.WriteLine ("*.TXT text");
+            }
+
+            writer.Close ();
+        }
+    }
+}

SparkleLib/Git/SparkleGit.cs

@@ -0,0 +1,166 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser 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 <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.IO;
+using System.Diagnostics;
+using SparkleLib;
+
+namespace SparkleLib.Git {
+
+    public abstract class SparkleProcess : Process {
+
+        public SparkleProcess (string path, string args) : base ()
+        {
+            StartInfo.FileName  = path;
+            StartInfo.Arguments = args;
+        }
+
+
+        new public void Start ()
+        {
+            SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (StartInfo.WorkingDirectory),
+                System.IO.Path.GetFileName (StartInfo.FileName) + " " + StartInfo.Arguments);
+
+            try {
+                base.Start ();
+
+            } catch (Exception e) {
+                SparkleLogger.LogInfo ("Cmd", "Couldn't execute command: " + e.Message);
+                Environment.Exit (-1);
+            }
+        }
+
+
+        public void StartAndWaitForExit ()
+        {
+            Start ();
+            WaitForExit ();
+        }
+
+
+        public string StartAndReadStandardOutput ()
+        {
+            Start ();
+            
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            string output = StandardOutput.ReadToEnd ();
+            WaitForExit ();
+            
+            return output.TrimEnd ();
+        }
+
+
+        public string StartAndReadStandardError ()
+        {
+            StartInfo.RedirectStandardError = true;
+            Start ();
+            
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            string output = StandardError.ReadToEnd ();
+            WaitForExit ();
+            
+            return output.TrimEnd ();
+        }
+
+
+        protected string LocateCommand (string name)
+        {
+            string [] possible_command_paths = new string [] {
+                Environment.GetFolderPath (Environment.SpecialFolder.Personal) + "/bin/" + name,
+                Defines.INSTALL_DIR + "/bin/" + name,
+                "/usr/local/bin/" + name,
+                "/usr/bin/" + name,
+                "/opt/local/bin/" + name
+            };
+
+            foreach (string path in possible_command_paths) {
+                if (File.Exists (path))
+                    return path;
+            }
+
+            return name;
+        }
+    }
+
+
+    public class SparkleGit : SparkleProcess {
+
+        public static string ExecPath;
+        public static string GitPath;
+        public static string SSHPath;
+
+
+        public SparkleGit (string path, string args) : base (path, args)
+        {
+            if (string.IsNullOrEmpty (GitPath))
+                GitPath = LocateCommand ("git");
+
+            EnableRaisingEvents              = true;
+            StartInfo.FileName               = GitPath;
+            StartInfo.RedirectStandardOutput = true;
+            StartInfo.UseShellExecute        = false;
+            StartInfo.WorkingDirectory       = path;
+            StartInfo.CreateNoWindow         = true;
+
+            if (StartInfo.EnvironmentVariables.ContainsKey ("LANG"))
+                StartInfo.EnvironmentVariables ["LANG"] = "en_US";
+            else
+                StartInfo.EnvironmentVariables.Add ("LANG", "en_US");
+
+            if (StartInfo.EnvironmentVariables.ContainsKey ("GIT_TERMINAL_PROMPT"))
+                StartInfo.EnvironmentVariables ["GIT_TERMINAL_PROMPT"] = "0";
+            else
+                StartInfo.EnvironmentVariables.Add ("GIT_TERMINAL_PROMPT", "0");
+
+            if (!string.IsNullOrEmpty (SSHPath)) {
+                if (StartInfo.EnvironmentVariables.ContainsKey ("GIT_SSH"))
+                    StartInfo.EnvironmentVariables ["GIT_SSH"] = SSHPath;
+                else
+                    StartInfo.EnvironmentVariables.Add ("GIT_SSH", SSHPath);
+            }
+
+            if (string.IsNullOrEmpty (ExecPath))
+                StartInfo.Arguments = args;
+            else
+                StartInfo.Arguments = "--exec-path=\"" + ExecPath + "\" " + args;
+        }
+    }
+
+
+    public class SparkleGitBin : SparkleProcess {
+
+        public static string GitBinPath;
+
+
+        public SparkleGitBin (string path, string args) : base (path, args)
+        {
+            if (string.IsNullOrEmpty (GitBinPath))
+                GitBinPath = LocateCommand ("git-bin");
+
+            EnableRaisingEvents              = true;
+            StartInfo.FileName               = GitBinPath;
+            StartInfo.RedirectStandardOutput = true;
+            StartInfo.UseShellExecute        = false;
+            StartInfo.WorkingDirectory       = path;
+            StartInfo.CreateNoWindow         = true;
+            StartInfo.Arguments              = args;
+        }
+    }
+}

SparkleLib/Git/SparkleLib.Git.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,12 +8,11 @@
     <ProjectGuid>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Sparkles.Git</RootNamespace>
-    <AssemblyName>Sparkles.Git</AssemblyName>
+    <RootNamespace>SparkleLib.Git</RootNamespace>
+    <AssemblyName>SparkleLib.Git</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <ReleaseVersion>
     </ReleaseVersion>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>True</Optimize>
@@ -28,33 +27,6 @@
     <DefineConstants>TRACE DEBUG</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' ">
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' ">
-    <Optimize>False</Optimize>
-    <OutputPath>bin\DebugMac</OutputPath>
-    <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE DEBUG</DefineConstants>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWindows|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\</OutputPath>
-    <DefineConstants>TRACE DEBUG</DefineConstants>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWindows|AnyCPU'">
-    <OutputPath>..\..\bin\</OutputPath>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
   </ItemGroup>
@@ -74,16 +46,14 @@
   </Target>
   -->
   <ItemGroup>
-    <Compile Include="Git.Fetcher.cs" />
-    <Compile Include="Git.Command.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Git.Repository.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Sparkles.csproj">
+    <ProjectReference Include="..\SparkleLib.csproj">
       <Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
-      <Name>Sparkles</Name>
+      <Name>SparkleLib</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="SparkleFetcherGit.cs" />
+    <Compile Include="SparkleGit.cs" />
+    <Compile Include="SparkleRepoGit.cs" />
+  </ItemGroup>
 </Project>

SparkleLib/Makefile.am

@@ -0,0 +1,32 @@
+ASSEMBLY = SparkleLib
+TARGET = library
+
+ASSEMBLY_INFO_SOURCE = Defines.cs
+
+SOURCES =  \
+	SparkleBackend.cs \
+	SparkleConfig.cs \
+	SparkleExtensions.cs \
+	SparkleFetcherBase.cs \
+	SparkleFetcherSSH.cs \
+	SparkleListenerBase.cs \
+	SparkleListenerFactory.cs \
+	SparkleListenerTcp.cs \
+	SparkleLogger.cs \
+	SparkleRepoBase.cs \
+	SparkleUser.cs \
+	SparkleWatcher.cs \
+	SparkleWrappers.cs
+
+
+install-data-hook:
+	for ASM in $(EXTRA_BUNDLE); do \
+		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+	done;
+
+uninstall-hook:
+	for ASM in $(EXTRA_BUNDLE); do \
+		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+	done;
+
+include $(top_srcdir)/build/build.mk

SparkleLib/SparkleBackend.cs

@@ -0,0 +1,60 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser 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 <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace SparkleLib {
+
+    public static class SparkleBackend {
+
+        public static string Version {
+            get {
+                string version = "" + Assembly.GetExecutingAssembly ().GetName ().Version;
+                return version.Substring (0, version.Length - 2);
+            }
+        }
+
+
+        // This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform,
+        // which is intentionally broken in Mono for historical reasons
+        public static PlatformID Platform {
+            get {
+                IntPtr buf = IntPtr.Zero;
+
+                try {
+                    buf = Marshal.AllocHGlobal (8192);
+
+                    if (uname (buf) == 0 && Marshal.PtrToStringAnsi (buf) == "Darwin")
+                        return PlatformID.MacOSX;
+
+                } catch {
+                } finally {
+                    if (buf != IntPtr.Zero)
+                        Marshal.FreeHGlobal (buf);
+                }
+
+                return Environment.OSVersion.Platform;
+            }
+        }
+
+
+        [DllImport ("libc")]
+        private static extern int uname (IntPtr buf);
+    }
+}

SparkleLib/SparkleConfig.cs

@@ -1,9 +1,9 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Lesser General Public License as
-//   published by the Free Software Foundation, either version 3 of the
+//   it under the terms of the GNU Lesser 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,
@@ -16,74 +16,51 @@
 
 
 using System;
-using System.Collections.Generic;
 using System.IO;
+using System.Collections.Generic;
 using System.Xml;
-using System.Xml.Linq;
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public class Configuration : XmlDocument {
+    public class SparkleConfig : XmlDocument {
 
-        private static Lazy<Configuration> ConfigLazy = new Lazy<Configuration> (() => {
-            string app_data_path = Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData);
-
-            if (InstallationInfo.OperatingSystem != OS.Windows && InstallationInfo.OperatingSystem != OS.macOS)
-                app_data_path = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".config");
-
-            string config_path = Path.Combine (app_data_path, "org.sparkleshare.SparkleShare");
-
-            return new Configuration (config_path, "projects.xml");
-        });
-
-        public static Configuration DefaultConfiguration { get { return ConfigLazy.Value; } }
+        public static SparkleConfig DefaultConfig;
         public static bool DebugMode = true;
 
-        public readonly string DirectoryPath;
-        public readonly string FilePath;
-        public readonly string TmpPath;
-        public readonly string BinPath;
-        public string AvatarProvider;
-
-        public readonly string LogFilePath;
+        public string FullPath;
+        public string TmpPath;
+        public string LogFilePath;
 
 
         public string HomePath {
             get {
-                if (InstallationInfo.OperatingSystem == OS.Windows)
+                if (SparkleBackend.Platform == PlatformID.Win32NT)
                     return Environment.GetFolderPath (Environment.SpecialFolder.UserProfile);
-
-                return Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+                else
+                    return Environment.GetFolderPath (Environment.SpecialFolder.Personal);
             }
         }
 
 
         public string FoldersPath {
             get {
-                if (GetConfigOption ("folders_path") != null)
+                if (GetConfigOption ("folders_path") != null)                      
                     return GetConfigOption ("folders_path");
-
-                return Path.Combine (HomePath, "SparkleShare");
+                else
+                    return Path.Combine (HomePath, "SparkleShare");
             }
         }
 
 
-        public Configuration (string config_path, string config_file_name)
+        public SparkleConfig (string config_path, string config_file_name)
         {
-            FilePath = Path.Combine (config_path, config_file_name);
-            DirectoryPath = config_path;
-
-			BinPath = Path.Combine (config_path, "bin");
-
-            if (!Directory.Exists (BinPath))
-                Directory.CreateDirectory (BinPath);
-
+            FullPath         = Path.Combine (config_path, config_file_name);
             string logs_path = Path.Combine (config_path, "logs");
 
             int i = 1;
             do {
                 LogFilePath = Path.Combine (
-                    logs_path, "log_" + DateTime.Now.ToString ("yyyy-MM-dd") + "." +  i + ".txt");
+                    logs_path, "debug_log_" + DateTime.Now.ToString ("yyyy-MM-dd") + "." +  i + ".txt");
 
                 i++;
 
@@ -93,7 +70,7 @@ namespace Sparkles {
                 Directory.CreateDirectory (logs_path);
 
             // Delete logs older than a week
-            foreach (FileInfo file in new DirectoryInfo (logs_path).GetFiles ("log*.txt")) {
+            foreach (FileInfo file in new DirectoryInfo (logs_path).GetFiles ("debug_log*.txt")) {
                 if (file.LastWriteTime < DateTime.Now.AddDays (-7))
                     file.Delete ();
             }
@@ -102,7 +79,7 @@ namespace Sparkles {
                 Directory.CreateDirectory (config_path);
 
             try {
-                Load (FilePath);
+              Load (FullPath);
 
             } catch (TypeInitializationException) {
                 CreateInitialConfig ();
@@ -111,59 +88,83 @@ namespace Sparkles {
                 CreateInitialConfig ();
 
             } catch (XmlException) {
-                var file = new FileInfo (FilePath);
+                FileInfo file = new FileInfo (FullPath);
 
                 if (file.Length == 0) {
-                    File.Delete (FilePath);
+                    File.Delete (FullPath);
                     CreateInitialConfig ();
 
                 } else {
-                    throw;
+                    throw new XmlException (FullPath + " does not contain a valid config XML structure.");
                 }
 
             } finally {
-                TmpPath = Path.Combine (DirectoryPath, "tmp");
+                Load (FullPath);
+                TmpPath = Path.Combine (FoldersPath, ".tmp");
                 Directory.CreateDirectory (TmpPath);
             }
         }
 
 
-        void CreateInitialConfig ()
+        private void CreateInitialConfig ()
         {
-            string user_name = Environment.UserName;
+            string user_name = "Unknown";
 
-            if (InstallationInfo.OperatingSystem != OS.Windows) {
+            if (SparkleBackend.Platform == PlatformID.Unix ||
+                SparkleBackend.Platform == PlatformID.MacOSX) {
+
+                user_name = Environment.UserName;
                 if (string.IsNullOrEmpty (user_name))
                     user_name = "Unknown";
                 else
-                    // On Unix systems the user name may have commas appended
-                    user_name = user_name.TrimEnd (',');
+                    user_name = user_name.TrimEnd (",".ToCharArray ());
+
+            } else {
+                user_name = Environment.UserName;
             }
 
-            XElement xml =
-                new XElement ("sparkleshare",
-                    new XElement ("user",
-                        new XElement ("name", user_name),
-                        new XElement ("email", "Unknown")
-                    ),
-                    new XElement ("notifications", bool.TrueString)
-            );
-
-            LoadXml (xml.ToString ());
+            
+            string n = Environment.NewLine;
+            File.WriteAllText (FullPath,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + n +
+                "<sparkleshare>" + n +
+                "  <user>" + n +
+                "    <name>" + user_name + "</name>" + n +
+                "    <email>Unknown</email>" + n +
+                "  </user>" + n +
+                "</sparkleshare>");
         }
 
 
-        public User User {
+        public SparkleUser User {
             get {
-                string name  = SelectSingleNode ("/sparkleshare/user/name/text()").Value;
-                string email = SelectSingleNode ("/sparkleshare/user/email/text()").Value;
+                XmlNode name_node  = SelectSingleNode ("/sparkleshare/user/name/text()");
+                XmlNode email_node = SelectSingleNode ("/sparkleshare/user/email/text()");
+                string user_name   = name_node.Value;
+                string user_email  = email_node.Value;
 
-                return new User (name, email);
+                SparkleUser user = new SparkleUser (user_name, user_email);
+
+                string [] private_key_file_paths = Directory.GetFiles (Path.GetDirectoryName (FullPath), "*.key");
+                
+                if (private_key_file_paths.Length > 0) {
+                    user.PrivateKey         = File.ReadAllText (private_key_file_paths [0]);
+                    user.PrivateKeyFilePath = private_key_file_paths [0];
+
+                    user.PublicKey         = File.ReadAllText (private_key_file_paths [0] + ".pub");
+                    user.PublicKeyFilePath = private_key_file_paths [0] + ".pub";
+                }
+
+                return user;
             }
 
             set {
-                SelectSingleNode ("/sparkleshare/user/name/text()").InnerText  = value.Name;
-                SelectSingleNode ("/sparkleshare/user/email/text()").InnerText = value.Email;
+                SparkleUser user = (SparkleUser) value;
+
+                XmlNode name_node    = SelectSingleNode ("/sparkleshare/user/name/text()");
+                XmlNode email_node   = SelectSingleNode ("/sparkleshare/user/email/text()");
+                name_node.InnerText  = user.Name;
+                email_node.InnerText = user.Email;
 
                 Save ();
             }
@@ -172,12 +173,13 @@ namespace Sparkles {
 
         public List<string> Folders {
             get {
-                var folders = new List<string> ();
+                List<string> folders = new List<string> ();
 
                 foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder"))
                     folders.Add (node_folder ["name"].InnerText);
 
                 folders.Sort ();
+
                 return folders;
             }
         }
@@ -220,31 +222,31 @@ namespace Sparkles {
         }
 
 
-        public void RenameFolder (string identifier, string new_name)
+        public void RenameFolder (string identifier, string name)
         {
             XmlNode node_folder = SelectSingleNode (
                 string.Format ("/sparkleshare/folder[identifier=\"{0}\"]", identifier));
 
-            node_folder ["name"].InnerText = new_name;
+            node_folder ["name"].InnerText = name;
             Save ();
         }
 
 
-        public string BackendByName (string name)
+        public string GetBackendForFolder (string name)
         {
-            return FolderValueByKey (name, "backend");
+            return GetFolderValue (name, "backend");
         }
 
 
-        public string IdentifierByName (string name)
+        public string GetIdentifierForFolder (string name)
         {
-            return FolderValueByKey (name, "identifier");
+            return GetFolderValue (name, "identifier");
         }
 
 
-        public string UrlByName (string name)
+        public string GetUrlForFolder (string name)
         {
-            return FolderValueByKey (name, "url");
+            return GetFolderValue (name, "url");
         }
 
 
@@ -266,7 +268,7 @@ namespace Sparkles {
 
         public bool SetFolderOptionalAttribute (string folder_name, string key, string value)
         {
-            XmlNode folder = FolderByName (folder_name);
+            XmlNode folder = GetFolder (folder_name);
 
             if (folder == null)
                 return false;
@@ -288,7 +290,7 @@ namespace Sparkles {
 
         public string GetFolderOptionalAttribute (string folder_name, string key)
         {
-            XmlNode folder = FolderByName (folder_name);
+            XmlNode folder = GetFolder (folder_name);
 
             if (folder != null) {
                 if (folder [key] != null)
@@ -329,31 +331,34 @@ namespace Sparkles {
             }
 
             Save ();
-            Logger.LogInfo ("Config", "Updated option " + name + ":" + content);
+            SparkleLogger.LogInfo ("Config", "Updated option " + name + ":" + content);
         }
 
 
-        XmlNode FolderByName (string name)
+        private XmlNode GetFolder (string name)
         {
             return SelectSingleNode (string.Format ("/sparkleshare/folder[name=\"{0}\"]", name));
         }
-
-
-        string FolderValueByKey (string name, string key)
+        
+        
+        private string GetFolderValue (string name, string key)
         {
-            XmlNode folder = FolderByName(name);
-
+            XmlNode folder = GetFolder(name);
+            
             if ((folder != null) && (folder [key] != null))
                 return folder [key].InnerText;
-
-            return null;
+            else
+                return null;
         }
 
 
-        void Save ()
+        private void Save ()
         {
-            Save (FilePath);
-            Logger.LogInfo ("Config", "Wrote to '" + FilePath + "'");
+            if (!File.Exists (FullPath))
+                throw new FileNotFoundException (FullPath + " does not exist");
+
+            Save (FullPath);
+            SparkleLogger.LogInfo ("Config", "Wrote to '" + FullPath + "'");
         }
     }
 }

SparkleLib/SparkleExtensions.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -20,10 +20,31 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Sparkles {
+namespace SparkleLib {
 
     public static class Extensions {
 
+        public static string Combine (this string [] parts)
+        {
+            string new_path = "";
+
+            foreach (string part in parts)
+                new_path = Path.Combine (new_path, part);
+
+            return new_path;
+        }
+
+        
+        public static string SHA1 (this string s)
+        {
+            SHA1 sha1          = new SHA1CryptoServiceProvider ();
+            byte [] bytes      = ASCIIEncoding.Default.GetBytes (s);
+            byte [] sha1_bytes = sha1.ComputeHash (bytes);
+
+            return BitConverter.ToString (sha1_bytes).ToLower ().Replace ("-", "");
+        }
+
+
         public static string SHA256 (this string s)
         {
             SHA256 sha256        = new SHA256CryptoServiceProvider ();
@@ -54,75 +75,25 @@ namespace Sparkles {
         }
 
 
-        public static string AESEncrypt (this string plain_text, string password)
-        {
-            Random random = new Random ();
-            byte [] salt_bytes = new Byte [16];
-            random.NextBytes (salt_bytes);
-
-            string salt = Convert.ToBase64String (salt_bytes);
-            password = (password + salt).SHA256 ().Substring (0, 32);
-
-            RijndaelManaged aes = new RijndaelManaged () {
-                KeySize = 256,
-                BlockSize = 128,
-                Mode = CipherMode.CBC,
-                Padding = PaddingMode.PKCS7,
-                Key = Encoding.UTF8.GetBytes (password),
-                IV = Encoding.UTF8.GetBytes (password.ToCharArray (), 0, 16)
-            };
-
-            byte [] buffer = Encoding.UTF8.GetBytes (plain_text);
-            ICryptoTransform crypto = aes.CreateEncryptor (aes.Key, aes.IV);
-            byte [] encrypted_bytes = crypto.TransformFinalBlock (buffer, 0, buffer.Length);
-
-            return salt + "_" + Convert.ToBase64String (encrypted_bytes);
-        }
-
-
-        public static string AESDecrypt (this string s, string password)
-        {
-            string salt = s.Substring (0, s.IndexOf ("_"));
-            password = (password + salt).SHA256 ().Substring (0, 32);
-
-            RijndaelManaged aes = new RijndaelManaged () {
-                KeySize = 256,
-                BlockSize = 128,
-                Mode = CipherMode.CBC,
-                Padding = PaddingMode.PKCS7,
-                Key = Encoding.UTF8.GetBytes (password),
-                IV = Encoding.UTF8.GetBytes (password.ToCharArray (), 0, 16)
-            };
-
-            string encrypted_text = s.Substring (s.IndexOf ("_") + 1);
-            byte [] buffer = Convert.FromBase64String (encrypted_text);
-            ICryptoTransform crypto = aes.CreateDecryptor (aes.Key, aes.IV);
-            byte [] decrypted_bytes = crypto.TransformFinalBlock (buffer, 0, buffer.Length);
-
-            return Encoding.UTF8.GetString (decrypted_bytes);
-        }
-
-
         // Format a file size nicely with small caps.
         // Example: 1048576 becomes "1 ᴍʙ"
         public static string ToSize (this double byte_count)
         {
             if (byte_count >= 1099511627776)
-                return string.Format ("{0:##.##} ᴛʙ", Math.Round (byte_count / 1099511627776, 2));
+                return String.Format ("{0:##.##} ᴛʙ", Math.Round (byte_count / 1099511627776, 2));
             else if (byte_count >= 1073741824)
-                return string.Format ("{0:##.##} ɢʙ", Math.Round (byte_count / 1073741824, 1));
+                return String.Format ("{0:##.##} ɢʙ", Math.Round (byte_count / 1073741824, 1));
             else if (byte_count >= 1048576)
-                return string.Format ("{0:##.##} ᴍʙ", Math.Round (byte_count / 1048576, 1));
+                return String.Format ("{0:##.##} ᴍʙ", Math.Round (byte_count / 1048576, 1));
             else if (byte_count >= 1024)
-                return string.Format ("{0:##.##} ᴋʙ", Math.Round (byte_count / 1024, 0));
+                return String.Format ("{0:##.##} ᴋʙ", Math.Round (byte_count / 1024, 0));
             else
-                return byte_count + " ʙ";
+                return byte_count.ToString () + " ʙ";
         }
 
 
-        public static bool IsSymlink (this string path)
+        public static bool IsSymlink (this FileSystemInfo file)
         {
-            var file = new FileInfo (path);
             return ((file.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint);
         }
 
@@ -130,7 +101,7 @@ namespace Sparkles {
         public static string ToPrettyDate (this DateTime timestamp)
         {
             TimeSpan time_diff = DateTime.Now.Subtract (timestamp);
-            var day_diff = (int) time_diff.TotalDays;                
+            int day_diff       = (int) time_diff.TotalDays;                
             DateTime yesterday = DateTime.Today.AddDays (-1);
 
             if (timestamp >= yesterday && timestamp < DateTime.Today) {
@@ -144,12 +115,12 @@ namespace Sparkles {
             
             } else if (day_diff < 31) {
                 if (day_diff < 14)
-                    return "a week ago";
+                    return "last week";
                 else
                     return string.Format ("{0} weeks ago", Math.Ceiling ((double) day_diff / 7));
 
             } else if (day_diff < 62) {
-                return "a month ago";
+                return "last month";
 
             } else { 
                 return string.Format ("{0} months ago", Math.Ceiling ((double) day_diff / 31));

SparkleLib/SparkleFetcherBase.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -17,244 +17,70 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Security.Cryptography;
 using System.Threading;
 
-namespace Sparkles {
+namespace SparkleLib {
 
     public class SparkleFetcherInfo {
-        public string Address; // TODO: Uri object
+        public string Address;
         public string RemotePath;
-
-        public string Fingerprint;
-
         public string Backend;
+        public string Fingerprint;
         public string TargetDirectory;
+        public string AnnouncementsUrl;
         public bool FetchPriorHistory;
-
-        public string AnnouncementsUrl; // TODO: Uri object
     }
 
 
-    public abstract class BaseFetcher {
+    public abstract class SparkleFetcherBase {
 
         public event Action Started = delegate { };
         public event Action Failed = delegate { };
 
         public event FinishedEventHandler Finished = delegate { };
-        public delegate void FinishedEventHandler (StorageType storage_type, string [] warnings);
+        public delegate void FinishedEventHandler (bool repo_is_encrypted, bool repo_is_empty, string [] warnings);
 
         public event ProgressChangedEventHandler ProgressChanged = delegate { };
-        public delegate void ProgressChangedEventHandler (double percentage, double speed, string information);
+        public delegate void ProgressChangedEventHandler (double percentage, double speed);
 
 
         public abstract bool Fetch ();
         public abstract void Stop ();
-        public bool IsActive { get; protected set; }
-        public double ProgressPercentage { get; private set; }
-        public double ProgressSpeed { get; private set; }
-
-
-        protected abstract bool IsFetchedRepoEmpty { get; }
-        public StorageType FetchedRepoStorageType { get; protected set; }
+        public abstract bool IsFetchedRepoEmpty { get; }
         public abstract bool IsFetchedRepoPasswordCorrect (string password);
         public abstract void EnableFetchedRepoCrypto (string password);
 
-        public readonly List<StorageTypeInfo> AvailableStorageTypes = new List<StorageTypeInfo> ();
-
+        public double ProgressPercentage { get; private set; }
+        public double ProgressSpeed { get; private set; }
 
         public Uri RemoteUrl { get; protected set; }
         public string RequiredFingerprint { get; protected set; }
-        public readonly bool FetchPriorHistory;
+        public readonly bool FetchPriorHistory = false;
         public string TargetFolder { get; protected set; }
+        public bool IsActive { get; protected set; }
+        public string Identifier;
         public SparkleFetcherInfo OriginalFetcherInfo;
 
-
-        protected List<string> warnings = new List<string> ();
-        protected List<string> errors   = new List<string> ();
-
         public string [] Warnings {
             get {
-                return warnings.ToArray ();
+                return this.warnings.ToArray ();
             }
         }
 
         public string [] Errors {
             get {
-                return errors.ToArray ();
+                return this.errors.ToArray ();
             }
         }
 
         
+        protected List<string> warnings = new List<string> ();
+        protected List<string> errors   = new List<string> ();
 
-        protected BaseFetcher (SparkleFetcherInfo info)
-        {
-            FetchedRepoStorageType = StorageType.Unknown;
-
-            AvailableStorageTypes.Add (
-                new StorageTypeInfo (StorageType.Plain, "Plain Storage", "Nothing fancy;\nmaximum compatibility"));
-
-            OriginalFetcherInfo = info;
-            RequiredFingerprint = info.Fingerprint;
-            FetchPriorHistory   = info.FetchPriorHistory;
-            string remote_path  = info.RemotePath.Trim ("/".ToCharArray ());
-            string address      = info.Address;
-
-            if (address.EndsWith ("/", StringComparison.InvariantCulture))
-                address = address.Substring (0, address.Length - 1);
-
-            if (!remote_path.StartsWith ("/", StringComparison.InvariantCulture))
-                remote_path = "/" + remote_path;
-
-            if (!address.Contains ("://"))
-                address = "ssh://" + address;
-
-            TargetFolder = info.TargetDirectory;
-
-            RemoteUrl = new Uri (address + remote_path);
-            IsActive  = false;
-        }
-
-
-        Thread thread;
-
-        public void Start ()
-        {
-            IsActive = true;
-            Started ();
-
-            Logger.LogInfo ("Fetcher", TargetFolder + " | Fetching folder: " + RemoteUrl);
-
-            try {
-                if (Directory.Exists (TargetFolder))
-                    Directory.Delete (TargetFolder, recursive: true);
-            
-            } catch (IOException) {
-                errors.Add ("\"" + TargetFolder + "\" is read-only.");
-                Failed ();
-
-                return;
-            }
-
-            thread = new Thread (() => {
-                if (Fetch ()) {
-                    Thread.Sleep (500);
-                    Logger.LogInfo ("Fetcher", "Finished");
-
-                    IsActive = false;
-                    Finished (FetchedRepoStorageType, Warnings);
-
-                } else {
-                    Thread.Sleep (500);
-
-                    if (IsActive) {
-                        Logger.LogInfo ("Fetcher", "Failed");
-                        Failed ();
-                    
-                    } else {
-                        Logger.LogInfo ("Fetcher", "Failed: cancelled by user");
-                    }
-
-                    IsActive = false;
-                }
-            });
-
-            thread.Start ();
-        }
-
-
-        public void Complete ()
-        {
-            if (FetchedRepoStorageType == StorageType.Unknown) {
-                Complete (StorageType.Plain);
-                return;
-            }
-
-            this.Complete (FetchedRepoStorageType);
-        }
-
-
-        public virtual string Complete (StorageType storage_type)
-        {
-            FetchedRepoStorageType = storage_type;
-
-            if (IsFetchedRepoEmpty)
-                CreateInitialChangeSet ();
-            
-            return Path.GetRandomFileName ().SHA256 ();
-        }
-
-
-        // Create an initial change set when the
-        // user has fetched an empty remote folder
-        void CreateInitialChangeSet ()
-        {
-			string n = Environment.NewLine;
-            string file_path = Path.Combine (TargetFolder, "SparkleShare.txt");
-
-            var uri_builder = new UriBuilder (RemoteUrl);
-
-            // Don't expose possible username or password
-            if (RemoteUrl.Scheme.StartsWith ("http", StringComparison.InvariantCultureIgnoreCase)) {
-                uri_builder.UserName = "";
-                uri_builder.Password = "";
-            }
-
-            string text = "Congratulations, you've successfully created a SparkleShare repository!" + n +
-                n +
-                "Any files you add or change in this folder will be automatically synced to " + n +
-                uri_builder.Uri + " and everyone connected to it." + n +
-                n +
-                "SparkleShare is an Open Source software program that helps people collaborate and " + n +
-                "share files. If you like what we do, consider buying us a beer: http://www.sparkleshare.org/" + n +
-                n +
-                "Have fun! :)" + n;
-
-            if (FetchedRepoStorageType == StorageType.Encrypted)
-                text = text.Replace ("a SparkleShare repository", "an encrypted SparkleShare repository");
-
-            File.WriteAllText (file_path, text);
-        }
-
-
-        DateTime progress_last_change = DateTime.Now;
-
-        protected void OnProgressChanged (double percentage, double speed, string information) {
-            // Only trigger the ProgressChanged event once per second
-            if (DateTime.Compare (this.progress_last_change, DateTime.Now.Subtract (new TimeSpan (0, 0, 0, 1))) >= 0)
-                return;
-
-            ProgressChanged (percentage, speed, information);
-        }
-
-
-        public static string GetBackend (string address)
-        {
-            if (address.StartsWith ("ssh+", StringComparison.InvariantCultureIgnoreCase)) {
-                string backend = address.Substring (0, address.IndexOf ("://", StringComparison.InvariantCulture));
-                backend = backend.Substring (4);
-
-                return char.ToUpper (backend [0]) + backend.Substring (1);
-            }
-
-            return "Git";
-        }
-
-
-        public virtual string FormatName ()
-        {
-            return Path.GetFileName (RemoteUrl.AbsolutePath);
-        }
-
-
-        public void Dispose ()
-        {
-            if (thread != null)
-                thread.Abort ();
-        }
-
-
-        protected string [] ExcludeRules = {
+        protected string [] ExcludeRules = new string [] {
             "*.autosave", // Various autosaving apps
             "*~", // gedit and emacs
             ".~lock.*", // LibreOffice
@@ -278,5 +104,169 @@ namespace Sparkles {
             "*<*", "*>*", "*:*", "*\"*", "*|*", "*\\?*", "*\\**", "*\\\\*" // Not allowed on Windows systems,
             // see (http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx)
         };
+
+
+        private Thread thread;
+
+
+        public SparkleFetcherBase (SparkleFetcherInfo info)
+        {
+            OriginalFetcherInfo = info;
+            RequiredFingerprint = info.Fingerprint;
+            FetchPriorHistory   = info.FetchPriorHistory;
+            string remote_path  = info.RemotePath.Trim ("/".ToCharArray ());
+            string address      = info.Address;
+
+            if (address.EndsWith ("/"))
+                address = address.Substring (0, address.Length - 1);
+
+            if (!remote_path.StartsWith ("/"))
+                remote_path = "/" + remote_path;
+
+            if (!address.Contains ("://"))
+                address = "ssh://" + address;
+
+            TargetFolder = info.TargetDirectory;
+
+            RemoteUrl = new Uri (address + remote_path);
+            IsActive  = false;
+        }
+
+
+        public void Start ()
+        {
+            IsActive = true;
+            Started ();
+
+            SparkleLogger.LogInfo ("Fetcher", TargetFolder + " | Fetching folder: " + RemoteUrl);
+
+            try {
+                if (Directory.Exists (TargetFolder))
+                    Directory.Delete (TargetFolder, true);
+            
+            } catch (IOException) {
+                this.errors.Add ("\"" + TargetFolder + "\" is read-only.");
+                Failed ();
+                return;
+            }
+
+            this.thread = new Thread (() => {
+                if (Fetch ()) {
+                    Thread.Sleep (500);
+                    SparkleLogger.LogInfo ("Fetcher", "Finished");
+
+                    IsActive = false;
+
+                    bool repo_is_encrypted = (RemoteUrl.AbsolutePath.Contains ("-crypto") ||
+                                              RemoteUrl.Host.Equals ("sparkleshare.net"));
+
+                    Finished (repo_is_encrypted, IsFetchedRepoEmpty, Warnings);
+
+                } else {
+                    Thread.Sleep (500);
+
+                    if (IsActive) {
+                        SparkleLogger.LogInfo ("Fetcher", "Failed");
+                        Failed ();
+                    
+                    } else {
+                        SparkleLogger.LogInfo ("Fetcher", "Failed: cancelled by user");
+                    }
+
+                    IsActive = false;
+                }
+            });
+
+            this.thread.Start ();
+        }
+
+
+        public virtual void Complete ()
+        {
+            string identifier_path = Path.Combine (TargetFolder, ".sparkleshare");
+
+            if (File.Exists (identifier_path)) {
+                Identifier = File.ReadAllText (identifier_path).Trim ();
+            
+            } else {
+                Identifier = CreateIdentifier ();
+                File.WriteAllText (identifier_path, Identifier);
+
+                if (IsFetchedRepoEmpty)
+                    CreateInitialChangeSet ();
+            }
+
+            File.SetAttributes (identifier_path, FileAttributes.Hidden);
+        }
+
+
+        // Create an initial change set when the
+        // user has fetched an empty remote folder
+        private void CreateInitialChangeSet ()
+        {
+            string file_path = Path.Combine (TargetFolder, "SparkleShare.txt");
+            string n = Environment.NewLine;
+
+            UriBuilder uri_builder = new UriBuilder (RemoteUrl);
+
+            if (RemoteUrl.Scheme.Contains ("http")) {
+                uri_builder.UserName = "";
+                uri_builder.Password = "";
+            }
+
+            string text = "Congratulations, you've successfully created a SparkleShare repository!" + n +
+                n +
+                "Any files you add or change in this folder will be automatically synced to " + n +
+                uri_builder.ToString () + " and everyone connected to it." + n +
+                n +
+                "SparkleShare is an Open Source software program that helps people collaborate and " + n +
+                "share files. If you like what we do, consider buying us a beer: http://www.sparkleshare.org/" + n +
+                n +
+                "Have fun! :)" + n;
+
+            if (RemoteUrl.AbsolutePath.Contains ("-crypto") || RemoteUrl.Host.Equals ("sparkleshare.net"))
+                text = text.Replace ("a SparkleShare repository", "an encrypted SparkleShare repository");
+
+            File.WriteAllText (file_path, text);
+        }
+
+
+        public static string CreateIdentifier ()
+        {
+            return Path.GetRandomFileName ().SHA1 ();
+        }
+
+
+        public void Dispose ()
+        {
+            if (this.thread != null)
+                this.thread.Abort ();
+        }
+
+
+        protected void OnProgressChanged (double percentage, double speed) {
+            ProgressChanged (percentage, speed);
+        }
+
+
+        protected string GenerateCryptoSalt ()
+        {
+            string salt = Path.GetRandomFileName ().SHA1 ();
+            return salt.Substring (0, 16);
+        }
+
+
+        public static string GetBackend (string address)
+        {
+            if (address.StartsWith ("ssh+")) {
+				string backend = address.Substring (0, address.IndexOf ("://"));
+				backend        = backend.Substring (4);
+
+                return char.ToUpper (backend [0]) + backend.Substring (1);
+
+            } else {
+                return "Git";
+            }
+        }
     }
 }

SparkleLib/SparkleFetcherSSH.cs

@@ -0,0 +1,173 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser 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 <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+
+namespace SparkleLib {
+
+    public abstract class SparkleFetcherSSH : SparkleFetcherBase {
+
+        public SparkleFetcherSSH (SparkleFetcherInfo info) : base (info)
+        {
+        }
+
+
+        public override bool Fetch ()
+        {
+            if (RemoteUrl.Host.EndsWith (".onion")) {
+                // Tor has special domain names called ".onion addresses".  They can only be
+                // resolved by using a proxy via tor. While the rest of the openssh suite
+                // fully supports proxying, ssh-keyscan does not, so we can't use it for .onion
+                SparkleLogger.LogInfo ("Auth", "using tor .onion address skipping ssh-keyscan");
+
+            } else if (!RemoteUrl.Scheme.StartsWith ("http")) {
+                string host_key = FetchHostKey ();
+                
+                if (string.IsNullOrEmpty (RemoteUrl.Host) || host_key == null) {
+                    SparkleLogger.LogInfo ("Auth", "Could not fetch host key");
+                    this.errors.Add ("error: Could not fetch host key");
+                    
+                    return false;
+                }
+                
+                bool warn = true;
+                if (RequiredFingerprint != null) {
+                    string host_fingerprint;
+
+                    try {
+                        host_fingerprint = DeriveFingerprint (host_key);
+                    
+                    } catch (InvalidOperationException e) {
+                        // "Unapproved cryptographic algorithms" won't work when FIPS is enabled on Windows.
+                        // Software like Cisco AnyConnect can demand this feature is on, so we show an error
+                        SparkleLogger.LogInfo ("Auth", "Unable to derive fingerprint: ", e);
+                        this.errors.Add ("error: Can't check fingerprint due to FIPS being enabled");
+                        
+                        return false;
+                    }
+
+                    if (host_fingerprint == null || !RequiredFingerprint.Equals (host_fingerprint)) {
+                        SparkleLogger.LogInfo ("Auth", "Fingerprint doesn't match");
+                        this.errors.Add ("error: Host fingerprint doesn't match");
+                        
+                        return false;
+                    }
+                    
+                    warn = false;
+                    SparkleLogger.LogInfo ("Auth", "Fingerprint matches");
+                    
+                } else {
+                    SparkleLogger.LogInfo ("Auth", "Skipping fingerprint check");
+                }
+                
+                AcceptHostKey (host_key, warn);
+            }
+            
+            return true;
+        }
+
+
+        private string FetchHostKey ()
+        {
+            SparkleLogger.LogInfo ("Auth", "Fetching host key for " + RemoteUrl.Host);
+            
+            Process process = new Process ();
+            process.StartInfo.FileName               = "ssh-keyscan";
+            process.StartInfo.WorkingDirectory       = SparkleConfig.DefaultConfig.TmpPath;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.CreateNoWindow         = true;
+            process.EnableRaisingEvents              = true;
+            
+            string [] key_types = {"rsa", "dsa", "ecdsa"};
+            
+            foreach (string key_type in key_types) {
+                if (RemoteUrl.Port < 1)
+                    process.StartInfo.Arguments = "-t " + key_type + " -p 22 " + RemoteUrl.Host;
+                else
+                    process.StartInfo.Arguments = "-t " + key_type + " -p " + RemoteUrl.Port + " " + RemoteUrl.Host;
+                
+                SparkleLogger.LogInfo ("Cmd", process.StartInfo.FileName + " " + process.StartInfo.Arguments);
+                
+                process.Start ();
+                string host_key = process.StandardOutput.ReadToEnd ().Trim ();
+                process.WaitForExit ();
+                
+                if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace (host_key))
+                    return host_key;
+            }
+            
+            return null;
+        }
+        
+        
+        private string DeriveFingerprint (string public_key)
+        {
+            try {
+                MD5 md5            = new MD5CryptoServiceProvider ();
+                string key         = public_key.Split (" ".ToCharArray ()) [2];
+                byte [] b64_bytes  = Convert.FromBase64String (key);
+                byte [] md5_bytes  = md5.ComputeHash (b64_bytes);
+                string fingerprint = BitConverter.ToString (md5_bytes);
+                
+                return fingerprint.ToLower ().Replace ("-", ":");
+                
+            } catch (Exception e) {
+                SparkleLogger.LogInfo ("Fetcher", "Failed creating fingerprint: " + e.Message + " " + e.StackTrace);
+                return null;
+            }
+        }
+        
+        
+        private void AcceptHostKey (string host_key, bool warn)
+        {
+            string ssh_config_path       = Path.Combine (SparkleConfig.DefaultConfig.HomePath, ".ssh");
+            string known_hosts_file_path = Path.Combine (ssh_config_path, "known_hosts");
+            
+            if (!File.Exists (known_hosts_file_path)) {
+                if (!Directory.Exists (ssh_config_path))
+                    Directory.CreateDirectory (ssh_config_path);
+                
+                File.Create (known_hosts_file_path).Close ();
+            }
+            
+            string host                 = RemoteUrl.Host;
+            string known_hosts          = File.ReadAllText (known_hosts_file_path);
+            string [] known_hosts_lines = File.ReadAllLines (known_hosts_file_path);
+            
+            foreach (string line in known_hosts_lines) {
+                if (line.StartsWith (host + " "))
+                    return;
+            }
+            
+            if (known_hosts.EndsWith ("\n"))
+                File.AppendAllText (known_hosts_file_path, host_key + "\n");
+            else
+                File.AppendAllText (known_hosts_file_path, "\n" + host_key + "\n");
+            
+            SparkleLogger.LogInfo ("Auth", "Accepted host key for " + host);
+            
+            if (warn)
+                this.warnings.Add ("The following host key has been accepted:\n" + DeriveFingerprint (host_key));
+        }
+    }
+}

SparkleLib/SparkleLib.csproj

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2C914413-B31C-4362-93C7-1AE34F09112A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SparkleLib</RootNamespace>
+    <AssemblyName>SparkleLib</AssemblyName>
+    <ReleaseVersion>
+    </ReleaseVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Optimize>False</Optimize>
+    <OutputPath>..\bin</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>DEBUG</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="SparkleRepoBase.cs" />
+    <Compile Include="SparkleFetcherBase.cs" />
+    <Compile Include="SparkleWrappers.cs" />
+    <Compile Include="SparkleListenerBase.cs" />
+    <Compile Include="SparkleListenerFactory.cs" />
+    <Compile Include="SparkleListenerTcp.cs" />
+    <Compile Include="SparkleBackend.cs" />
+    <Compile Include="SparkleConfig.cs" />
+    <Compile Include="SparkleWatcher.cs" />
+    <Compile Include="SparkleExtensions.cs" />
+    <Compile Include="SparkleUser.cs" />
+    <Compile Include="SparkleLogger.cs" />
+    <Compile Include="Defines.cs" />
+    <Compile Include="SparkleFetcherSSH.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>

SparkleLib/SparkleLib.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = SparkleLib.csproj
+	EndGlobalSection
+EndGlobal

SparkleLib/SparkleListenerBase.cs

@@ -1,9 +1,9 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Lesser General Public License as
-//   published by the Free Software Foundation, either version 3 of the
+//   it under the terms of the GNU Lesser 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,
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Timers;
 
-namespace Sparkles {
+namespace SparkleLib {
 
     public enum DisconnectReason {
         None,
@@ -30,15 +30,15 @@ namespace Sparkles {
 
     // A persistent connection to the server that
     // listens for change notifications
-    public abstract class BaseListener {
+    public abstract class SparkleListenerBase {
 
         public event Action Connected = delegate { };
-
+        
         public event DisconnectedEventHandler Disconnected = delegate { };
         public delegate void DisconnectedEventHandler (DisconnectReason reason);
 
         public event AnnouncementReceivedEventHandler AnnouncementReceived = delegate { };
-        public delegate void AnnouncementReceivedEventHandler (Announcement announcement);
+        public delegate void AnnouncementReceivedEventHandler (SparkleAnnouncement announcement);
 
         public readonly Uri Server;
 
@@ -47,7 +47,7 @@ namespace Sparkles {
         public abstract bool IsConnecting { get; }
 
 
-        protected abstract void AnnounceInternal (Announcement announcent);
+        protected abstract void AnnounceInternal (SparkleAnnouncement announcent);
         protected abstract void AlsoListenToInternal (string folder_identifier);
 
         protected List<string> channels = new List<string> ();
@@ -55,10 +55,10 @@ namespace Sparkles {
 
         private int max_recent_announcements = 10;
 
-        private Dictionary<string, List<Announcement>> recent_announcements =
-            new Dictionary<string, List<Announcement>> ();
+        private Dictionary<string, List<SparkleAnnouncement>> recent_announcements =
+            new Dictionary<string, List<SparkleAnnouncement>> ();
 
-        private Dictionary<string, Announcement> queue_up   = new Dictionary<string, Announcement> ();
+        private Dictionary<string, SparkleAnnouncement> queue_up   = new Dictionary<string, SparkleAnnouncement> ();
 
         private Timer reconnect_timer = new Timer {
             Interval = 60 * 1000,
@@ -66,7 +66,7 @@ namespace Sparkles {
         };
 
 
-        public BaseListener (Uri server, string folder_identifier)
+        public SparkleListenerBase (Uri server, string folder_identifier)
         {
             Server = server;
             this.channels.Add (folder_identifier);
@@ -81,23 +81,23 @@ namespace Sparkles {
                 Reconnect ();
         }
 
-        public void Announce (Announcement announcement)
+        public void Announce (SparkleAnnouncement announcement)
         {
             if (!IsRecentAnnouncement (announcement)) {
                 if (IsConnected) {
-                    Logger.LogInfo ("Listener", "Announcing message " + announcement.Message +
+                    SparkleLogger.LogInfo ("Listener", "Announcing message " + announcement.Message +
                         " to " + announcement.FolderIdentifier + " on " + Server);
 
                     AnnounceInternal (announcement);
                     AddRecentAnnouncement (announcement);
 
                 } else {
-                    Logger.LogInfo ("Listener", "Can't send message to " + Server + ". Queuing message");
+                    SparkleLogger.LogInfo ("Listener", "Can't send message to " + Server + ". Queuing message");
                     this.queue_up [announcement.FolderIdentifier] = announcement;
                 }
 
             } else {
-                Logger.LogInfo ("Listener", "Already processed message " + announcement.Message +
+                SparkleLogger.LogInfo ("Listener", "Already processed message " + announcement.Message +
                     " to " + announcement.FolderIdentifier + " from " + Server);
             }
         }
@@ -109,7 +109,7 @@ namespace Sparkles {
                 this.channels.Add (channel);
 
             if (IsConnected) {
-                Logger.LogInfo ("Listener", "Subscribing to channel " + channel + " on " + Server);
+                SparkleLogger.LogInfo ("Listener", "Subscribing to channel " + channel + " on " + Server);
                 AlsoListenToInternal (channel);
             }
         }
@@ -117,7 +117,7 @@ namespace Sparkles {
 
         public void Reconnect ()
         {
-            Logger.LogInfo ("Listener", "Trying to reconnect to " + Server);
+            SparkleLogger.LogInfo ("Listener", "Trying to reconnect to " + Server);
             Connect ();
         }
 
@@ -125,18 +125,18 @@ namespace Sparkles {
         public void OnConnected ()
         {
             foreach (string channel in this.channels.GetRange (0, this.channels.Count)) {
-                Logger.LogInfo ("Listener", "Subscribing to channel " + channel + " on " + Server);
+                SparkleLogger.LogInfo ("Listener", "Subscribing to channel " + channel + " on " + Server);
                 AlsoListenToInternal (channel);
             }
 
-            Logger.LogInfo ("Listener", "Listening for announcements on " + Server);
+            SparkleLogger.LogInfo ("Listener", "Listening for announcements on " + Server);
             Connected ();
 
             if (this.queue_up.Count > 0) {
-                Logger.LogInfo ("Listener", "Delivering " + this.queue_up.Count + " queued messages...");
+                SparkleLogger.LogInfo ("Listener", "Delivering " + this.queue_up.Count + " queued messages...");
 
-                foreach (KeyValuePair<string, Announcement> item in this.queue_up) {
-                    Announcement announcement = item.Value;
+                foreach (KeyValuePair<string, SparkleAnnouncement> item in this.queue_up) {
+                    SparkleAnnouncement announcement = item.Value;
                     Announce (announcement);
                 }
             }
@@ -145,14 +145,14 @@ namespace Sparkles {
 
         public void OnDisconnected (DisconnectReason reason, string message)
         {
-            Logger.LogInfo ("Listener", "Disconnected from " + Server + ": " + message);
+            SparkleLogger.LogInfo ("Listener", "Disconnected from " + Server + ": " + message);
             Disconnected (reason);
         }
 
 
-        public void OnAnnouncement (Announcement announcement)
+        public void OnAnnouncement (SparkleAnnouncement announcement)
         {
-            Logger.LogInfo ("Listener", "Got message " + announcement.Message + " from " +
+            SparkleLogger.LogInfo ("Listener", "Got message " + announcement.Message + " from " +
                 announcement.FolderIdentifier + " on " + Server);
 
             if (IsRecentAnnouncement (announcement))
@@ -176,13 +176,13 @@ namespace Sparkles {
         }
 
 
-        private bool IsRecentAnnouncement (Announcement announcement)
+        private bool IsRecentAnnouncement (SparkleAnnouncement announcement)
         {
             if (!this.recent_announcements.ContainsKey (announcement.FolderIdentifier)) {
                 return false;
 
             } else {
-                foreach (Announcement recent_announcement in GetRecentAnnouncements (announcement.FolderIdentifier)) {
+                foreach (SparkleAnnouncement recent_announcement in GetRecentAnnouncements (announcement.FolderIdentifier)) {
                     if (recent_announcement.Message.Equals (announcement.Message))
                         return true;
                 }
@@ -192,18 +192,18 @@ namespace Sparkles {
         }
 
 
-        private List<Announcement> GetRecentAnnouncements (string folder_identifier)
+        private List<SparkleAnnouncement> GetRecentAnnouncements (string folder_identifier)
         {
             if (!this.recent_announcements.ContainsKey (folder_identifier))
-                this.recent_announcements [folder_identifier] = new List<Announcement> ();
+                this.recent_announcements [folder_identifier] = new List<SparkleAnnouncement> ();
 
             return this.recent_announcements [folder_identifier];
         }
 
 
-        private void AddRecentAnnouncement (Announcement announcement)
+        private void AddRecentAnnouncement (SparkleAnnouncement announcement)
         {
-            List<Announcement> recent_announcements =
+            List<SparkleAnnouncement> recent_announcements =
                 GetRecentAnnouncements (announcement.FolderIdentifier);
 
             if (!IsRecentAnnouncement (announcement))

SparkleLib/SparkleListenerFactory.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -18,21 +18,21 @@
 using System;
 using System.Collections.Generic;
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public static class ListenerFactory {
+    public static class SparkleListenerFactory {
 
-        static readonly List<BaseListener> listeners = new List<BaseListener> ();
+        private static List<SparkleListenerBase> listeners = new List<SparkleListenerBase> ();
 
 
-        public static BaseListener CreateListener (string folder_name, string folder_identifier)
+        public static SparkleListenerBase CreateListener (string folder_name, string folder_identifier)
         {
             // Check if the user wants to use a global custom notification service
-            string uri = Configuration.DefaultConfiguration.GetConfigOption ("announcements_url");
+            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 = Configuration.DefaultConfiguration.GetFolderOptionalAttribute (folder_name, "announcements_url");
+                uri = SparkleConfig.DefaultConfig.GetFolderOptionalAttribute (folder_name, "announcements_url");
 
             // This is SparkleShare's centralized notification service.
             // It communicates "It's time to sync!" signals between clients.
@@ -40,27 +40,27 @@ namespace Sparkles {
             // Please see the SparkleShare wiki if you wish to run
             // your own service instead
             if (string.IsNullOrEmpty (uri))
-                uri = "tcp://announcements.sparkleshare.org:443";
+                uri = "tcp://notifications.sparkleshare.org:443";
 
-            var announce_uri = new Uri (uri);
+            Uri announce_uri = new Uri (uri);
 
             // Use only one listener per notification service to keep
             // the number of connections as low as possible
-            foreach (BaseListener listener in listeners) {
+            foreach (SparkleListenerBase listener in listeners) {
                 if (listener.Server.Equals (announce_uri)) {
-                    Logger.LogInfo ("ListenerFactory", "Refered to existing listener for " + announce_uri);
+                    SparkleLogger.LogInfo ("ListenerFactory", "Refered to existing 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 listener;
+                    return (SparkleListenerBase) listener;
                 }
             }
 
-            listeners.Add (new TcpListener (announce_uri, folder_identifier));
-            Logger.LogInfo ("ListenerFactory", "Issued new listener for " + announce_uri);
+            listeners.Add (new SparkleListenerTcp (announce_uri, folder_identifier));
+            SparkleLogger.LogInfo ("ListenerFactory", "Issued new listener for " + announce_uri);
 
-            return listeners [listeners.Count - 1];
+            return (SparkleListenerBase) listeners [listeners.Count - 1];
         }
     }
 }

SparkleLib/SparkleListenerTcp.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -20,9 +20,9 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public class TcpListener : BaseListener {
+    public class SparkleListenerTcp : SparkleListenerBase {
 
         private Socket socket;
         private Thread thread;
@@ -31,7 +31,7 @@ namespace Sparkles {
         private DateTime last_ping = DateTime.Now;
 
 
-        public TcpListener (Uri server, string folder_identifier) : base (server, folder_identifier)
+        public SparkleListenerTcp (Uri server, string folder_identifier) : base (server, folder_identifier)
         {
         }
 
@@ -82,7 +82,7 @@ namespace Sparkles {
                     if (this.socket != null)
                         this.socket.Close ();
 
-                    OnDisconnected (Sparkles.DisconnectReason.TimeOut, e.Message);
+                    OnDisconnected (SparkleLib.DisconnectReason.TimeOut, e.Message);
                     return;
                 }
 
@@ -104,7 +104,7 @@ namespace Sparkles {
                                 // We've timed out, let's ping the server to
                                 // see if the connection is still up
                                 if (i == timeout) {
-                                    Logger.LogInfo ("ListenerTcp", "Pinging " + Server);
+                                    SparkleLogger.LogInfo ("ListenerTcp", "Pinging " + Server);
 
                                     byte [] ping_bytes = Encoding.UTF8.GetBytes ("ping\n");
                                     byte [] pong_bytes = new byte [4096];
@@ -115,7 +115,7 @@ namespace Sparkles {
                                         // 10057 means "Socket is not connected"
                                         throw new SocketException (10057);
 
-                                    Logger.LogInfo ("ListenerTcp", "Received pong from " + Server);
+                                    SparkleLogger.LogInfo ("ListenerTcp", "Received pong from " + Server);
 
                                     i = 0;
                                     this.last_ping = DateTime.Now;
@@ -132,7 +132,7 @@ namespace Sparkles {
                                     );
 
                                     if (sleepiness <= 0) {
-                                        Logger.LogInfo ("ListenerTcp", "System woke up from sleep");
+                                        SparkleLogger.LogInfo ("ListenerTcp", "System woke up from sleep");
                                         reason = DisconnectReason.SystemSleep;
 
                                         // 10057 means "Socket is not connected"
@@ -171,7 +171,7 @@ namespace Sparkles {
 
                             // We have a message!
                             if (!folder_identifier.Equals ("debug") && !string.IsNullOrEmpty (message))
-                                OnAnnouncement (new Announcement (folder_identifier, message));
+                                OnAnnouncement (new SparkleAnnouncement (folder_identifier, message));
                         }
 
                     } catch (SocketException e) {
@@ -216,7 +216,7 @@ namespace Sparkles {
         }
 
 
-        protected override void AnnounceInternal (Announcement announcement)
+        protected override void AnnounceInternal (SparkleAnnouncement announcement)
         {
             string to_send = "announce " + announcement.FolderIdentifier + " " + announcement.Message + "\n";
 

SparkleLib/SparkleLogger.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -18,13 +18,12 @@
 using System;
 using System.IO;
 
-namespace Sparkles {
+namespace SparkleLib {
     
-    public static class Logger {
-
-        static StreamWriter log_writer = File.CreateText (Configuration.DefaultConfiguration.LogFilePath);
-        static object log_writer_lock = new object ();
+    public static class SparkleLogger {
 
+        private static Object debug_lock = new Object ();
+        private static int log_size = 0;
 
         public static void LogInfo (string type, string message)
         {
@@ -38,24 +37,25 @@ namespace Sparkles {
             string line;
 
             if (string.IsNullOrEmpty (type))
-                line = timestamp + " " + message;
+                line = timestamp + " | " + message;
             else
-                line = timestamp + " " + type + " | " + message;
+                line = timestamp + " | " + type + " | " + message;
 
             if (exception != null)
                 line += ": " + exception.Message + " " + exception.StackTrace;
 
-            if (Configuration.DebugMode)
+            if (SparkleConfig.DebugMode)
                 Console.WriteLine (line);
 
-            lock (log_writer_lock) {
-                try {
-                    log_writer.WriteLine (line);
-                    log_writer.Flush ();
+            lock (debug_lock) {
+                // Don't let the log get bigger than 1000 lines
+                if (log_size >= 1000) {
+                    File.WriteAllText (SparkleConfig.DefaultConfig.LogFilePath, line + Environment.NewLine);
+                    log_size = 0;
 
-                } catch (Exception e) {
-                    Console.WriteLine (string.Format ("Could not write to log {0}: {1} {2}",
-                        (log_writer.BaseStream as FileStream).Name, e.Message, e.StackTrace));
+                } else {
+                    File.AppendAllText (SparkleConfig.DefaultConfig.LogFilePath, line + Environment.NewLine);
+                    log_size++;
                 }
             }
         }
@@ -63,42 +63,39 @@ namespace Sparkles {
 
         public static void WriteCrashReport (Exception e)
         {
-            if (log_writer != null)
-                log_writer.Close ();
-
             string home_path = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
 
-            if (InstallationInfo.OperatingSystem == OS.Windows)
+            if (SparkleBackend.Platform == PlatformID.Win32NT)
                 home_path = Environment.GetFolderPath (Environment.SpecialFolder.UserProfile);
 
-            string crash_report_file_path = Path.Combine (home_path, "SparkleShare", "crash_report.txt");
+            string crash_report_file_path = new string [] { home_path, "SparkleShare", "crash_report.txt" }.Combine ();
 
             string n = Environment.NewLine;
-            string crash_report =
-                "Oops! SparkleShare has crashed... :(" + n +
-                n +
+            string crash_report = "Oops! SparkleShare has crashed... :(" + n + n +
                 "If you want to help fix this crash, please report it at " + n +
-                "https://github.com/hbons/SparkleShare/issues and include the lines below." + n +
-                n +
-                "Remove any sensitive information like file names, IP addresses, domain names, etc. if needed." + n +
-                n +
-                "------" + n +
-                n;
+                "https://github.com/hbons/SparkleShare/issues and include the lines below." + n + n +
+                "Remove any sensitive information like file names, IP addresses, domain names, etc. if needed." + n + n +
+                "------" +  n + n +
+                "SparkleShare version: " + SparkleLib.SparkleBackend.Version + n +
+                "Operating system:     " + SparkleLib.SparkleBackend.Platform + " (" + Environment.OSVersion + ")" + n;
 
-            crash_report += e.GetType () + ": " + e.Message + n + e.StackTrace + n + n;
+            crash_report += e.GetType () + ": " + e.Message + n + e.StackTrace + n;
 
             if (e.InnerException != null)
                 crash_report += n + e.InnerException.Message + n + e.InnerException.StackTrace + n;
 
-            if (Configuration.DefaultConfiguration != null && File.Exists (Configuration.DefaultConfiguration.LogFilePath)) {
-                string debug_log      = File.ReadAllText (Configuration.DefaultConfiguration.LogFilePath);
+            if (SparkleConfig.DefaultConfig != null && File.Exists (SparkleConfig.DefaultConfig.LogFilePath)) {
+                string debug_log      = File.ReadAllText (SparkleConfig.DefaultConfig.LogFilePath);
                 string [] debug_lines = debug_log.Split (Environment.NewLine.ToCharArray ()); 
                 int line_count        = 50;
                     
-                if (debug_lines.Length > line_count)
-                    crash_report += string.Join (n, debug_lines, (debug_lines.Length - line_count), line_count) + n;
-                else
+                if (debug_lines.Length > line_count) {
+                    crash_report += string.Join (Environment.NewLine, debug_lines,
+                        (debug_lines.Length - line_count), line_count) + n;
+                
+                } else {
                     crash_report += debug_log + n;
+                }
             }
 
             File.WriteAllText (crash_report_file_path, crash_report);
@@ -106,3 +103,4 @@ namespace Sparkles {
         }
     }
 }
+

SparkleLib/SparkleRepoBase.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -22,32 +22,7 @@ using System.Threading;
 
 using Timers = System.Timers;
 
-namespace Sparkles {
-
-    public enum StorageType {
-        Unknown,
-        Plain,
-        LargeFiles,
-        Encrypted
-    }
-
-
-    public class StorageTypeInfo {
-
-        public readonly StorageType Type;
-
-        public readonly string Name;
-        public readonly string Description;
-
-
-        public StorageTypeInfo (StorageType storage_type, string name, string description)
-        {
-            Type = storage_type;
-
-            Name = name;
-            Description = description;
-        }
-    }
+namespace SparkleLib {
 
     public enum SyncStatus {
         Idle,
@@ -57,6 +32,7 @@ namespace Sparkles {
         Error
     }
 
+
     public enum ErrorStatus {
         None,
         HostUnreachable,
@@ -65,12 +41,11 @@ namespace Sparkles {
         DiskSpaceExceeded,
         UnreadableFiles,
         NotFound,
-        IncompatibleClientServer,
-        Unknown
+        IncompatibleClientServer
     }
 
 
-    public abstract class BaseRepository {
+    public abstract class SparkleRepoBase {
 
         public abstract bool SyncUp ();
         public abstract bool SyncDown ();
@@ -84,11 +59,9 @@ namespace Sparkles {
         public abstract double HistorySize { get; }
 
         public abstract List<string> ExcludePaths { get; }
-        public abstract List<Change> UnsyncedChanges { get; }
-        public abstract List<ChangeSet> GetChangeSets ();
-        public abstract List<ChangeSet> GetChangeSets (string path);
-
-        protected StorageType StorageType = StorageType.Plain;
+        public abstract List<SparkleChange> UnsyncedChanges { get; }
+        public abstract List<SparkleChangeSet> GetChangeSets ();
+        public abstract List<SparkleChangeSet> GetChangeSets (string path);
 
         public static bool UseCustomWatcher = false;
 
@@ -100,7 +73,7 @@ namespace Sparkles {
         public delegate void ProgressChangedEventHandler ();
 
         public event NewChangeSetEventHandler NewChangeSet = delegate { };
-        public delegate void NewChangeSetEventHandler (ChangeSet change_set);
+        public delegate void NewChangeSetEventHandler (SparkleChangeSet change_set);
 
         public event Action ConflictResolved = delegate { };
         public event Action ChangesDetected = delegate { };
@@ -109,14 +82,12 @@ namespace Sparkles {
         public readonly string LocalPath;
         public readonly string Name;
         public readonly Uri RemoteUrl;
-        public List<ChangeSet> ChangeSets { get; set; }
-        public SyncStatus Status { get; set; }
+        public List<SparkleChangeSet> ChangeSets { get; private set; }
+        public SyncStatus Status { get; private set; }
         public ErrorStatus Error { get; protected set; }
-        public bool IsBuffering { get; set; }
-
+        public bool IsBuffering { get; private set; }
         public double ProgressPercentage { get; private set; }
         public double ProgressSpeed { get; private set; }
-        public string ProgressInformation { get; private set; }
 
         public DateTime LastSync {
             get {
@@ -134,26 +105,24 @@ namespace Sparkles {
 
                 string id_path = Path.Combine (LocalPath, ".sparkleshare");
 
-                if (File.Exists (id_path)) {
-                    File.SetAttributes (id_path, FileAttributes.Hidden);
+                if (File.Exists (id_path))
                     this.identifier = File.ReadAllText (id_path).Trim ();
-                }
 
                 if (!string.IsNullOrEmpty (this.identifier)) {
                     return this.identifier;
 
                 } else {
-                    string config_identifier = this.local_config.IdentifierByName (Name);
+                    string config_identifier = this.local_config.GetIdentifierForFolder (Name);
 
                     if (!string.IsNullOrEmpty (config_identifier))
                         this.identifier = config_identifier;
                     else
-                        this.identifier = Path.GetRandomFileName ().SHA256 ();
+                        this.identifier = SparkleFetcherBase.CreateIdentifier ();
 
                     File.WriteAllText (id_path, this.identifier);
                     File.SetAttributes (id_path, FileAttributes.Hidden);
 
-                    Logger.LogInfo ("Local", Name + " | Assigned identifier: " + this.identifier);
+                    SparkleLogger.LogInfo ("Local", Name + " | Assigned identifier: " + this.identifier);
 
                     return this.identifier;
                 }
@@ -161,43 +130,41 @@ namespace Sparkles {
         }
 
 
-        protected Configuration local_config;
+        protected SparkleConfig local_config;
 
-        string identifier;
-        BaseListener listener = null;
-        Watcher watcher;
-        TimeSpan poll_interval        = PollInterval.Short;
-        DateTime last_poll            = DateTime.Now;
-        Timers.Timer remote_timer     = new Timers.Timer () { Interval = 5000 };
-        DisconnectReason last_disconnect_reason = DisconnectReason.None;
 
-        bool is_syncing {
+        private string identifier;
+        private SparkleListenerBase listener;
+        private SparkleWatcher watcher;
+        private TimeSpan poll_interval        = PollInterval.Short;
+        private DateTime last_poll            = DateTime.Now;
+        private DateTime progress_last_change = DateTime.Now;
+        private Timers.Timer remote_timer     = new Timers.Timer () { Interval = 5000 };
+        private DisconnectReason last_disconnect_reason = DisconnectReason.None;
+
+        private bool is_syncing {
             get { return (Status == SyncStatus.SyncUp || Status == SyncStatus.SyncDown || IsBuffering); }
         }
 
-        static class PollInterval {
+        private static class PollInterval {
             public static readonly TimeSpan Short = new TimeSpan (0, 0, 5, 0);
             public static readonly TimeSpan Long  = new TimeSpan (0, 0, 15, 0);
         }
 
 
-        public BaseRepository (string path, Configuration config)
+        public SparkleRepoBase (string path, SparkleConfig config)
         {
-            Logger.LogInfo (path, "Initializing...");
+            SparkleLogger.LogInfo (path, "Initializing...");
 
             Status            = SyncStatus.Idle;
             Error             = ErrorStatus.None;
             this.local_config = config;
             LocalPath         = path;
             Name              = Path.GetFileName (LocalPath);
-            RemoteUrl         = new Uri (this.local_config.UrlByName (Name));
+            RemoteUrl         = new Uri (this.local_config.GetUrlForFolder (Name));
             IsBuffering       = false;
             this.identifier   = Identifier;
-
-            string storage_type = this.local_config.GetFolderOptionalAttribute (Name, "storage_type");
-
-            if (!string.IsNullOrEmpty (storage_type))
-                StorageType = (StorageType) Enum.Parse (typeof (StorageType), storage_type);
+            ChangeSets        = GetChangeSets ();
 
             string is_paused = this.local_config.GetFolderOptionalAttribute (Name, "paused");
             if (is_paused != null && is_paused.Equals (bool.TrueString))
@@ -207,7 +174,7 @@ namespace Sparkles {
             File.SetAttributes (identifier_file_path, FileAttributes.Hidden);
 
             if (!UseCustomWatcher)
-                this.watcher = new Watcher (LocalPath);
+                this.watcher = new SparkleWatcher (LocalPath);
 
             new Thread (() => CreateListener ()).Start ();
 
@@ -215,7 +182,7 @@ namespace Sparkles {
         }
 
 
-        void RemoteTimerElapsedDelegate (object sender, EventArgs args)
+        private void RemoteTimerElapsedDelegate (object sender, EventArgs args)
         {
             if (this.is_syncing || IsBuffering || Status == SyncStatus.Paused)
                 return;
@@ -231,8 +198,8 @@ namespace Sparkles {
                 if (HasRemoteChanges && !this.is_syncing)
                     SyncDownBase ();
                 
-                // if (this.listener.IsConnected)
-                //    this.poll_interval = PollInterval.Long;
+                if (this.listener.IsConnected)
+                    this.poll_interval = PollInterval.Long;
             }
             
             // In the unlikely case that we haven't synced up our
@@ -249,8 +216,6 @@ namespace Sparkles {
 
         public void Initialize ()
         {
-            ChangeSets = GetChangeSets ();
-
             // Sync up everything that changed since we've been offline
             new Thread (() => {
                 if (Status != SyncStatus.Paused) {
@@ -274,7 +239,7 @@ namespace Sparkles {
         }
 
 
-        Object buffer_lock = new Object ();
+        private Object buffer_lock = new Object ();
 
         public void OnFileActivity (FileSystemEventArgs args)
         {
@@ -305,7 +270,7 @@ namespace Sparkles {
             if (!UseCustomWatcher)
                 this.watcher.Disable ();
 
-            Logger.LogInfo ("Local", Name + " | Activity detected, waiting for it to settle...");
+            SparkleLogger.LogInfo ("Local", Name + " | Activity detected, waiting for it to settle...");
 
             List<double> size_buffer = new List<double> ();
             DirectoryInfo info = new DirectoryInfo (LocalPath);
@@ -321,7 +286,7 @@ namespace Sparkles {
                     size_buffer [1].Equals (size_buffer [2]) &&
                     size_buffer [2].Equals (size_buffer [3])) {
 
-                    Logger.LogInfo ("Local", Name + " | Activity has settled");
+                    SparkleLogger.LogInfo ("Local", Name + " | Activity has settled");
                     IsBuffering = false;
 
                     bool first_sync = true;
@@ -329,7 +294,7 @@ namespace Sparkles {
                     if (HasLocalChanges && Status == SyncStatus.Idle) {
                         do {
                             if (!first_sync)
-                                Logger.LogInfo ("Local", Name + " | More changes found");
+                                SparkleLogger.LogInfo ("Local", Name + " | More changes found");
 
                             SyncUpBase ();
 
@@ -370,55 +335,51 @@ namespace Sparkles {
         }
 
 
-        DateTime progress_last_change = DateTime.Now;
-
-        protected void OnProgressChanged (double percentage, double speed, string information)
+        protected void OnProgressChanged (double progress_percentage, double progress_speed)
         {
-            if (percentage < 1)
+            if (progress_percentage < 1)
                 return;
 
             // Only trigger the ProgressChanged event once per second
             if (DateTime.Compare (this.progress_last_change, DateTime.Now.Subtract (new TimeSpan (0, 0, 0, 1))) >= 0)
                 return;
 
-            if (percentage == 100.0)
-                percentage = 99.0;
+            if (progress_percentage == 100.0)
+                progress_percentage = 99.0;
 
-			progress_last_change = DateTime.Now;
-
-            ProgressPercentage = percentage;
-            ProgressSpeed = speed;
-            ProgressInformation = information;
+            ProgressPercentage        = progress_percentage;
+            ProgressSpeed             = progress_speed;
+            this.progress_last_change = DateTime.Now;
 
             ProgressChanged ();
         }
 
 
-        void SyncUpBase ()
+        private void SyncUpBase ()
         {
             if (!UseCustomWatcher)
                 this.watcher.Disable ();
 
-            Logger.LogInfo ("SyncUp", Name + " | Initiated");
+            SparkleLogger.LogInfo ("SyncUp", Name + " | Initiated");
             HasUnsyncedChanges = true;
 
             Status = SyncStatus.SyncUp;
             SyncStatusChanged (Status);
 
             if (SyncUp ()) {
-                Logger.LogInfo ("SyncUp", Name + " | Done");
+                SparkleLogger.LogInfo ("SyncUp", Name + " | Done");
                 ChangeSets = GetChangeSets ();
 
                 HasUnsyncedChanges = false;
                 this.poll_interval = PollInterval.Long;
 
-                // this.listener.Announce (new Announcement (Identifier, CurrentRevision));
+                this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision));
 
                 Status = SyncStatus.Idle;
                 SyncStatusChanged (Status);
 
             } else {
-                Logger.LogInfo ("SyncUp", Name + " | Error");
+                SparkleLogger.LogInfo ("SyncUp", Name + " | Error");
                 SyncDownBase ();
 
                 if (!UseCustomWatcher)
@@ -427,7 +388,7 @@ namespace Sparkles {
                 if (Error == ErrorStatus.None && SyncUp ()) {
                     HasUnsyncedChanges = false;
 
-                    // this.listener.Announce (new Announcement (Identifier, CurrentRevision));
+                    this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision));
 
                     Status = SyncStatus.Idle;
                     SyncStatusChanged (Status);
@@ -450,12 +411,12 @@ namespace Sparkles {
         }
 
 
-        void SyncDownBase ()
+        private void SyncDownBase ()
         {
             if (!UseCustomWatcher)
                 this.watcher.Disable ();
 
-            Logger.LogInfo ("SyncDown", Name + " | Initiated");
+            SparkleLogger.LogInfo ("SyncDown", Name + " | Initiated");
 
             Status = SyncStatus.SyncDown;
             SyncStatusChanged (Status);
@@ -476,7 +437,7 @@ namespace Sparkles {
 
                     bool emit_change_event = true;
 
-                    foreach (Change change in ChangeSets [0].Changes) {
+                    foreach (SparkleChange change in ChangeSets [0].Changes) {
                         if (change.Path.EndsWith (".sparkleshare")) {
                             emit_change_event = false;
                             break;
@@ -487,7 +448,7 @@ namespace Sparkles {
                         NewChangeSet (ChangeSets [0]);
                 }
 
-                Logger.LogInfo ("SyncDown", Name + " | Done");
+                SparkleLogger.LogInfo ("SyncDown", Name + " | Done");
 
                 // There could be changes from a resolved
                 // conflict. Tries only once, then lets
@@ -504,7 +465,7 @@ namespace Sparkles {
                 SyncStatusChanged (Status);
 
             } else {
-                Logger.LogInfo ("SyncDown", Name + " | Error");
+                SparkleLogger.LogInfo ("SyncDown", Name + " | Error");
 
                 ChangeSets = GetChangeSets ();
 
@@ -523,23 +484,23 @@ namespace Sparkles {
         }
 
 
-        void CreateListener ()
+        private void CreateListener ()
         {
-            // this.listener = ListenerFactory.CreateListener (Name, Identifier);
+            this.listener = SparkleListenerFactory.CreateListener (Name, Identifier);
 
-            // if (this.listener.IsConnected)
-            //    this.poll_interval = PollInterval.Long;
+            if (this.listener.IsConnected)
+                this.poll_interval = PollInterval.Long;
 
-            // this.listener.Connected            += ListenerConnectedDelegate;
-            // this.listener.Disconnected         += ListenerDisconnectedDelegate;
-            // this.listener.AnnouncementReceived += ListenerAnnouncementReceivedDelegate;
+            this.listener.Connected            += ListenerConnectedDelegate;
+            this.listener.Disconnected         += ListenerDisconnectedDelegate;
+            this.listener.AnnouncementReceived += ListenerAnnouncementReceivedDelegate;
 
-            // if (!this.listener.IsConnected && !this.listener.IsConnecting)
-            //    this.listener.Connect ();
+            if (!this.listener.IsConnected && !this.listener.IsConnecting)
+                this.listener.Connect ();
         }
 
         
-        void ListenerConnectedDelegate ()
+        private void ListenerConnectedDelegate ()
         {
             if (this.last_disconnect_reason == DisconnectReason.SystemSleep) {
                 this.last_disconnect_reason = DisconnectReason.None;
@@ -552,9 +513,9 @@ namespace Sparkles {
         }
 
 
-        void ListenerDisconnectedDelegate (DisconnectReason reason)
+        private void ListenerDisconnectedDelegate (DisconnectReason reason)
         {
-            Logger.LogInfo (Name, "Falling back to regular polling");
+            SparkleLogger.LogInfo (Name, "Falling back to regular polling");
             this.poll_interval = PollInterval.Short;
 
             this.last_disconnect_reason = reason;
@@ -565,7 +526,7 @@ namespace Sparkles {
                 int backoff_time = 2;
 
                 do {
-                    Logger.LogInfo (Name, "Next reconnect attempt in " + backoff_time + " seconds");
+                    SparkleLogger.LogInfo (Name, "Next reconnect attempt in " + backoff_time + " seconds");
                     Thread.Sleep (backoff_time * 1000);
                     this.listener.Connect ();
                     backoff_time *= 2;
@@ -577,7 +538,7 @@ namespace Sparkles {
         }
 
 
-        void ListenerAnnouncementReceivedDelegate (Announcement announcement)
+        private void ListenerAnnouncementReceivedDelegate (SparkleAnnouncement announcement)
         {
             string identifier = Identifier;
 
@@ -588,10 +549,10 @@ namespace Sparkles {
                 while (this.is_syncing)
                     Thread.Sleep (100);
 
-                Logger.LogInfo (Name, "Syncing due to announcement");
+                SparkleLogger.LogInfo (Name, "Syncing due to announcement");
 
                 if (Status == SyncStatus.Paused)
-                    Logger.LogInfo (Name, "We're paused, skipping sync");
+                    SparkleLogger.LogInfo (Name, "We're paused, skipping sync");
                 else
                     SyncDownBase ();
             }
@@ -599,7 +560,7 @@ namespace Sparkles {
 
 
         // Recursively gets a folder's size in bytes
-        long CalculateSize (DirectoryInfo parent)
+        private long CalculateSize (DirectoryInfo parent)
         {
             if (ExcludePaths.Contains (parent.Name))
                 return 0;
@@ -614,7 +575,7 @@ namespace Sparkles {
                     size += file.Length;
 
             } catch (Exception e) {
-                Logger.LogInfo ("Local", "Error calculating directory size", e);
+                SparkleLogger.LogInfo ("Local", "Error calculating directory size", e);
             }
 
             return size;
@@ -659,12 +620,12 @@ namespace Sparkles {
                 this.remote_timer = null;
             }
 
-            // this.listener.Disconnected         -= ListenerDisconnectedDelegate;
-            // this.listener.AnnouncementReceived -= ListenerAnnouncementReceivedDelegate;
+            this.listener.Disconnected         -= ListenerDisconnectedDelegate;
+            this.listener.AnnouncementReceived -= ListenerAnnouncementReceivedDelegate;
 
-            // this.listener.Dispose ();
+            this.listener.Dispose ();
 
-            if (!UseCustomWatcher && this.watcher != null)
+            if (!UseCustomWatcher)
                 this.watcher.Dispose ();
         }
     }

SparkleLib/SparkleUser.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -15,17 +15,25 @@
 //   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-namespace Sparkles {
+using System;
 
-    public class User {
+namespace SparkleLib {
+
+    public class SparkleUser {
 
         public readonly string Name;
         public readonly string Email;
 
         public string AvatarFilePath;
 
+        public string PrivateKey;
+        public string PrivateKeyFilePath;
 
-        public User (string name, string email)
+        public string PublicKey;
+        public string PublicKeyFilePath;
+
+
+        public SparkleUser (string name, string email)
         {
             Name  = name;
             Email = email;

SparkleLib/SparkleWatcher.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -15,19 +15,20 @@
 //   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
+using System;
 using System.IO;
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public class Watcher : FileSystemWatcher {
+    public class SparkleWatcher : FileSystemWatcher {
 
         public event ChangeEventEventHandler ChangeEvent = delegate { };
         public delegate void ChangeEventEventHandler (FileSystemEventArgs args);
 
-        object thread_lock = new object ();
+        private Object thread_lock = new Object ();
 
 
-        public Watcher (string path) : base (path)
+        public SparkleWatcher (string path) : base (path)
         {
             IncludeSubdirectories = true;
             EnableRaisingEvents   = true;
@@ -40,7 +41,7 @@ namespace Sparkles {
         }
 
 
-        void OnChanged (object sender, FileSystemEventArgs args)
+        private void OnChanged (object sender, FileSystemEventArgs args)
         {
             ChangeEvent (args);
         }

SparkleLib/SparkleWrappers.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU Lesser General Public License as 
@@ -19,9 +19,9 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 
-namespace Sparkles {
+namespace SparkleLib {
 
-    public enum ChangeType {
+    public enum SparkleChangeType {
         Added,
         Edited,
         Deleted,
@@ -29,9 +29,9 @@ namespace Sparkles {
     }
 
 
-    public class ChangeSet {
+    public class SparkleChangeSet {
 
-        public User User = new User ("Unknown", "Unknown");
+        public SparkleUser User = new SparkleUser ("Unknown", "Unknown");
 
         public SparkleFolder Folder;
         public string Revision;
@@ -39,16 +39,16 @@ namespace Sparkles {
         public DateTime FirstTimestamp;
         public Uri RemoteUrl;
 
-        public List<Change> Changes = new List<Change> ();
+        public List<SparkleChange> Changes = new List<SparkleChange> ();
 
         public string ToMessage ()
         {
             string message = "added: {0}";
-
+            
             switch (Changes [0].Type) {
-            case ChangeType.Edited:  message = "edited: {0}"; break;
-            case ChangeType.Deleted: message = "deleted: {0}"; break;
-            case ChangeType.Moved:   message = "moved: {0}"; break;
+            case SparkleChangeType.Edited:  message = "edited: {0}"; break;
+            case SparkleChangeType.Deleted: message = "deleted: {0}"; break;
+            case SparkleChangeType.Moved:   message = "moved: {0}"; break;
             }
 
             if (Changes.Count > 0)
@@ -59,12 +59,12 @@ namespace Sparkles {
     }
 
 
-    public class Change {
+    public class SparkleChange {
 
-        public ChangeType Type;
+        public SparkleChangeType Type;
         public DateTime Timestamp;
-        public bool IsFolder;
-
+        public bool IsFolder = false;
+        
         public string Path;
         public string MovedToPath;
     }
@@ -77,14 +77,12 @@ namespace Sparkles {
 
         public string FullPath {
             get {
-                string custom_path = Configuration.DefaultConfiguration.GetFolderOptionalAttribute (Name, "path");
+                string custom_path = SparkleConfig.DefaultConfig.GetFolderOptionalAttribute (Name, "path");
 
                 if (custom_path != null)
                     return Path.Combine (custom_path, Name);
-
-                return Path.Combine (Configuration.DefaultConfiguration.FoldersPath,
-                                     new Uri (Configuration.DefaultConfiguration.UrlByName (Name)).Host,
-                                     Name);
+                else
+                    return Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, Name);
             }
         }
 
@@ -96,13 +94,13 @@ namespace Sparkles {
     }
 
 
-    public class Announcement {
+    public class SparkleAnnouncement {
 
         public readonly string FolderIdentifier;
         public readonly string Message;
 
 
-        public Announcement (string folder_identifier, string message)
+        public SparkleAnnouncement (string folder_identifier, string message)
         {
             FolderIdentifier = folder_identifier;
             Message          = message;

SparkleShare.sln

@@ -1,89 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sparkles", "Sparkles\Sparkles.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sparkles.Git", "Sparkles\Git\Sparkles.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "SparkleShare\Windows\SparkleShare.Windows.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "SparkleShare\Linux\SparkleShare.Linux.csproj", "{5714D3CA-88A6-4330-A29D-4CA90D1D193C}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SparkleShare", "SparkleShare\Common\SparkleShare.shproj", "{F16E3683-B622-4654-B799-99C8D68AA963}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Mac", "SparkleShare\Mac\SparkleShare.Mac.csproj", "{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Any CPU = Release|Any CPU
-		Debug|Any CPU = Debug|Any CPU
-		ReleaseDist|Any CPU = ReleaseDist|Any CPU
-		ReleaseMac|Any CPU = ReleaseMac|Any CPU
-		DebugMac|Any CPU = DebugMac|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseDist|Any CPU.ActiveCfg = ReleaseDist|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseDist|Any CPU.Build.0 = ReleaseDist|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		Policies = $0
-		$0.DotNetNamingPolicy = $1
-		$1.DirectoryNamespaceAssociation = None
-		$1.ResourceNamePolicy = FileFormatDefault
-		$0.TextStylePolicy = $2
-		$2.FileWidth = 120
-		$2.inheritsSet = VisualStudio
-		$2.inheritsScope = text/plain
-		$2.scope = text/plain
-		$0.CSharpFormattingPolicy = $3
-		$3.inheritsSet = Mono
-		$3.inheritsScope = text/x-csharp
-		$3.scope = text/x-csharp
-		version = 
-	EndGlobalSection
-EndGlobal
-

SparkleShare/Common/BaseController.cs

@@ -1,763 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
-//
-//   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 <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-
-using Sparkles;
-
-namespace SparkleShare {
-
-    public abstract class BaseController {
-
-        public BaseRepository [] Repositories {
-            get {
-                lock (this.repo_lock)
-                    return this.repositories.GetRange (0, this.repositories.Count).ToArray ();
-            }
-        }
-
-
-        void AddRepository (BaseRepository repo)
-        {
-            lock (this.repo_lock) {
-                this.repositories.Add (repo);
-                this.repositories.Sort ((x, y) => string.Compare (x.Name, y.Name));
-            }
-        }
-
-
-        void RemoveRepository (BaseRepository repo)
-        {
-            lock (this.repo_lock)
-                this.repositories.Remove (repo);
-        }
-
-
-        public BaseRepository GetRepoByName (string name)
-        {
-            lock (this.repo_lock) {
-                foreach (BaseRepository repo in this.repositories)
-                    if (repo.Name.Equals (name))
-                        return repo;
-            }
-
-            return null;
-        }
-
-
-        public Configuration Config { get; private set; }
-        public bool RepositoriesLoaded { get; private set; }
-        public string FoldersPath { get; private set; }
-
-        public double ProgressPercentage  = 0.0;
-        public double ProgressSpeedUp     = 0.0;
-        public double ProgressSpeedDown   = 0.0;
-        public string ProgressInformation = "";
-
-
-        public event ShowSetupWindowEventHandler ShowSetupWindowEvent = delegate { };
-        public delegate void ShowSetupWindowEventHandler (PageType page_type);
-
-        public event ShowNoteWindowEventHandler ShowNoteWindowEvent = delegate { };
-        public delegate void ShowNoteWindowEventHandler (string project);
-
-        public event Action ShowAboutWindowEvent = delegate { };
-        public event Action ShowEventLogWindowEvent = delegate { };
-
-        public event FolderFetchedEventHandler FolderFetched = delegate { };
-        public delegate void FolderFetchedEventHandler (string remote_url, string [] warnings);
-
-        public event FolderFetchErrorHandler FolderFetchError = delegate { };
-        public delegate void FolderFetchErrorHandler (string remote_url, string [] errors);
-
-        public event FolderFetchingHandler FolderFetching = delegate { };
-        public delegate void FolderFetchingHandler (double percentage, double speed, string information);
-
-
-        public event Action FolderListChanged = delegate { };
-        public event Action OnIdle = delegate { };
-        public event Action OnSyncing = delegate { };
-        public event Action OnError = delegate { };
-
-
-        public event InviteReceivedHandler InviteReceived = delegate { };
-        public delegate void InviteReceivedHandler (SparkleInvite invite);
-
-        public event NotificationRaisedEventHandler NotificationRaised = delegate { };
-        public delegate void NotificationRaisedEventHandler (ChangeSet change_set);
-
-        public event AlertNotificationRaisedEventHandler AlertNotificationRaised = delegate { };
-        public delegate void AlertNotificationRaisedEventHandler (string title, string message);
-
-
-        public bool FirstRun {
-            get { return Config.User.Email.Equals ("Unknown"); }
-        }
-
-        public List<string> Folders {
-            get {
-                List<string> folders = Config.Folders;
-                return folders;
-            }
-        }
-
-
-        public User CurrentUser {
-            get { return Config.User; }
-            set { Config.User = value; }
-        }
-
-        public SSHAuthenticationInfo UserAuthenticationInfo;
-
-
-        public bool NotificationsEnabled {
-            get {
-                string notifications_enabled = Config.GetConfigOption ("notifications");
-
-                if (string.IsNullOrEmpty (notifications_enabled)) {
-                    Config.SetConfigOption ("notifications", bool.TrueString);
-                    return true;
-
-                } else {
-                    return notifications_enabled.Equals (bool.TrueString);
-                }
-            }
-        }
-
-        public bool AvatarsEnabled {
-            get {
-                string fetch_avatars_option = Config.GetConfigOption ("fetch_avatars");
-
-                if (fetch_avatars_option == null || fetch_avatars_option.Equals (bool.FalseString))
-                    return false;
-
-                return true;
-            }
-        }
-
-        public string AvatarsProvider {
-            get {
-                string avatars_provider_string = Config.GetConfigOption ("avatars_provider");
-
-                if (avatars_provider_string == null)
-                    return "gravatar";
-
-                return avatars_provider_string;
-            }
-        }
-
-        // Path where the plugins are kept
-        public abstract string PresetsPath { get; }
-
-        // Enables SparkleShare to start automatically at login
-        public abstract void CreateStartupItem ();
-
-        // Installs the sparkleshare:// protocol handler
-        public abstract void InstallProtocolHandler ();
-
-        // Installs the sparkleshare:// protocol handler
-        public abstract void SetFolderIcon ();
-
-        // Creates the SparkleShare folder in the user's home folder
-        public abstract void CreateSparkleShareFolder ();
-
-        // Opens the SparkleShare folder or an (optional) subfolder
-        public abstract void OpenFolder (string path);
-
-        // Opens a file with the appropriate application
-        public abstract void OpenFile (string path);
-
-        // Opens a file with the appropriate application
-        public virtual void OpenWebsite (string url) { }
-
-        // Copies text to the clipboard
-        public abstract void CopyToClipboard (string text);
-
-        // Allows for platform-specific quit and cleanup methods to be called on exit
-        public abstract void PlatformQuit ();
-
-        public abstract string EventLogHTML { get; }
-        public abstract string DayEntryHTML { get; }
-        public abstract string EventEntryHTML { get; }
-
-
-        BaseFetcher fetcher;
-        FileSystemWatcher watcher;
-        object repo_lock = new object ();
-        object check_repos_lock = new object ();
-        List<BaseRepository> repositories = new List<BaseRepository> ();
-        bool lost_folders_path = false;
-
-
-        public BaseController (Configuration config)
-        {
-            Config = config;
-            FoldersPath = Config.FoldersPath;
-        }
-
-
-        public virtual void Initialize ()
-        {
-            string version = InstallationInfo.Version;
-
-            if (InstallationInfo.IsFlatpak)
-                version += " (Flatpak)";
-
-            Logger.LogInfo ("Environment", "SparkleShare " + version);
-            Logger.LogInfo ("Environment", "Git LFS " + Sparkles.Git.GitCommand.GitLFSVersion);
-            Logger.LogInfo ("Environment", "Git " + Sparkles.Git.GitCommand.GitVersion);
-            Logger.LogInfo ("Environment", InstallationInfo.OperatingSystem + " " + InstallationInfo.OperatingSystemVersion);
-
-            UserAuthenticationInfo = new SSHAuthenticationInfo ();
-            SSHAuthenticationInfo.DefaultAuthenticationInfo = UserAuthenticationInfo;
-
-            Preset.PresetsPath = PresetsPath;
-            InstallProtocolHandler ();
-
-            try {
-                CreateSparkleShareFolder ();
-
-            } catch (DirectoryNotFoundException) {
-                this.lost_folders_path = true;
-            }
-
-            SetFolderIcon ();
-
-            // Watch the SparkleShare folder
-            this.watcher = new FileSystemWatcher () {
-                Filter                = "*",
-                IncludeSubdirectories = false,
-                Path                  = FoldersPath
-            };
-
-            watcher.Created += OnFolderActivity;
-            watcher.EnableRaisingEvents = true;
-        }
-
-
-        int reopen_attempt_counts = 0;
-
-        public void HandleReopen ()
-        {
-            if (Repositories.Length > 0) {
-                ShowEventLogWindow ();
-
-            } else if (reopen_attempt_counts > 1) {
-                AlertNotificationRaised ("Hello!", "SparkleShare sits right here, as a status icon.");
-                reopen_attempt_counts = 0;
-
-            } else {
-                reopen_attempt_counts++;
-            }
-        }
-
-
-        public void UIHasLoaded ()
-        {
-            if (this.lost_folders_path) {
-                SparkleShare.UI.Bubbles.Controller.ShowBubble ("Where's your SparkleShare folder?",
-                                                          "Did you put it on a detached drive?", null);
-
-                Environment.Exit (-1);
-            }
-
-            if (FirstRun) {
-                ShowSetupWindow (PageType.Setup);
-
-            } else {
-                new Thread (() => {
-                    StartupInviteScan ();
-                    CheckRepositories ();
-                    RepositoriesLoaded = true;
-                    UpdateState ();
-
-                }).Start ();
-            }
-        }
-
-
-        public void ShowSetupWindow (PageType page_type)
-        {
-            ShowSetupWindowEvent (page_type);
-        }
-
-
-        public void ShowAboutWindow ()
-        {
-            ShowAboutWindowEvent ();
-        }
-
-
-        public void ShowNoteWindow (string project)
-        {
-            ShowNoteWindowEvent (project);
-        }
-
-
-        public void ShowEventLogWindow ()
-        {
-            ShowEventLogWindowEvent ();
-        }
-
-
-        public void OpenSparkleShareFolder ()
-        {
-            OpenFolder (Config.FoldersPath);
-        }
-
-
-        public void OpenSparkleShareFolder (string name)
-        {
-            OpenFolder (new SparkleFolder (name).FullPath);
-        }
-
-
-        public void ToggleNotifications ()
-        {
-            bool notifications_enabled = Config.GetConfigOption ("notifications").Equals (bool.TrueString);
-            Config.SetConfigOption ("notifications", (!notifications_enabled).ToString ());
-        }
-
-
-        void CheckRepositories ()
-        {
-            lock (this.check_repos_lock) {
-                DetectRepositoryRenames ();
-                RemoveDeletedRepositories ();
-            }
-
-            FolderListChanged ();
-        }
-
-
-        void DetectRepositoryRenames ()
-        {
-            foreach (string group_path in Directory.GetDirectories (Config.FoldersPath)) {
-                foreach (string folder_path in Directory.GetDirectories (group_path)) {
-                    string folder_name = Path.GetFileName (folder_path);
-
-                    if (Config.IdentifierByName (folder_name) != null)
-                        continue;
-
-                    string identifier_file_path = Path.Combine (folder_path, ".sparkleshare");
-
-                    if (!File.Exists (identifier_file_path))
-                        continue;
-
-                    string identifier = File.ReadAllText (identifier_file_path).Trim ();
-
-                    if (!Config.IdentifierExists (identifier))
-                        continue;
-
-                    RemoveRepository (GetRepoByName (folder_name));
-                    Config.RenameFolder (identifier, folder_name);
-
-                    string new_folder_path = Path.Combine (group_path, folder_name);
-                    AddRepository (new_folder_path);
-
-                    Logger.LogInfo ("Controller",
-                        "Renamed folder with identifier " + identifier + " to '" + folder_name + "'");
-                }
-            }
-        }
-
-
-        void RemoveDeletedRepositories ()
-        {
-            foreach (string folder_name in Config.Folders) {
-                string folder_path = new SparkleFolder (folder_name).FullPath;
-
-                if (!Directory.Exists (folder_path)) {
-                    Config.RemoveFolder (folder_name);
-                    RemoveRepository (GetRepoByName (folder_name));
-
-                    Logger.LogInfo ("Controller", "Removed folder '" + folder_name + "' from config");
-
-                } else {
-                    AddRepository (folder_path);
-                }
-            }
-        }
-
-
-        void AddRepository (string folder_path)
-        {
-            BaseRepository repo = null;
-            string folder_name = Path.GetFileName (folder_path);
-            string backend = Config.BackendByName (folder_name);
-
-            try {
-                repo = (BaseRepository) Activator.CreateInstance (
-                    Type.GetType ("Sparkles." + backend + "." + backend + "Repository, Sparkles." + backend),
-                        new object [] { folder_path, Config, SSHAuthenticationInfo.DefaultAuthenticationInfo });
-
-            } catch (Exception e) {
-                Logger.LogInfo ("Controller", "Failed to load backend '" + backend + "' for '" + folder_name + "': ", e);
-                return;
-            }
-
-            repo.ChangesDetected += delegate {
-                UpdateState ();
-            };
-
-            repo.SyncStatusChanged += delegate (SyncStatus status) {
-                if (status == SyncStatus.Idle) {
-                    ProgressPercentage  = 0.0;
-                    ProgressSpeedUp     = 0.0;
-                    ProgressSpeedDown   = 0.0;
-                    ProgressInformation = "";
-                }
-
-                UpdateState ();
-            };
-
-            repo.ProgressChanged += delegate {
-                ProgressPercentage  = 0.0;
-                ProgressSpeedUp     = 0.0;
-                ProgressSpeedDown   = 0.0;
-                ProgressInformation = "";
-
-                double percentage = 0.0;
-                int repo_count    = 0;
-
-                foreach (BaseRepository rep in Repositories) {
-                    if (rep.ProgressPercentage > 0) {
-                        percentage += rep.ProgressPercentage;
-                        repo_count++;
-                    }
-
-                    if (rep.Status == SyncStatus.SyncUp)
-                        ProgressSpeedUp += rep.ProgressSpeed;
-
-                    if (rep.Status == SyncStatus.SyncDown)
-                        ProgressSpeedDown += rep.ProgressSpeed;
-                }
-
-                if (repo_count == 1)
-                    ProgressInformation = repo.ProgressInformation;
-
-                if (repo_count > 0)
-                    ProgressPercentage = percentage / repo_count;
-
-                UpdateState ();
-            };
-
-            repo.NewChangeSet += delegate (ChangeSet change_set) {
-                if (AvatarsEnabled) {
-                    string provider = "gravatar";
-
-                    if (AvatarsProvider == "libravatar")
-                        provider = AvatarsProvider;
-
-
-                    change_set.User.AvatarFilePath = Avatars.GetAvatar (change_set.User.Email, 48, Config.DirectoryPath, provider);
-
-                }
-
-                NotificationRaised (change_set);
-            };
-
-            repo.ConflictResolved += delegate {
-                AlertNotificationRaised ("Resolved a file collision", "Local and server versions were kept.");
-            };
-
-            AddRepository (repo);
-            repo.Initialize ();
-        }
-
-
-        void OnFolderActivity (object o, FileSystemEventArgs args)
-        {
-            if (args != null && args.FullPath.EndsWith (".xml") &&
-                args.ChangeType == WatcherChangeTypes.Created) {
-
-                HandleInvite (args);
-                return;
-            }
-        }
-
-
-        void StartupInviteScan ()
-        {
-            foreach (string invite in Directory.GetFiles (FoldersPath, "*.xml"))
-                HandleInvite (invite);
-        }
-
-
-        void HandleInvite (FileSystemEventArgs args)
-        {
-            HandleInvite (args.FullPath);
-        }
-
-
-        void HandleInvite (string path)
-        {
-            if (this.fetcher != null &&
-                this.fetcher.IsActive) {
-
-                AlertNotificationRaised ("SparkleShare Setup seems busy", "Please wait for it to finish");
-
-            } else {
-                SparkleInvite invite = new SparkleInvite (path);
-
-                // It may be that the invite we received a path to isn't
-                // fully downloaded yet, so we try to read it several times
-                int tries = 0;
-                while (!invite.IsValid) {
-                    Thread.Sleep (100);
-                    invite = new SparkleInvite (path);
-                    tries++;
-
-                    if (tries > 10) {
-                        AlertNotificationRaised ("Oh noes!", "This invite seems screwed up...");
-                        break;
-                    }
-                }
-
-                if (invite.IsValid)
-                    InviteReceived (invite);
-
-                File.Delete (path);
-            }
-        }
-
-
-        // Fires events for the current syncing state
-        void UpdateState ()
-        {
-            bool has_unsynced_repos = false;
-            bool has_syncing_repos  = false;
-
-            foreach (BaseRepository repo in Repositories) {
-                if (repo.Status == SyncStatus.SyncDown || repo.Status == SyncStatus.SyncUp || repo.IsBuffering) {
-                    has_syncing_repos = true;
-                    break;
-
-                } else if (repo.Status == SyncStatus.Idle && repo.HasUnsyncedChanges) {
-                    has_unsynced_repos = true;
-                }
-            }
-
-            if (has_syncing_repos)
-                OnSyncing ();
-            else if (has_unsynced_repos)
-                OnError ();
-            else
-                OnIdle ();
-        }
-
-
-        public List<StorageTypeInfo> FetcherAvailableStorageTypes {
-            get {
-                return this.fetcher.AvailableStorageTypes;
-            }
-        }
-
-
-        public void StartFetcher (SparkleFetcherInfo info)
-        {
-            string canonical_name = Path.GetFileName (info.RemotePath);
-            string backend        = info.Backend;
-
-            if (string.IsNullOrEmpty (backend))
-                backend = BaseFetcher.GetBackend (info.Address);
-
-            info.TargetDirectory = Path.Combine (Config.TmpPath, canonical_name);
-
-            if (Directory.Exists (info.TargetDirectory))
-                Directory.Delete (info.TargetDirectory, recursive: true);
-
-            try {
-                this.fetcher = (BaseFetcher) Activator.CreateInstance (
-                    Type.GetType ("Sparkles." + backend + "." + backend + "Fetcher, Sparkles." + backend),
-                        new object [] { info, UserAuthenticationInfo});
-
-            } catch (Exception e) {
-                Logger.LogInfo ("Controller",
-                    "Failed to load '" + backend + "' backend for '" + canonical_name + "' " + e.Message);
-
-                FolderFetchError (Path.Combine (info.Address, info.RemotePath).Replace (@"\", "/"),
-                                  new string [] {"Failed to load \"" + backend + "\" backend for \"" + canonical_name + "\""});
-
-                return;
-            }
-
-            this.fetcher.Finished += FetcherFinishedDelegate;
-            this.fetcher.Failed += FetcherFailedDelegate;
-            this.fetcher.ProgressChanged += FetcherProgressChangedDelgate;
-
-            this.fetcher.Start ();
-        }
-
-
-        void FetcherFinishedDelegate (StorageType storage_type, string [] warnings)
-        {
-            if (storage_type == StorageType.Unknown) {
-                ShowSetupWindow (PageType.StorageSetup);
-                return;
-            }
-
-            if (storage_type == StorageType.Encrypted) {
-                ShowSetupWindowEvent (PageType.CryptoPassword);
-                return;
-            }
-
-            FinishFetcher (storage_type);
-        }
-
-
-        void FetcherFailedDelegate ()
-        {
-            FolderFetchError (this.fetcher.RemoteUrl.ToString (), this.fetcher.Errors);
-            StopFetcher ();
-        }
-
-
-        void FetcherProgressChangedDelgate (double percentage, double speed, string information)
-        {
-            FolderFetching (percentage, speed, information);
-        }
-
-
-        public void StopFetcher ()
-        {
-            this.fetcher.Stop ();
-            this.fetcher.Dispose ();
-
-            this.fetcher = null;
-            this.watcher.EnableRaisingEvents = true;
-        }
-
-
-        public bool CheckPassword (string password)
-        {
-            return this.fetcher.IsFetchedRepoPasswordCorrect (password);
-        }
-
-
-        public void FinishFetcher (StorageType selected_storage_type, string password)
-        {
-            this.fetcher.EnableFetchedRepoCrypto (password);
-            FinishFetcher (StorageType.Encrypted);
-        }
-
-
-        public void FinishFetcher (StorageType selected_storage_type)
-        {
-            this.watcher.EnableRaisingEvents = false;
-            string identifier = this.fetcher.Complete (selected_storage_type);
-
-            string target_folder_path = DetermineFolderPath ();
-            string target_folder_name = Path.GetFileName (target_folder_path);
-
-            try {
-                Directory.Move (this.fetcher.TargetFolder, target_folder_path);
-
-            } catch (Exception e) {
-                Logger.LogInfo ("Controller", "Error moving directory, trying again...", e);
-
-                try {
-                    ClearDirectoryAttributes (this.fetcher.TargetFolder);
-                    Directory.Move (this.fetcher.TargetFolder, target_folder_path);
-
-                } catch (Exception x) {
-                    Logger.LogInfo ("Controller", "Error moving directory", x);
-
-                    this.fetcher.Dispose ();
-                    this.fetcher = null;
-                    this.watcher.EnableRaisingEvents = true;
-                    return;
-                }
-            }
-
-            string backend = BaseFetcher.GetBackend (this.fetcher.RemoteUrl.ToString ());
-
-            Config.AddFolder (target_folder_name, identifier, this.fetcher.RemoteUrl.ToString (), backend);
-
-            if (this.fetcher.FetchedRepoStorageType != StorageType.Plain) {
-                Config.SetFolderOptionalAttribute (target_folder_name,
-                    "storage_type", this.fetcher.FetchedRepoStorageType.ToString ());
-            }
-
-            if (this.fetcher.OriginalFetcherInfo.AnnouncementsUrl != null) {
-                Config.SetFolderOptionalAttribute (target_folder_name, "announcements_url",
-                    this.fetcher.OriginalFetcherInfo.AnnouncementsUrl);
-            }
-
-            AddRepository (target_folder_path);
-            RepositoriesLoaded = true;
-
-            FolderListChanged ();
-            FolderFetched (this.fetcher.RemoteUrl.ToString (), this.fetcher.Warnings.ToArray ());
-
-            this.fetcher.Dispose ();
-            this.fetcher = null;
-
-            this.watcher.EnableRaisingEvents = true;
-        }
-
-
-        string DetermineFolderPath ()
-        {
-            string folder_name = this.fetcher.FormatName ();
-            string folder_group_path = Path.Combine (Config.FoldersPath, this.fetcher.RemoteUrl.Host);
-            string folder_path = Path.Combine (Config.FoldersPath, folder_group_path, folder_name);
-
-            if (!Directory.Exists (folder_path)) {
-                if (!Directory.Exists (folder_group_path))
-                    Directory.CreateDirectory (folder_group_path);
-
-                return folder_path;
-            }
-
-            // Add a number suffix when needed, e.g. "Folder (3)"
-            int suffix = 2 + Directory.GetDirectories (folder_group_path, folder_name + " (*").Length;
-            return string.Format ("{0} ({1})", folder_path, suffix);
-        }
-
-
-        public void Quit ()
-        {
-            foreach (BaseRepository repo in Repositories)
-                repo.Dispose ();
-
-            PlatformQuit ();
-        }
-
-
-        void ClearDirectoryAttributes (string path)
-        {
-            if (!Directory.Exists (path))
-                return;
-
-            string [] folders = Directory.GetDirectories (path);
-
-            foreach (string folder in folders)
-                ClearDirectoryAttributes (folder);
-
-            string [] files = Directory.GetFiles (path);
-
-            foreach (string file in files)
-                if (file.IsSymlink ())
-                    File.SetAttributes (file, FileAttributes.Normal);
-        }
-    }
-}

SparkleShare/Common/HTML/Makefile.am

@@ -0,0 +1,10 @@
+dist_html_DATA = \
+	day-entry.html \
+	event-entry.html \
+	event-log.html \
+	jquery.js
+
+htmldir = $(pkgdatadir)/html/
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

SparkleShare/Common/HTML/event-log.html

@@ -55,7 +55,7 @@
                 background-color: #fefefe;
                 color: <!-- $body-color -->;
                 font-size: <!-- $body-font-size -->;
-                font-family: -apple-system, "<!-- $body-font-family -->";
+                font-family: "<!-- $body-font-family -->";
                 margin: 0;
                 -webkit-user-select: none;
                 overflow-x: hidden;

SparkleShare/Common/HTML/meson.build

@@ -1,10 +0,0 @@
-html_files = ['event-log.html',
-    'day-entry.html',
-    'event-entry.html',
-    'jquery.js'
-]
-
-install_data(
-    sources: html_files,
-    install_dir: join_paths(install_dir, 'html'))
-

SparkleShare/Common/Images/Sources/gitlab.svg

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg9662"
-   height="24"
-   width="24"
-   version="1.1"
-   inkscape:version="0.91+devel r14094"
-   sodipodi:docname="gitlab.svg"
-   viewBox="0 0 24 24"
-   inkscape:export-filename="/Users/hbons/Personal/Projects/SparkleShare/SparkleShare/Common/Presets/gitlab@2x.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     id="namedview4365"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.5858812"
-     inkscape:cy="8.8928334"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g4326"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4341" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4343"
-       inkscape:collect="always">
-      <stop
-         id="stop4345"
-         offset="0"
-         style="stop-color:#df2000;stop-opacity:1" />
-      <stop
-         id="stop4347"
-         offset="1"
-         style="stop-color:#881805;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4318">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4320" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4322" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4304">
-      <stop
-         style="stop-color:#ce2509;stop-opacity:1"
-         offset="0"
-         id="stop4306" />
-      <stop
-         style="stop-color:#a9210a;stop-opacity:1"
-         offset="1"
-         id="stop4308" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4304"
-       id="linearGradient4310"
-       x1="28.415369"
-       y1="9.2727699"
-       x2="31.521933"
-       y2="19.203804"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4343"
-       id="linearGradient4339"
-       gradientUnits="userSpaceOnUse"
-       x1="26.80905"
-       y1="3.7043378"
-       x2="31.521933"
-       y2="19.203804"
-       gradientTransform="translate(0,0.98994346)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4318"
-       id="radialGradient4349"
-       cx="27.992599"
-       cy="13.000279"
-       fx="27.992599"
-       fy="13.000279"
-       r="10.832553"
-       gradientTransform="matrix(2.7510713,0,0,2.3899162,-49.67941,-17.015106)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g4326"
-     transform="matrix(1.01163,0,0,1.0101587,-20.452835,-1.7447338)"
-     style="stroke-width:0.9892233">
-    <path
-       style="fill:#e24329;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 28.012539,10.206244 8.200627,0 L 38.959248,2.1937049 43.510972,14.607498 32.075235,22.996213 20.639498,14.56988 24.965517,2.0432347 Z"
-       id="path4268"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="matrix(-1,0,0,1,64.092707,0.98994346)"
-       id="g4278"
-       style="stroke-width:0.9892233">
-      <g
-         id="g4284"
-         style="stroke-width:0.9892233">
-        <path
-           style="fill:#fc6d26;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 28.012539,9.2163007 -5.818181,0 -1.55486,4.3636363 11.435737,8.426333 z"
-           id="path4280"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#fca326;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 22.694403,9.207369 32.028121,21.951963 20.639498,13.579937 Z"
-           id="path4282"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-    <g
-       id="g4288"
-       transform="translate(0.01747244,0.98994346)"
-       style="stroke-width:0.9892233">
-      <g
-         id="g4290"
-         style="stroke-width:0.9892233">
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path4292"
-           d="m 28.012539,9.2163007 -5.818181,0 -1.55486,4.3636363 11.435737,8.426333 z"
-           style="fill:#fc6d26;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path4294"
-           d="M 22.694403,9.207369 32.028121,21.951963 20.639498,13.579937 Z"
-           style="fill:#fca326;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path4266"
-       d="m 28.012539,10.206244 8.200627,0 L 38.959248,2.1937049 43.510972,14.607498 32.075235,22.996213 20.639498,14.56988 24.965517,2.0432347 Z"
-       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4339);stroke-width:0.9892233;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 25.001953,4.0175781 21.826172,13.210938 32.078125,20.761719 42.3125,13.253906 38.990234,4.1992188 37.160156,9.5410156 A 1.0021178,1.0021178 0 0 1 36.212891,10.21875 l -8.201172,0 A 1.0021178,1.0021178 0 0 1 27.072266,9.5664062 L 25.001953,4.0175781 Z"
-       id="path4312"
-       style="opacity:0.4;fill:none;fill-rule:evenodd;stroke:url(#radialGradient4349);stroke-width:0.9892233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:original="M 24.964844 1.0527344 L 20.638672 13.580078 L 32.076172 22.005859 L 43.511719 13.617188 L 38.958984 1.203125 L 36.212891 9.2167969 L 28.011719 9.2167969 L 24.964844 1.0527344 z "
-       inkscape:radius="-1.0020176"
-       sodipodi:type="inkscape:offset"
-       transform="translate(0,0.98994346)" />
-  </g>
-</svg>

SparkleShare/Common/Images/meson.build

@@ -1,11 +0,0 @@
-image_files = ['tutorial-slide-1.png',
-    'tutorial-slide-2.png',
-    'side-splash.png',
-    'about.png',
-    'text-balloon.png',
-    'user-icon-default.png']
-
-install_data(
-    sources: image_files,
-    install_dir: join_paths(install_dir, 'pixmaps'))
-

SparkleShare/Common/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = HTML \
+	Plugins \
+	Pixmaps

SparkleShare/Common/Pixmaps/Makefile.am

@@ -0,0 +1,12 @@
+dist_pixmaps_DATA = \
+    side-splash.png \
+    user-icon-default.png \
+    text-balloon.png \
+    tutorial-slide-1.png\
+    tutorial-slide-2.png \
+    about.png
+
+pixmapsdir = $(pkgdatadir)/pixmaps/
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

SparkleShare/Common/Pixmaps/Sources/about-dialog.svg

@@ -2114,7 +2114,7 @@
        id="g101011"
        transform="translate(-65.909,-78.641)"
        clip-path="url(#clipPath4254)"
-       inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/about@2x.png"
+       inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/about@2x.png"
        inkscape:export-xdpi="180"
        inkscape:export-ydpi="180">
       <rect

SparkleShare/Common/Pixmaps/Sources/gitorious.svg

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg9662" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs id="defs3">
+  <filter id="filter10824" height="1.2825" width="1.209" color-interpolation-filters="sRGB" y="-.14123" x="-.10449">
+   <feGaussianBlur id="feGaussianBlur10826" stdDeviation="0.95917508"/>
+  </filter>
+  <linearGradient id="linearGradient4333" y2="34.607" gradientUnits="userSpaceOnUse" x2="-545.52" gradientTransform="translate(569,1013)" y1="28.408" x1="-557.06">
+   <stop id="stop10743" stop-color="#f46e6e" offset="0"/>
+   <stop id="stop10749" stop-color="#f7d478" offset=".5"/>
+   <stop id="stop10745" stop-color="#f46e6e" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4335" y2="36.362" gradientUnits="userSpaceOnUse" x2="-551" gradientTransform="translate(569,1013)" y1="27.362" x1="-551">
+   <stop id="stop10755" stop-color="#e50000" offset="0"/>
+   <stop id="stop10757" stop-color="#ab0000" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4337" y2="28.079" gradientUnits="userSpaceOnUse" x2="-557.01" gradientTransform="translate(569,1013)" y1="34.767" x1="-568.52">
+   <stop id="stop10729" stop-color="#73d216" offset="0"/>
+   <stop id="stop10735" stop-color="#efff20" offset=".5"/>
+   <stop id="stop10731" stop-color="#89d216" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4339" y2="35.858" gradientUnits="userSpaceOnUse" x2="-563.29" gradientTransform="translate(569,1013)" y1="25.486" x1="-563.29">
+   <stop id="stop10719" stop-color="#4e9a06" offset="0"/>
+   <stop id="stop10721" stop-color="#346704" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient4341" y2="40.663" gradientUnits="userSpaceOnUse" x2="-549.62" gradientTransform="translate(569,1013)" y1="15.384" x1="-562.87">
+   <stop id="stop10836" stop-color="#fff" offset="0"/>
+   <stop id="stop10838" stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata id="metadata4">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(0 -1028.4)">
+  <rect id="rect10657" fill-opacity="0" height="24" width="24" y="1029.4" x=".088379"/>
+  <path id="path10769" d="m-555.82 22.937-11.801 3.1974v9.6581l11.801 3.4441 10.23-3.1316v-9.9706z" transform="matrix(1.0124 0 0 1 575.75 1011.2)" filter="url(#filter10824)" fill="#2e3436"/>
+  <path id="path10705" stroke-linejoin="round" d="m23.514 1034.8-10.55-3.9367-1.4805 0.054 0.007 19.914 1.509 0.017 10.514-3.1427z" stroke="url(#linearGradient4335)" fill="url(#linearGradient4333)"/>
+  <path id="path10691" stroke-linejoin="round" d="m0.55806 1034.8 10.471-3.9459h1.4422l0.0365 19.989-1.4631-0.031-10.487-3.1115z" stroke="url(#linearGradient4339)" fill="url(#linearGradient4337)"/>
+  <path id="path10693" d="m2 1036.4 9.0165-3.0054-0.0442 15.034l-8.972-2z" fill="#fff"/>
+  <path id="rect10668" d="m5 1037 2-0.3728v8.6465l-1.9844-0.3518z" fill="#539710"/>
+  <path id="rect10672" d="m3 1040.1 6.5938-0.9381v3.3314l-6.5938-0.9z" fill="#539710"/>
+  <path id="path10737" d="m22.016 1036.4-9.016-3l0.0442 15.034 8.9723-2.0281z" fill="#fff"/>
+  <rect id="rect10798" rx="0" ry="0" height="2" width="2" y="1030.4" x="11" fill="#85680e"/>
+  <rect id="rect10800" rx="0" ry="0" height="2" width="2" y="1049.4" x="11" fill="#85680e"/>
+  <rect id="rect10767" rx="0" ry="0" height="19" width="2" y="1031.4" x="11" fill="#eabe35"/>
+  <rect id="rect10842" rx="0" ry="0" height="1" width="2" y="1031.4" x="11" fill="#a78312"/>
+  <path id="path10810" opacity=".75" d="m12.816 1031.9-1.6843 0.01-9.6106 3.6209-0.0183 11.457 9.5022 2.8463 1.9639 0.031 9.5057-2.8861 0.0335-11.455z" stroke="url(#linearGradient4341)" stroke-width="1px" fill="none"/>
+  <path id="path10830" d="m21.062 1040.1-6.5938-0.9381v3.3314l6.5938-0.8463z" fill="#dc0000"/>
+  <g id="layer9" stroke-linejoin="round" transform="translate(-1687.8 -118.06)" stroke="#000" stroke-linecap="round" display="none" fill="#fff">
+   <path id="path11071" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.2596 0 0 1.0947 -22.831 -6.3684)" display="inline" stroke-width=".85160"/>
+   <path id="path11073" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.2596 0 0 1.0947 -22.831 -3.3684)" display="inline" stroke-width=".85160"/>
+   <path id="path11075" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.0553 0 0 .90859 173.25 35.022)" display="inline" stroke-width="1.0212"/>
+   <path id="path11084" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.0553 0 0 .97833 123.25 30.38)" display="inline" stroke-width=".98416"/>
+   <path id="path11086" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.0894 0 0 .97833 98.901 27.38)" display="inline" stroke-width=".96866"/>
+  </g>
+ </g>
+</svg>

SparkleShare/Common/Pixmaps/Sources/side-splash.svg

@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="side-splash.svg"
-   inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/side-splash.png"
+   inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/side-splash.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <sodipodi:namedview

SparkleShare/Common/Pixmaps/Sources/ssnet.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg8763" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24.009" width="24.013" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs id="defs8765">
+  <filter id="filter3330" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0">
+   <feColorMatrix id="feColorMatrix3332" values="0" type="saturate"/>
+  </filter>
+  <filter id="filter4375-3-0" color-interpolation-filters="sRGB" width="1.0248" y="-.35609" x="-.012418" height="1.7122">
+   <feGaussianBlur id="feGaussianBlur4377-0-0" stdDeviation="1.0664062"/>
+  </filter>
+  <linearGradient id="linearGradient11481">
+   <stop id="stop11483" stop-color="#a04600" offset="0"/>
+   <stop id="stop11485" stop-color="#ce5c00" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient21508" y2="18.848" gradientUnits="userSpaceOnUse" x2="24.866" gradientTransform="matrix(.30890 0 0 .27375 301.94 218.48)" y1="30.385" x1="24.866">
+   <stop id="stop4910-6" stop-color="#ce5c00" offset="0"/>
+   <stop id="stop4912-9" stop-color="#f57900" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient21510" y2="221.38" xlink:href="#linearGradient11481" gradientUnits="userSpaceOnUse" x2="315.29" gradientTransform="translate(0,1)" y1="232.34" x1="315.05"/>
+  <radialGradient id="radialGradient21512" gradientUnits="userSpaceOnUse" cy="179.01" cx="306.1" gradientTransform="matrix(2.5489 0 0 .51730 -476.41 129.05)" r="8.6094">
+   <stop id="stop4615" stop-color="#fff" offset="0"/>
+   <stop id="stop4617" stop-color="#fff" stop-opacity="0" offset="1"/>
+  </radialGradient>
+  <linearGradient id="linearGradient21514" y2="-9.4962" gradientUnits="userSpaceOnUse" x2="25.188" gradientTransform="matrix(.28968 0 0 .17690 301.87 224.04)" y1="50.897" x1="25.188">
+   <stop id="stop4991-0" stop-color="#f57900" offset="0"/>
+   <stop id="stop4993-4" stop-color="#fcaf3e" offset=".060437"/>
+   <stop id="stop4995-6" stop-color="#fcaf3e" offset=".17754"/>
+   <stop id="stop4997-0" stop-color="#f57900" offset=".89422"/>
+   <stop id="stop4999-3" stop-color="#ce5c00" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient21516" y2="223.68" xlink:href="#linearGradient11481" gradientUnits="userSpaceOnUse" x2="314.47" y1="233.24" x1="314.49"/>
+  <linearGradient id="linearGradient21518" y2="208.75" gradientUnits="userSpaceOnUse" x2="320.56" y1="184.62" x1="312.44">
+   <stop id="stop4631" stop-color="#fff" offset="0"/>
+   <stop id="stop4633" stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+  <radialGradient id="radialGradient21520" gradientUnits="userSpaceOnUse" cy="525.86" cx="147.02" gradientTransform="matrix(1.5869 1.2599e-7 -5.9773e-8 .75290 -86.287 85.9)" r="103.05">
+   <stop id="stop4349-3-4" stop-color="#fff" offset="0"/>
+   <stop id="stop16502" stop-color="#fff" stop-opacity=".49804" offset=".5"/>
+   <stop id="stop4351-6-4" stop-color="#fff" stop-opacity="0" offset="1"/>
+  </radialGradient>
+  <linearGradient id="linearGradient21532" y2="263.79" gradientUnits="userSpaceOnUse" x2="117.64" y1="220.79" x1="117.64">
+   <stop id="stop21528" stop-color="#fff" offset="0"/>
+   <stop id="stop21530" stop-color="#fff" stop-opacity="0.36" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient21612" y2="251.79" gradientUnits="userSpaceOnUse" x2="94.143" gradientTransform="translate(-333.93 -139.65)" y1="251.79" x1="70.143">
+   <stop id="stop21608" stop-color="#5dbbc6" offset="0"/>
+   <stop id="stop21610" stop-color="#96dadb" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient21638" y2="112.14" gradientUnits="userSpaceOnUse" x2="-249.54" y1="112.14" x1="-263.79">
+   <stop id="stop21634" stop-color="#3e3e3e" offset="0"/>
+   <stop id="stop21636" stop-opacity="0" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata id="metadata8768">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-474.29 -337.78)">
+  <g id="g8506" transform="translate(374.14 98)">
+   <rect id="rect3589" height="24" width="120" display="none" y="241.6" x="97.775" fill="#eeeeec"/>
+   <rect id="rect4698" height="48" width="48" display="none" y="25.598" x="87.775" fill="#eeeeec"/>
+   <rect id="rect4700" height="32" width="32" display="none" y="101.6" x="94.775" fill="#eeeeec"/>
+   <rect id="rect4702" height="22" width="22" display="none" y="152.6" x="94.775" fill="#eeeeec"/>
+   <rect id="rect4704" height="16" width="16" display="none" y="194.6" x="94.775" fill="#eeeeec"/>
+   <rect id="rect4706" height="24" width="24" display="none" y="151.6" x="93.775" fill="#eeeeec"/>
+   <rect id="rect4708" height="256" width="256" display="none" y="3.5985" x="-188.22" fill="#eeeeec"/>
+   <text id="text4710" style="enable-background:new" xml:space="preserve" font-size="18.301px" display="none" y="-2.8879292" x="-187.25412" font-family="Bitstream Vera Sans" fill="#000000"><tspan id="tspan4712" x="-187.25412" y="-2.8879292">places</tspan></text>
+   <text id="text4714" style="enable-background:new" line-height="125%" font-weight="bold" xml:space="preserve" font-size="18.301px" y="-2.8879292" x="-66.254158" font-family="Droid Sans" display="none" fill="#000000"><tspan id="tspan4716" x="-66.254158" y="-2.8879292">sparkleshare</tspan></text>
+   <rect id="rect22378" height="22" width="22" display="none" y="152.6" x="124.78" fill="#ededed"/>
+   <rect id="rect22380" height="24" width="24" display="none" y="151.6" x="123.78" fill="#ededed"/>
+   <rect id="rect12657-5" style="color:#000000;enable-background:new" rx="0" ry="0" height="0" width="2" y="165.6" x="467.78" fill="#888a85"/>
+   <use id="use3340" style="enable-background:new" xlink:href="#g3326" transform="translate(-203.22 225.6)" height="400" width="500" y="0" x="0"/>
+   <rect id="rect20728" transform="rotate(-90)" rx="3.7196" ry="3.7196" height="22.998" width="22.998" stroke="#6196c5" stroke-linecap="round" y="100.64" x="-263.29" stroke-width="1.002" fill="url(#linearGradient21612)"/>
+   <path id="path21534" opacity="0.333" d="m248.42 154.51h-6.8943s-2.6516 0.57452-3.0494-3.0494v-11.093s0.35356-1.5468 1.9446-1.9445h5.1265c1.5468 0.48614 2.0771 2.0771 2.0771 2.0771h6.8501s0.75131 0.30935 1.1049 1.1048v9.8276c-0.0442 2.1655-2.0992 3.0992-2.0992 3.0992z" transform="translate(-134.86 105.79)" stroke="#fff" stroke-width="1px" fill="none"/>
+   <g id="g21596" opacity=".5">
+    <path id="rect21555" opacity=".25" d="m103.14 239.79h7l2 12z"/>
+    <path id="path21558" opacity=".25" d="m121.14 263.79h-7l-2-12z"/>
+    <path id="path21560" opacity=".25" d="m121.14 239.79h-7l-2 12z"/>
+    <path id="path21562" opacity=".25" d="m103.14 263.79h7l2-12z"/>
+    <path id="path21570" opacity=".25" d="m124.14 242.79 0.00001 7-12 2z"/>
+    <path id="path21572" opacity=".25" d="m100.14 260.79-0.00001-7 12-2z"/>
+    <path id="path21574" opacity=".25" d="m124.14 260.79v-7l-12-2z"/>
+    <path id="path21576" opacity=".25" d="m100.14 242.79 0.00001 7 12 2z"/>
+   </g>
+   <g id="g21498" transform="translate(9.3677 49.194)">
+    <g id="g10370" style="enable-background:new" transform="translate(-208.22 -24.402)">
+     <path id="path10372" style="enable-background:new" d="m304.53 220.5c-0.57203 0.064-1.0035 0.54941-1 1.125v10.344c0.00006 0.62129 0.50371 1.1249 1.125 1.125h12.719c0.62129-0.00006 1.1249-0.50371 1.125-1.125v-8.3125c-0.00006-0.62129-0.50371-1.1249-1.125-1.125h-5.8438c-0.3334 0-0.20853 0.0527-0.40625-0.21875l-0.96875-1.3438c-0.2098-0.29211-0.54661-0.46632-0.90625-0.46875h-4.5938c-0.0416-0.002-0.0834-0.002-0.125 0z" fill-rule="evenodd" stroke="url(#linearGradient21510)" fill="url(#linearGradient21508)"/>
+     <path id="path10374" opacity=".4" style="enable-background:new" d="m304.62 221.44c-0.10325 0.0115-0.15688 0.0836-0.15625 0.1875v10.344c0.00001 0.11468 0.0728 0.18749 0.1875 0.1875h12.719c0.11468-0.00001 0.18749-0.0728 0.1875-0.1875v-8.3125c-0.00001-0.11468-0.0728-0.18749-0.1875-0.1875h-5.8438c-0.0587 0-0.0805-0.001-0.15625 0-0.0757 0.001-0.29559 0.0325-0.5625-0.125-0.26691-0.15754-0.34468-0.32772-0.375-0.375-0.0303-0.0473-0.0322-0.0522-0.0625-0.0937l-0.96875-1.3438c-0.0355-0.0494-0.0954-0.0933-0.15625-0.0937h-4.5938c-0.0104 0.00017-0.0208 0.00017-0.0313 0l0.00005-0.0001z" stroke="url(#radialGradient21512)" fill="none"/>
+     <path id="path10377" stroke-linejoin="round" style="enable-background:new" d="m309.78 222.5c-0.2554 0-0.45965 0.13987-0.59375 0.34375-0.43264 0.54853-1.1235 1.6562-1.6562 1.6562h-2.6875c-0.83807 0-1.3437 0.5428-1.3438 1.4688v6.125c0 1.3376 0.65057 2.4062 1.4688 2.4062h12.062c0.81819 0 1.4688-1.0687 1.4688-2.4062v-8.9062c0-0.37505-0.29595-0.6875-0.65625-0.6875h-8.0625z" fill-rule="evenodd" stroke="url(#linearGradient21516)" fill="url(#linearGradient21514)"/>
+     <path id="path10379" opacity=".40639" stroke-linejoin="round" style="enable-background:new" d="m310.94 183.5c-0.74659 0.74659-1.6086 2-2.4062 2h-2.6875c-0.20314 0-0.22418 0.0344-0.25 0.0625-0.0258 0.0281-0.0937 0.12531-0.0937 0.40625v7.5312h13v-10h-7.5625-0.00005z" transform="translate(-1,40)" stroke="url(#linearGradient21518)" fill="none"/>
+     <path id="path10381" opacity=".71595" style="enable-background:new" d="m250.06 476.75c-0.0458 1.3355-0.49131 2.357-1.2188 3.0625-0.72744 0.70545-1.7687 1.125-3.1875 1.125h-197.25c-1.4189 0-2.4805-0.44927-3.2188-1.1562-0.73826-0.70698-1.1869-1.7049-1.2188-3.0312v3c0.03187 1.3263 0.48049 2.3243 1.2188 3.0312 0.73826 0.70698 1.7998 1.1562 3.2188 1.1562h197.25c1.4188 0 2.4601-0.41955 3.1875-1.125 0.72744-0.70545 1.1729-1.727 1.2188-3.0625v-3z" fill-rule="evenodd" transform="matrix(.065331 0 0 .29412 301.15 90.449)" filter="url(#filter4375-3-0)" fill="url(#radialGradient21520)"/>
+    </g>
+    <path id="path5717-2" stroke-linejoin="round" style="enable-background:new" d="m103.15 201.61c-0.1681 0.0217-0.3164 0.15386-0.3579 0.31842l-0.7155 2.1494c-0.019 0.0382-0.032 0.0777-0.039 0.11973-0.038-0.0191-0.078-0.0318-0.1196-0.0395h-2.1866c-0.1222 0-0.2415 0.0637-0.3181 0.15921-0.1612 0.18061-0.1208 0.50107 0.079 0.63685l1.7891 1.3136 0.038 0.19106-0.6757 2.1095c-0.094 0.32925 0.3466 0.66015 0.6361 0.47763l1.7889-1.3134h0.229l1.7891 1.3134c0.1556 0.1019 0.3785 0.0841 0.5167-0.0395 0.1171-0.10827 0.1659-0.28518 0.1196-0.4379l-0.6759-2.1095c-0.064-0.0127 0.025-0.12737 0.038-0.19105l1.7889-1.3136c0.2004-0.13577 0.2401-0.45623 0.079-0.63684-0.076-0.0955-0.1958-0.15526-0.318-0.15921h-2.2264c-0.042 0.0127-0.081 0.0204-0.1196 0.0395-0.013-0.042-0.02-0.0815-0.039-0.11973l-0.6759-2.1493c-0.02-0.0752-0.062-0.14546-0.1196-0.19908-0.084-0.0815-0.2016-0.1261-0.318-0.11973l0.014 0.00013-0.0006 0.00001z" stroke="#c66f11" stroke-linecap="round" fill="none"/>
+    <path id="path5717" stroke-linejoin="round" style="enable-background:new" d="m103.15 200.61c-0.1681 0.0217-0.3164 0.15386-0.3579 0.31842l-0.7155 2.1494c-0.019 0.0382-0.032 0.0777-0.039 0.11973-0.038-0.0191-0.078-0.0318-0.1196-0.0395h-2.1866c-0.1222 0-0.2415 0.0637-0.3181 0.15921-0.1612 0.18061-0.1208 0.50107 0.079 0.63685l1.7891 1.3136 0.038 0.19106-0.6757 2.1095c-0.094 0.32925 0.3466 0.66015 0.6361 0.47763l1.7889-1.3134h0.229l1.7891 1.3134c0.1556 0.1019 0.3785 0.0841 0.5167-0.0395 0.1171-0.10827 0.1659-0.28518 0.1196-0.4379l-0.6759-2.1095c-0.064-0.0127 0.025-0.12737 0.038-0.19105l1.7889-1.3136c0.2004-0.13577 0.2401-0.45623 0.079-0.63684-0.076-0.0955-0.1958-0.15526-0.318-0.15921h-2.2264c-0.042 0.0127-0.081 0.0204-0.1196 0.0395-0.013-0.042-0.02-0.0815-0.039-0.11973l-0.6759-2.1493c-0.02-0.0752-0.062-0.14546-0.1196-0.19908-0.084-0.0815-0.2016-0.1261-0.318-0.11973l0.014 0.00013-0.0006 0.00001z" stroke="#fff" stroke-linecap="round" fill="none"/>
+   </g>
+   <rect id="rect21524" opacity=".83759" rx="2.8127" ry="2.8127" height="20.998" width="20.998" stroke="url(#linearGradient21532)" stroke-linecap="round" y="241.29" x="101.64" stroke-width="1.002" fill="none"/>
+   <rect id="rect21630" opacity="0.33" ry="3.9071" rx="3.9071" transform="rotate(-90)" height="22.998" width="22.998" stroke="url(#linearGradient21638)" stroke-linecap="round" y="100.64" x="-263.29" stroke-width="1.002" fill="none"/>
+  </g>
+ </g>
+</svg>

SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg

@@ -3064,7 +3064,7 @@
          style="fill:url(#radialGradient211652);fill-opacity:1;stroke:#261f1f;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/tutorial-slide-1@2x.png" />
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png" />
       <g
          transform="matrix(0.85916724,0,0,0.85916724,-926.30984,-650.2188)"
          id="g52133-7"

SparkleShare/Common/Plugins/Makefile.am

@@ -0,0 +1,18 @@
+dist_plugins_DATA = \
+    bitbucket.xml \
+    github.xml \
+    gitorious.xml \
+    ssnet.xml \
+    own-server.xml \
+    planio.xml \
+    github.png \
+    gitorious.png \
+    bitbucket.png \
+    ssnet.png \
+    planio.png \
+    own-server.png
+
+pluginsdir = $(pkgdatadir)/plugins/
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

SparkleShare/Common/Plugins/bitbucket.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparkleshare>
-  <preset>
+  <plugin>
     <info>
         <name>Bitbucket</name>
         <description>Free code hosting for Git and Mercurial</description>
         <icon>bitbucket.png</icon>
         <backend>Git</backend>
-        <fingerprint>4c:eb:19:11:0d:d6:19:65:7b:6a:40:8a:fb:b7:4d:51:81:a1:7a:07:74:4a:b5:22:0c:91:86:42:74:88:9b:bc</fingerprint>
+        <fingerprint>97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40</fingerprint>
     </info>
     <address>
       <value>ssh://git@bitbucket.org/</value>
@@ -17,5 +17,5 @@
       <example>/username/project</example>
       <uses_lower_case>True</uses_lower_case>
     </path>
-  </preset>
+  </plugin>
 </sparkleshare>

SparkleShare/Common/Plugins/github.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparkleshare>
-  <preset>
+  <plugin>
     <info>
         <name>GitHub</name>
-        <description>The biggest collection of Open Source projects</description>
+        <description>Collaborate on projects hosted on GitHub</description>
         <icon>github.png</icon>
         <backend>Git</backend>
-        <storage_type>LargeFiles</storage_type>
-        <fingerprint>92:a3:7f:bd:5e:21:a5:3a:95:c7:16:e1:14:4f:44:2f:58:2b:94:d0:fa:fc:67:3e:b6:71:7a:4e:b5:1a:88:a7</fingerprint>
+        <fingerprint>16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48</fingerprint>
     </info>
     <address>
       <value>ssh://git@github.com/</value>
@@ -17,5 +16,5 @@
       <value/>
       <example>/username/project</example>
     </path>
-  </preset>
+  </plugin>
 </sparkleshare>

SparkleShare/Common/Plugins/gitorious.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <plugin>
+    <info>
+        <name>Gitorious</name>
+        <description>Open source infrastructure for hosting open source projects</description>
+        <icon>gitorious.png</icon>
+        <backend>Git</backend>
+        <fingerprint>7e:af:8d:ec:f0:39:5e:ba:52:16:ce:19:fa:d4:b8:7d</fingerprint>
+    </info>
+    <address>
+      <value>ssh://git@gitorious.org/</value>
+      <example/>
+    </address>
+    <path>
+      <value/>
+      <example>/project/repository</example>
+    </path>
+  </plugin>
+</sparkleshare>

SparkleShare/Common/Plugins/own-server.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparkleshare>
-  <preset>
+  <plugin>
     <info>
-        <name>Own server</name>
+        <name>On my own server</name>
         <description>Everything under my control</description>
         <icon>own-server.png</icon>
         <backend>Git</backend>
@@ -15,6 +15,5 @@
       <value/>
       <example>/path/to/project</example>
     </path>
-  </preset>
+  </plugin>
 </sparkleshare>
-

SparkleShare/Common/Plugins/planio.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <plugin>
+    <info>
+        <name>Planio</name>
+        <description>500MB of unlimited free hosted Git repos and project management</description>
+        <icon>planio.png</icon>
+        <backend>Git</backend>
+        <fingerprint>77:d1:54:d7:33:7e:38:43:40:70:ca:2d:3a:24:05:22</fingerprint>
+        <announcements_url>tcp://sparkleshare-notifications.plan.io:443</announcements_url>
+    </info>
+    <address>
+      <value/>
+      <example>ssh://git@[account].plan.io</example>
+    </address>
+    <path>
+      <value/>
+      <example>/[account]-[project].git</example>
+    </path>
+  </plugin>
+</sparkleshare>

SparkleShare/Common/Plugins/ssnet.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <plugin>
+    <info>
+        <name>SparkleShare.Net</name>
+        <description>The easiest way to share projects with SparkleShare</description>
+        <icon>ssnet.png</icon>
+        <backend>Git</backend>
+    </info>
+    <address>
+      <value>ssh://storage@sparkleshare.net/</value>
+      <example/>
+    </address>
+    <path>
+      <value/>
+      <example>/username/project</example>
+    </path>
+  </plugin>
+</sparkleshare>

SparkleShare/Common/Presets/gitlab.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sparkleshare>
-  <preset>
-    <info>
-        <name>GitLab</name>
-        <description>Open Source alternative to GitHub</description>
-        <icon>gitlab.png</icon>
-        <backend>Git</backend>
-        <fingerprint>44:e4:05:bc:f4:e1:1a:b5:b8:46:e5:8b:a0:bf:6d:ab:d2:3d:cc:9e:36:7c:ae:17:cb:0c:91:b5:b3:b3:fc:44</fingerprint>
-    </info>
-    <address>
-      <value>ssh://git@gitlab.com/</value>
-      <example/>
-    </address>
-    <path>
-      <value/>
-      <example>/username/project</example>
-    </path>
-  </preset>
-</sparkleshare>
-

SparkleShare/Common/Presets/meson.build

@@ -1,10 +0,0 @@
-preset_files = ['github.xml', 'github.png',
-    'gitlab.xml', 'gitlab.png',
-    'bitbucket.xml', 'bitbucket.png',
-    'own-server.xml', 'own-server.png'
-]
-
-install_data(
-    sources: preset_files,
-    install_dir: join_paths(install_dir, 'presets'))
-

SparkleShare/Common/SparkleShare.cs

@@ -1,66 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
-//
-//   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 <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Threading;
-
-using Sparkles;
-
-namespace SparkleShare {
-
-    public class SparkleShare {
-
-        public static Controller Controller;
-        public static UserInterface UI;
-
-        static Mutex program_mutex = new Mutex (false, "SparkleShare");
-        
-     
-        #if !__MonoCS__
-        [STAThread]
-        #endif
-        public static void Main (string [] args)
-        {
-            // Only allow one instance of SparkleShare (on Windows)
-            if (!program_mutex.WaitOne (0, exitContext: false)) {
-                Console.WriteLine ("SparkleShare is already running.");
-                Environment.Exit (-1);
-            }
-
-            AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
-
-            Controller = new Controller (Configuration.DefaultConfiguration);
-            Controller.Initialize ();
-
-            UI = new UserInterface ();
-            UI.Run (args);
-
-            #if !__MonoCS__
-            // Suppress assertion messages in debug mode
-            GC.Collect (GC.MaxGeneration, GCCollectionMode.Forced);
-            GC.WaitForPendingFinalizers ();
-            #endif
-        }
-
-
-        static void OnUnhandledException (object sender, UnhandledExceptionEventArgs exception_args)
-        {
-            var exception = (Exception) exception_args.ExceptionObject;
-            Logger.WriteCrashReport (exception);
-        }
-    }
-}

SparkleShare/Common/SparkleShare.projitems

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>{F16E3683-B622-4654-B799-99C8D68AA963}</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>SparkleShare</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)AboutController.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Avatars.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)BaseController.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)BubblesController.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)EventLogController.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)NoteController.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SetupController.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SparkleShare.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)StatusIconController.cs" />
-  </ItemGroup>
-</Project>

SparkleShare/Common/SparkleShare.shproj

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F16E3683-B622-4654-B799-99C8D68AA963}</ProjectGuid>
-    <ReleaseVersion></ReleaseVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <Import Project="SparkleShare.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

SparkleShare/Common/Translations/Makefile.in.in

@@ -0,0 +1,222 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob@ximian.com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all-@USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data-@USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  else \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info ctags tags CTAGS TAGS ID:
+
+# Define this as empty until I found a useful application.
+install-exec installcheck:
+
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
+
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

SparkleShare/Common/Translations/nl.po

@@ -2,7 +2,7 @@
 # 
 # Translators:
 #   <benjamincottyn@gmail.com>, 2011.
-#   <hi@planetpeanut.uk>, 2011.
+#   <hylkebons@gmail.com>, 2011.
 #   <inxidious@gmail.com>, 2011.
 # Łukasz Jernaś <deejay1@srem.org>, 2011.
 #   <m.manshanden@gmail.com>, 2011.

SparkleShare/Linux/About.cs

@@ -1,166 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons (hi@planetpeanut.uk)
-//
-//   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 (http://www.gnu.org/licenses/).
-
-
-using System;
-
-using Sparkles;
-using Gtk;
-
-namespace SparkleShare {
-
-    public class About : Window {
-
-        public AboutController Controller = new AboutController ();
-
-        Label updates;
-
-
-        public About () : base ("About SparkleShare")
-        {
-            IconName       = "org.sparkleshare.SparkleShare";
-            Resizable      = false;
-            WindowPosition = WindowPosition.CenterAlways;
-            TypeHint       = Gdk.WindowTypeHint.Dialog;
-
-            SetSizeRequest (640, 260);
-
-
-            DeleteEvent += delegate (object o, DeleteEventArgs args) {
-                Controller.WindowClosed ();
-                args.RetVal = true;
-            };
-
-            KeyPressEvent += delegate (object o, KeyPressEventArgs args) {
-                if (args.Event.Key == Gdk.Key.Escape ||
-                    (args.Event.State == Gdk.ModifierType.ControlMask && args.Event.Key == Gdk.Key.w)) {
-
-                    Controller.WindowClosed ();
-                }
-            };
-
-            Controller.HideWindowEvent += delegate {
-                Application.Invoke (delegate { Hide (); });
-            };
-
-            Controller.ShowWindowEvent += delegate {
-                Application.Invoke (delegate {
-                    ShowAll ();
-                    Present ();
-                });
-            };
-
-            Controller.UpdateLabelEvent += delegate (string text) {
-                Application.Invoke (delegate {
-                    updates.Text = text;
-                    updates.ShowAll();
-                });
-            };
-
-
-            CreateAbout ();
-        }
-
-
-        void CreateAbout ()
-        {
-            CssProvider window_css_provider = new CssProvider ();
-            string image_path = InstallationInfo.Directory + "/pixmaps/about.png";
-
-            window_css_provider.LoadFromData ("window, GtkWindow {" +
-                "    background-image: url('" + image_path + "');" +
-                "    background-repeat: no-repeat;" +
-                "    background-position: left bottom;" +
-                "}");
-
-            StyleContext.AddProvider (window_css_provider, 800);
-
-            var layout_vertical = new VBox (false, 0);
-            var links_layout = new HBox (false, 16);
-
-            CssProvider label_css_provider = new CssProvider ();
-            label_css_provider.LoadFromData ("label { color: #fff; font-size: 14pt; background-color: rgba(0, 0, 0, 0); }");
-
-            CssProvider label_highlight_css_provider = new CssProvider ();
-            label_highlight_css_provider.LoadFromData ("label { color: #a8bbcf; font-size: 12pt; }");
-
-            var version = new Label {
-                Text = "version " + Controller.RunningVersion,
-                Xalign = 0, Xpad = 0
-            };
-
-            if (InstallationInfo.IsFlatpak)
-                version.Text += " (Flatpak)";
-
-            updates = new Label ("Checking for updates…") {
-                Xalign = 0, Xpad = 0
-            };
-
-            var copyright = new Label {
-                Markup = string.Format ("Copyright © 2010–{0} Hylke Bons and others", DateTime.Now.Year),
-                Xalign = 0, Xpad = 0
-            };
-
-            var license = new Label ("SparkleShare is Open Source and you’re free to\n" +
-                "use, change, and share it under the GNU GPLv3") {
-
-                Xalign = 0, Xpad = 0
-            };
-
-            license.StyleContext.AddProvider (label_css_provider, 800);
-            updates.StyleContext.AddProvider (label_highlight_css_provider, 800);
-            version.StyleContext.AddProvider (label_css_provider, 800);
-            copyright.StyleContext.AddProvider (label_css_provider, 800);
-
-            var website_link        = new Link ("Website", Controller.WebsiteLinkAddress);
-            var credits_link        = new Link ("Credits", Controller.CreditsLinkAddress);
-            var report_problem_link = new Link ("Report a problem", Controller.ReportProblemLinkAddress);
-            var debug_log_link      = new Link ("Debug log", Controller.DebugLogLinkAddress);
-
-            layout_vertical.PackStart (new Label (""), true, true, 0);
-            layout_vertical.PackStart (version, false, false, 0);
-            layout_vertical.PackStart (updates, false, false, 0);
-            layout_vertical.PackStart (copyright, false, false, 6);
-            layout_vertical.PackStart (license, false, false, 6);
-            layout_vertical.PackStart (links_layout, false, false, 6);
-
-            links_layout.PackStart (website_link, false, false, 0);
-            links_layout.PackStart (credits_link, false, false, 0);
-            links_layout.PackStart (report_problem_link, false, false, 0);
-            links_layout.PackStart (debug_log_link, false, false, 0);
-
-            var layout_horizontal = new HBox (false, 0);
-            layout_horizontal.PackStart (new Label (""), false, false, 149);
-            layout_horizontal.PackStart (layout_vertical, false, false, 0);
-
-            Add (layout_horizontal);
-        }
-    }
-
-
-    class Link : Label {
-
-        public Link (string label, string url)
-        {
-            Markup   = string.Format ("<a href=\"{0}\">{1}</a>", url, label);
-            CanFocus = false;
-
-            CssProvider css_provider = new CssProvider ();
-            css_provider.LoadFromData ("label a { color: #729fcf; font-size: 14pt; }");
-            StyleContext.AddProvider (css_provider, 800);
-        }
-    }
-}

SparkleShare/Linux/Controller.cs

@@ -1,151 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
-//
-//   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 <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Diagnostics;
-using System.IO;
-
-using Gtk;
-using Mono.Unix.Native;
-
-using Sparkles;
-using Sparkles.Git;
-
-namespace SparkleShare {
-
-    public class Controller : BaseController {
-
-        public Controller (Configuration config) : base (config)
-        {
-            if (InstallationInfo.IsFlatpak)
-                GitCommand.ExecPath = Path.Combine ("/app", "libexec", "git-core");
-        }
-
-
-        public override void CreateSparkleShareFolder ()
-        {
-            if (!Directory.Exists (Configuration.DefaultConfiguration.FoldersPath)) {
-                Directory.CreateDirectory (Configuration.DefaultConfiguration.FoldersPath);
-                Syscall.chmod (Configuration.DefaultConfiguration.FoldersPath, (FilePermissions) 448); // 448 -> 700
-            }
-        }
-        
-
-        public override void SetFolderIcon ()
-        {
-            var gio_set = new Command ("gio", "set \"" + Configuration.DefaultConfiguration.FoldersPath + "\" " +
-                "metadata::custom-icon-name org.sparkleshare.SparkleShare");
-
-            string XDG_DATA_HOME = Path.Combine (Config.HomePath, ".local", "share");
-            gio_set.StartInfo.EnvironmentVariables ["XDG_DATA_HOME"] = XDG_DATA_HOME;
-
-            gio_set.StartAndWaitForExit ();
-        }
-
-
-        public override void CreateStartupItem ()
-        {
-            string autostart_file_path = Path.Combine (Path.GetDirectoryName (InstallationInfo.Directory),
-                "applications", "SparkleShare.Autostart.desktop");
-            
-            string autostart_file_dest = Path.Combine (Config.HomePath, ".config", "autostart", "SparkleShare.Autostart.desktop");
-            string autostart_path = Path.GetDirectoryName (autostart_file_dest);
-
-            if (!Directory.Exists (autostart_path))
-                Directory.CreateDirectory (autostart_path);
-
-            if (File.Exists (autostart_file_dest))
-                return;
-
-            try {
-                File.Copy (autostart_file_path, autostart_file_dest);
-                Logger.LogInfo ("Controller", "Added SparkleShare to startup items");
-
-            } catch (Exception e) {
-                Logger.LogInfo ("Controller", "Failed to add SparkleShare to startup items", e);
-            }
-        }
-
-
-        public override void InstallProtocolHandler ()
-        {
-        }
-        
-
-        public override void CopyToClipboard (string text)
-        {
-            Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false)).Text = text;
-        }
-
-
-        public override void OpenFolder (string path)
-        {
-            OpenFile (path);
-        }
-
-
-        public override void OpenFile (string path)
-        {
-            if (InstallationInfo.IsFlatpak)
-                Global.ShowUri (Gdk.Screen.Default, path);
-            else
-                new Command ("xdg-open", string.Format ("\"{0}\"", path)).Start ();
-        }
-
-
-        public override string EventLogHTML {
-            get {
-                string html_path = Path.Combine (InstallationInfo.Directory, "html", "event-log.html");
-                string jquery_file_path = Path.Combine (InstallationInfo.Directory, "html", "jquery.js");
-
-                string html   = File.ReadAllText (html_path);
-                string jquery = File.ReadAllText (jquery_file_path);
-
-                return html.Replace ("<!-- $jquery -->", jquery);
-            }
-        }
-
-        
-        public override string DayEntryHTML {
-            get {
-                string path = Path.Combine (InstallationInfo.Directory, "html", "day-entry.html");
-                return File.ReadAllText (path);
-            }
-        }
-
-        
-        public override string EventEntryHTML {
-            get {
-                string path = Path.Combine (InstallationInfo.Directory, "html", "event-entry.html");
-                return File.ReadAllText (path);
-            }
-        }
-
-
-        public override string PresetsPath {
-            get {
-                return Path.Combine (InstallationInfo.Directory, "presets");
-            }
-        }
-
-
-        public override void PlatformQuit ()
-        {
-            Environment.Exit (0);
-        }
-    }
-}