From 1a8e7925c46ceea89cb979479e54592bd7a44819 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 2 May 2011 18:30:34 +0100 Subject: [PATCH] main method: fix coding style and whitespace --- SparkleShare/SparkleShare.cs | 319 +++++++++++++++-------------------- 1 file changed, 138 insertions(+), 181 deletions(-) diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs index b986ce44..7c3fac75 100644 --- a/SparkleShare/SparkleShare.cs +++ b/SparkleShare/SparkleShare.cs @@ -14,216 +14,173 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -using Mono.Unix; -using Mono.Unix.Native; + using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -using SparkleLib; -using SparkleLib.Options; using System.Text; +using Mono.Unix; +using Mono.Unix.Native; +using SparkleLib; +using SparkleLib.Options; namespace SparkleShare { - // This is SparkleShare! - public class SparkleShare { + // This is SparkleShare! + public class SparkleShare { - public static SparkleController Controller; - public static SparkleUI UI; + public static SparkleController Controller; + public static SparkleUI UI; - // Short alias for the translations - public static string _ (string s) - { - return Catalog.GetString (s); - } - + // Short alias for the translations + public static string _ (string s) + { + return Catalog.GetString (s); + } + - public static void Main (string [] args) - { - - // Use translations - Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); + public static void Main (string [] args) + { + // Use translations + Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); - - // Don't allow running as root - if (new UnixUserInfo (UnixEnvironment.UserName).UserId == 0) { + // Don't allow running as root + if (new UnixUserInfo (UnixEnvironment.UserName).UserId == 0) { + Console.WriteLine (_("Sorry, you can't run SparkleShare with these permissions.")); + Console.WriteLine (_("Things would go utterly wrong.")); + Environment.Exit (0); + } - Console.WriteLine (_("Sorry, you can't run SparkleShare with these permissions.")); - Console.WriteLine (_("Things would go utterly wrong.")); + // Parse the command line options + bool hide_ui = false; + bool show_help = false; - Environment.Exit (0); + var p = new OptionSet () { + { "d|disable-gui", _("Don't show the notification icon"), v => hide_ui = v != null }, + { "v|version", _("Print version information"), v => { PrintVersion (); } }, + { "h|help", _("Show this help text"), v => show_help = v != null } + }; - } + try { + p.Parse (args); + } catch (OptionException e) { + Console.Write ("SparkleShare: "); + Console.WriteLine (e.Message); + Console.WriteLine ("Try `sparkleshare --help' for more information."); + } - - // Parse the command line options - bool hide_ui = false; - bool show_help = false; + if (show_help) + ShowHelp (p); - var p = new OptionSet () { - { "d|disable-gui", _("Don't show the notification icon"), v => hide_ui = v != null }, - { "v|version", _("Print version information"), v => { PrintVersion (); } }, - { "h|help", _("Show this help text"), v => show_help = v != null } - }; + // Load the right controller for the OS + string controller_name; + switch (SparkleShare.Platform) { + case PlatformID.Unix: + SetProcessName ("sparkleshare"); + controller_name = "Lin"; + break; + case PlatformID.MacOSX: + controller_name = "Mac"; + break; + case PlatformID.Win32NT: + controller_name = "Win"; + break; + default: + controller_name = "Lin"; + break; + } - try { - - p.Parse (args); - - } catch (OptionException e) { - - Console.Write ("SparkleShare: "); - Console.WriteLine (e.Message); - Console.WriteLine ("Try `sparkleshare --help' for more information."); - - } - - if (show_help) - ShowHelp (p); - - - // Load the right controller for the OS - string controller_name; - switch (SparkleShare.Platform) { - - case PlatformID.Unix: - SetProcessName ("sparkleshare"); - controller_name = "Lin"; - break; - - case PlatformID.MacOSX: - controller_name = "Mac"; - break; - - case PlatformID.Win32NT: - controller_name = "Win"; - break; - - default: - controller_name = "Lin"; - break; - - } + // Initialize the controller this way so that + // there aren't any exceptions in the OS specific UI's + Controller = (SparkleController) Activator.CreateInstance ( + Type.GetType ("SparkleShare.Sparkle" + controller_name + "Controller")); + + if (Controller != null && !hide_ui) { + UI = new SparkleUI (); + UI.Run (); + } + } - // Initialize the controller this way so that - // there aren't any exceptions in the OS specific UI's - Controller = (SparkleController) Activator.CreateInstance ( - Type.GetType ("SparkleShare.Sparkle" + controller_name + "Controller")); - - if (Controller != null && !hide_ui) { + // Prints the help output + public static void ShowHelp (OptionSet option_set) + { + Console.WriteLine (" "); + Console.WriteLine (_("SparkleShare, an instant update workflow to Git.")); + Console.WriteLine (_("Copyright (C) 2010 Hylke Bons")); + Console.WriteLine (" "); + Console.WriteLine (_("This program comes with ABSOLUTELY NO WARRANTY.")); + Console.WriteLine (" "); + Console.WriteLine (_("This is free software, and you are welcome to redistribute it ")); + Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details.")); + Console.WriteLine (" "); + Console.WriteLine (_("SparkleShare automatically syncs Git repositories in ")); + Console.WriteLine (_("the ~/SparkleShare folder with their remote origins.")); + Console.WriteLine (" "); + Console.WriteLine (_("Usage: sparkleshare [start|stop|restart] [OPTION]...")); + Console.WriteLine (_("Sync SparkleShare folder with remote repositories.")); + Console.WriteLine (" "); + Console.WriteLine (_("Arguments:")); - UI = new SparkleUI (); - UI.Run (); - - } - - } + option_set.WriteOptionDescriptions (Console.Out); + Environment.Exit (0); + } - // Prints the help output - public static void ShowHelp (OptionSet option_set) - { - - Console.WriteLine (" "); - Console.WriteLine (_("SparkleShare, an instant update workflow to Git.")); - Console.WriteLine (_("Copyright (C) 2010 Hylke Bons")); - Console.WriteLine (" "); - Console.WriteLine (_("This program comes with ABSOLUTELY NO WARRANTY.")); - Console.WriteLine (" "); - Console.WriteLine (_("This is free software, and you are welcome to redistribute it ")); - Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details.")); - Console.WriteLine (" "); - Console.WriteLine (_("SparkleShare automatically syncs Git repositories in ")); - Console.WriteLine (_("the ~/SparkleShare folder with their remote origins.")); - Console.WriteLine (" "); - Console.WriteLine (_("Usage: sparkleshare [start|stop|restart] [OPTION]...")); - Console.WriteLine (_("Sync SparkleShare folder with remote repositories.")); - Console.WriteLine (" "); - Console.WriteLine (_("Arguments:")); - - option_set.WriteOptionDescriptions (Console.Out); - Environment.Exit (0); - - } + // Prints the version information + public static void PrintVersion () + { + Console.WriteLine (_("SparkleShare " + Defines.VERSION)); + Environment.Exit (0); + } - // Prints the version information - public static void PrintVersion () - { - - Console.WriteLine (_("SparkleShare " + Defines.VERSION)); - Environment.Exit (0); - - } + // Strange magic needed by SetProcessName () + [DllImport ("libc")] + private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); + + + // Sets the Unix process name to 'sparkleshare' instead of 'mono' + private static void SetProcessName (string name) + { + try { + if (prctl (15, Encoding.ASCII.GetBytes (name + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero) != 0) { + throw new ApplicationException ("Error setting process name: " + + Mono.Unix.Native.Stdlib.GetLastError ()); + } + } catch (EntryPointNotFoundException) { + Console.WriteLine ("SetProcessName: Entry point not found"); + } + } + + + // Strange magic needed by Platform () + [DllImport ("libc")] + static extern int uname (IntPtr buf); - // Strange magic needed by SetProcessName () - [DllImport ("libc")] - private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); - - - // Sets the Unix process name to 'sparkleshare' instead of 'mono' - private static void SetProcessName (string name) - { + // This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform, + // which is intentionally broken in Mono for hystorical reasons + static PlatformID Platform { + get { + IntPtr buf = IntPtr.Zero; + try { + buf = Marshal.AllocHGlobal (8192); - try { - - if (prctl (15, Encoding.ASCII.GetBytes (name + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero) != 0) { - - throw new ApplicationException ("Error setting process name: " + - Mono.Unix.Native.Stdlib.GetLastError ()); - - } - - } catch (EntryPointNotFoundException) { - - Console.WriteLine ("SetProcessName: Entry point not found"); - - } - - } - - - // Strange magic needed by Platform () - [DllImport ("libc")] - static extern int uname (IntPtr buf); - - - // This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform, - // which is intentionally broken in Mono for hystorical reasons - 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; - - } - - } - - } - + if (uname (buf) == 0 && Marshal.PtrToStringAnsi (buf) == "Darwin") + return PlatformID.MacOSX; + } catch { + } finally { + if (buf != IntPtr.Zero) + Marshal.FreeHGlobal (buf); + } + + return Environment.OSVersion.Platform; + } + } + } }