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

controller: Shouldn't be changing people's bookmarks

Browse source
This commit is contained in:
Hylke Bons 2016-03-28 21:17:58 +01:00
parent 513ecb378e
commit 0e2a31c2cd
4 changed files with 40 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SparkleLib/Git/SparkleFetcherGit.cs
View file

@ -364,12 +364,5 @@ namespace SparkleLib.Git {
return false;
}
string GenerateCryptoSalt ()
{
string salt = Path.GetRandomFileName ().SHA1 ();
return salt.Substring (0, 16);
}
}
}

93
SparkleShare/Linux/SparkleController.cs
View file

@ -28,14 +28,14 @@ namespace SparkleShare {
public class SparkleController : SparkleControllerBase {
public SparkleController () : base ()
public SparkleController ()
{
}
public override string PluginsPath {
get {
return new string [] { Defines.INSTALL_DIR, "plugins" }.Combine ();
return Path.Combine (Defines.INSTALL_DIR, "plugins");
}
}
@ -47,48 +47,31 @@ namespace SparkleShare {
string autostart_path = Path.Combine (
Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "autostart");
string desktopfile_path = Path.Combine (autostart_path, "sparkleshare.desktop");
string autostart_file_path = Path.Combine (autostart_path, "org.sparkleshare.SparkleShare.Autostart.desktop");
if (!Directory.Exists (autostart_path))
if (File.Exists (autostart_file_path))
return;
if (!Directory.Exists (autostart_path))
Directory.CreateDirectory (autostart_path);
if (!File.Exists (desktopfile_path)) {
try {
File.WriteAllText (desktopfile_path,
"[Desktop Entry]\n" +
"Type=Application\n" +
"Name=SparkleShare\n" +
"Exec=sparkleshare start\n" +
"Icon=folder-sparkleshare\n" +
"Terminal=false\n" +
"X-GNOME-Autostart-enabled=true\n" +
"Categories=Network");
try {
File.WriteAllText (autostart_file_path,
"[Desktop Entry]\n" +
"Type=Application\n" +
"Name=SparkleShare\n" +
"Exec=sparkleshare\n" +
"Icon=org.sparkleshare.SparkleShare\n" +
"Terminal=false\n" +
"X-GNOME-Autostart-enabled=true\n" +
"Categories=Network");
SparkleLogger.LogInfo ("Controller", "Added SparkleShare to login items");
SparkleLogger.LogInfo ("Controller", "Added SparkleShare to login items");
} catch (Exception e) {
SparkleLogger.LogInfo ("Controller", "Failed adding SparkleShare to login items: " + e.Message);
}
}
}
// Adds the SparkleShare folder to the user's
// list of bookmarked places
public override void AddToBookmarks ()
{
string bookmarks_file_path = Path.Combine (SparkleConfig.DefaultConfig.HomePath, ".gtk-bookmarks");
string sparkleshare_bookmark = "file://" + FoldersPath + " SparkleShare";
if (File.Exists (bookmarks_file_path)) {
string bookmarks = File.ReadAllText (bookmarks_file_path);
if (!bookmarks.Contains (sparkleshare_bookmark))
File.AppendAllText (bookmarks_file_path, "file://" + FoldersPath + " SparkleShare");
} else {
File.WriteAllText (bookmarks_file_path, "file://" + FoldersPath + " SparkleShare");
} catch (Exception e) {
SparkleLogger.LogInfo ("Controller", "Failed adding SparkleShare to login items: " + e.Message);
}
}
@ -135,7 +118,23 @@ namespace SparkleShare {
}
}
public override void CopyToClipboard (string text)
{
Clipboard clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
clipboard.Text = text;
}
public override void SetFolderIcon ()
{
var process = new SparkleProcess ("gvfs-set-attribute", SparkleConfig.DefaultConfig.FoldersPath + " " +
"metadata::custom-icon-name org.sparkleshare.SparkleShare");
process.StartAndWaitForExit ();
}
public override void OpenFolder (string path)
{
OpenFile (path);
@ -151,24 +150,8 @@ namespace SparkleShare {
}
public override void CopyToClipboard (string text)
{
Clipboard clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
clipboard.Text = text;
}
public override void InstallProtocolHandler ()
{
}
public override void SetFolderIcon ()
{
var process = new SparkleProcess ("gvfs-set-attribute", SparkleConfig.DefaultConfig.FoldersPath + " " +
"metadata::custom-icon-name org.sparkleshare.SparkleShare");
process.StartAndWaitForExit ();
}
}
}

6
SparkleShare/Mac/SparkleController.cs
View file

@ -124,12 +124,6 @@ namespace SparkleShare {
}
public override void AddToBookmarks ()
{
// TODO
}
public override bool CreateSparkleShareFolder ()
{
if (!Directory.Exists (Program.Controller.FoldersPath)) {

8
SparkleShare/SparkleControllerBase.cs
View file

@ -164,10 +164,7 @@ namespace SparkleShare {
// Installs the sparkleshare:// protocol handler
public abstract void SetFolderIcon ();
// Adds the SparkleShare folder to the sidebar
public abstract void AddToBookmarks ();
// Creates the SparkleShare folder in the user's home folder
public abstract bool CreateSparkleShareFolder ();
@ -222,8 +219,7 @@ namespace SparkleShare {
InstallProtocolHandler ();
try {
if (CreateSparkleShareFolder ())
AddToBookmarks ();
CreateSparkleShareFolder ();
} catch (DirectoryNotFoundException) {
this.lost_folders_path = true;