diff --git a/DiscImageChef.Gui.XamMac/DiscImageChef.Gui.XamMac.csproj b/DiscImageChef.Gui.XamMac/DiscImageChef.Gui.XamMac.csproj index fbf86ebe9..e920239d8 100644 --- a/DiscImageChef.Gui.XamMac/DiscImageChef.Gui.XamMac.csproj +++ b/DiscImageChef.Gui.XamMac/DiscImageChef.Gui.XamMac.csproj @@ -1,104 +1,125 @@  - - Debug - AnyCPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - DiscImageChef.Gui.XamMac - DiscImageChef.Gui.XamMac - v2.0 - Xamarin.Mac - Resources - $(Version) - false - true - 4.5.99.1693 - Claunia.com - Copyright © {copyright:2011} Natalia Portillo - The Disc Image Chef - The Disc Image Chef - $(Version) - - - $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified} - true - true - - - true - portable - false - bin\Debug - DEBUG; - prompt - 4 - false - Mac Developer - false - false - false - true - true - HttpClientHandler - None - - - - false - - true - bin\Release - - prompt - 4 - false - true - false - true - true - true - SdkOnly - HttpClientHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.4.1 - - - - - - {cf61ad81-3f98-4e7b-8f00-9957a6cde5fa} - DiscImageChef.Gui - - - + + Debug + AnyCPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF} + {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + DiscImageChef.Gui.XamMac + DiscImageChef.Gui.XamMac + v2.0 + Xamarin.Mac + Resources + $(Version) + false + true + 4.5.99.1693 + Claunia.com + Copyright © {copyright:2011} Natalia Portillo + The Disc Image Chef + The Disc Image Chef + $(Version) + + + $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified} + true + true + + + true + portable + false + bin\Debug + DEBUG; + prompt + 4 + false + Mac Developer + false + false + false + true + true + HttpClientHandler + None + + + + + false + + + true + bin\Release + + + prompt + 4 + false + true + false + true + true + true + SdkOnly + HttpClientHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5.0-beta.1 + + + + + + + {ccaa7afe-c094-4d82-a66d-630de8a3f545} + DiscImageChef.Console + + + {679659b8-25d0-4279-b632-56ef8f94adc0} + DiscImageChef.Core + + + {fa0749b5-efe0-4148-9545-cd420b45bc36} + DiscImageChef.Database + + + {cf61ad81-3f98-4e7b-8f00-9957a6cde5fa} + DiscImageChef.Gui + + + {5c4c7baa-cf60-4233-84ed-39cb2312af38} + DiscImageChef.Settings + + + \ No newline at end of file diff --git a/DiscImageChef.Gui.XamMac/Program.cs b/DiscImageChef.Gui.XamMac/Program.cs index 628369428..a18c9efd5 100644 --- a/DiscImageChef.Gui.XamMac/Program.cs +++ b/DiscImageChef.Gui.XamMac/Program.cs @@ -1,4 +1,4 @@ -// /*************************************************************************** +// /*************************************************************************** // The Disc Image Chef // ---------------------------------------------------------------------------- // @@ -29,17 +29,81 @@ // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -using AppKit; +using System; +using System.Reflection; +using System.Threading.Tasks; +using DiscImageChef.Console; +using DiscImageChef.Core; +using DiscImageChef.Database; using DiscImageChef.Gui.Forms; +using Eto; using Eto.Forms; +using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Gui.XamMac +namespace DiscImageChef.Gtk { - static class MainClass - { - static void Main(string[] args) - { - new Application(Eto.Platforms.XamMac2).Run(new frmMain(false, false)); - } - } -} + class Program + { + internal static bool Verbose; + internal static bool Debug; + internal static string AssemblyCopyright; + internal static string AssemblyTitle; + internal static AssemblyInformationalVersionAttribute AssemblyVersion; + + [STAThread] + public static void Main(string[] args) + { + object[] attributes = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false); + AssemblyTitle = ((AssemblyTitleAttribute)attributes[0]).Title; + attributes = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false); + AssemblyVersion = + Attribute.GetCustomAttribute(typeof(Program).Assembly, typeof(AssemblyInformationalVersionAttribute)) as + AssemblyInformationalVersionAttribute; + AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright; + + DicConsole.WriteLineEvent += System.Console.WriteLine; + DicConsole.WriteEvent += System.Console.Write; + DicConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine; + + Settings.Settings.LoadSettings(); + + DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath); + ctx.Database.Migrate(); + ctx.SaveChanges(); + + // TODO: Update database on GUI + + DicContext mctx = DicContext.Create(Settings.Settings.MasterDbPath); + mctx.Database.Migrate(); + mctx.SaveChanges(); + + Statistics.LoadStats(); + if (Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats) + Task.Run(() => { Statistics.SubmitStats(); }); + + foreach (string arg in args) + switch (arg.ToLowerInvariant()) + { + case "-v": + case "--verbose": + Verbose = true; + break; + case "-d": + case "--debug": + Debug = true; + break; + } + + new Application(Platforms.XamMac2).Run(new frmMain(Debug, Verbose)); + + Statistics.SaveStats(); + } + + internal static void PrintCopyright() + { + DicConsole.WriteLine("{0} {1}", AssemblyTitle, AssemblyVersion?.InformationalVersion); + DicConsole.WriteLine("{0}", AssemblyCopyright); + DicConsole.WriteLine(); + } + } +} \ No newline at end of file diff --git a/DiscImageChef.XamMac.sln b/DiscImageChef.Xamarin.sln similarity index 89% rename from DiscImageChef.XamMac.sln rename to DiscImageChef.Xamarin.sln index 888ba0852..d3846d6d1 100644 --- a/DiscImageChef.XamMac.sln +++ b/DiscImageChef.Xamarin.sln @@ -1,8 +1,10 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.8 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29102.190 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Gui.XamMac", "DiscImageChef.Gui.XamMac\DiscImageChef.Gui.XamMac.csproj", "{9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef", "DiscImageChef\DiscImageChef.csproj", "{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Checksums", "DiscImageChef.Checksums\DiscImageChef.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}" @@ -29,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Filters", "Di EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Core", "DiscImageChef.Core\DiscImageChef.Core.csproj", "{679659B8-25D0-4279-B632-56EF8F94ADC0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Server", "DiscImageChef.Server\DiscImageChef.Server.csproj", "{75342D7A-C5EA-4A6F-A511-850B54310E5B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Tests", "DiscImageChef.Tests\DiscImageChef.Tests.csproj", "{B2ABC1F2-C365-4515-9F23-A5725050CC48}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Tests.Devices", "DiscImageChef.Tests.Devices\DiscImageChef.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}" @@ -41,9 +41,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Database", "D EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Gui", "DiscImageChef.Gui\DiscImageChef.Gui.csproj", "{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Gui.XamMac", "DiscImageChef.Gui.XamMac\DiscImageChef.Gui.XamMac.csproj", "{9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.EntityFramework", "DiscImageChef.EntityFramework\DiscImageChef.EntityFramework.csproj", "{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.EntityFramework", "DiscImageChef.EntityFramework\DiscImageChef.EntityFramework.csproj", "{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server", "DiscImageChef.Server\DiscImageChef.Server.csproj", "{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server.Task", "DiscImageChef.Server.Task\DiscImageChef.Server.Task.csproj", "{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Dto", "DiscImageChef.Dto\DiscImageChef.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -53,6 +57,14 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|x86.ActiveCfg = Debug|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|x86.Build.0 = Debug|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|Any CPU.Build.0 = Release|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|x86.ActiveCfg = Release|Any CPU + {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|x86.Build.0 = Release|Any CPU {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -157,14 +169,6 @@ Global {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.Build.0 = Release|Any CPU {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.ActiveCfg = Release|Any CPU {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.Build.0 = Release|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Debug|x86.ActiveCfg = Debug|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Debug|x86.Build.0 = Debug|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Release|Any CPU.Build.0 = Release|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Release|x86.ActiveCfg = Release|Any CPU - {75342D7A-C5EA-4A6F-A511-850B54310E5B}.Release|x86.Build.0 = Release|Any CPU {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -205,14 +209,6 @@ Global {CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|Any CPU.Build.0 = Release|Any CPU {CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|x86.ActiveCfg = Release|Any CPU {CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|x86.Build.0 = Release|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Debug|x86.Build.0 = Debug|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|Any CPU.Build.0 = Release|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|x86.ActiveCfg = Release|Any CPU - {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|x86.Build.0 = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -221,6 +217,30 @@ Global {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.Build.0 = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.ActiveCfg = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.Build.0 = Release|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.Build.0 = Debug|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|x86.ActiveCfg = Debug|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|x86.Build.0 = Debug|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.ActiveCfg = Release|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.Build.0 = Release|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|x86.ActiveCfg = Release|Any CPU + {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|x86.Build.0 = Release|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|x86.ActiveCfg = Debug|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|x86.Build.0 = Debug|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.Build.0 = Release|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|x86.ActiveCfg = Release|Any CPU + {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|x86.Build.0 = Release|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.Build.0 = Debug|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.Build.0 = Release|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|x86.ActiveCfg = Release|Any CPU + {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -228,6 +248,9 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A004EA3D-916D-495A-A130-D4E4F0A168C8} EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 $0.StandardHeader = $1