diff --git a/.gitignore b/.gitignore index 375552a..1710d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -334,4 +334,4 @@ ASALocalRun/ .localhistory/ # Version -/AmaiSosu/Resources/Version.txt +/AmaiSosu.GUI/Resources/Version.txt diff --git a/AmaiSosu/AmaiSosu.csproj b/AmaiSosu.GUI/AmaiSosu.GUI.csproj similarity index 98% rename from AmaiSosu/AmaiSosu.csproj rename to AmaiSosu.GUI/AmaiSosu.GUI.csproj index acab53b..28f8d78 100644 --- a/AmaiSosu/AmaiSosu.csproj +++ b/AmaiSosu.GUI/AmaiSosu.GUI.csproj @@ -6,8 +6,8 @@ AnyCPU {4AB5A870-7A84-4206-994B-EAB91473CD6C} WinExe - AmaiSosu - AmaiSosu + AmaiSosu.GUI + AmaiSosu.GUI v4.5 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/AmaiSosu/App.config b/AmaiSosu.GUI/App.config similarity index 100% rename from AmaiSosu/App.config rename to AmaiSosu.GUI/App.config diff --git a/AmaiSosu/App.xaml b/AmaiSosu.GUI/App.xaml similarity index 85% rename from AmaiSosu/App.xaml rename to AmaiSosu.GUI/App.xaml index 8081685..457f5d4 100644 --- a/AmaiSosu/App.xaml +++ b/AmaiSosu.GUI/App.xaml @@ -1,4 +1,4 @@ - diff --git a/AmaiSosu/App.xaml.cs b/AmaiSosu.GUI/App.xaml.cs similarity index 82% rename from AmaiSosu/App.xaml.cs rename to AmaiSosu.GUI/App.xaml.cs index c3d0bf0..7171ecb 100644 --- a/AmaiSosu/App.xaml.cs +++ b/AmaiSosu.GUI/App.xaml.cs @@ -1,4 +1,4 @@ -namespace AmaiSosu +namespace AmaiSosu.GUI { /// /// Interaction logic for App.xaml diff --git a/AmaiSosu/IO/Copy.cs b/AmaiSosu.GUI/IO/Copy.cs similarity index 97% rename from AmaiSosu/IO/Copy.cs rename to AmaiSosu.GUI/IO/Copy.cs index 2d17305..6697fff 100644 --- a/AmaiSosu/IO/Copy.cs +++ b/AmaiSosu.GUI/IO/Copy.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace AmaiSosu.IO +namespace AmaiSosu.GUI.IO { /// /// Copy a directory and its contents. Adapted from the MSDN CopyAll method. diff --git a/AmaiSosu/IO/Move.cs b/AmaiSosu.GUI/IO/Move.cs similarity index 98% rename from AmaiSosu/IO/Move.cs rename to AmaiSosu.GUI/IO/Move.cs index d603715..f752616 100644 --- a/AmaiSosu/IO/Move.cs +++ b/AmaiSosu.GUI/IO/Move.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace AmaiSosu.IO +namespace AmaiSosu.GUI.IO { /// /// Abstract representing a type that conducts data migration. diff --git a/AmaiSosu/IO/MoveDirectory.cs b/AmaiSosu.GUI/IO/MoveDirectory.cs similarity index 96% rename from AmaiSosu/IO/MoveDirectory.cs rename to AmaiSosu.GUI/IO/MoveDirectory.cs index caca19d..52689c2 100644 --- a/AmaiSosu/IO/MoveDirectory.cs +++ b/AmaiSosu.GUI/IO/MoveDirectory.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace AmaiSosu.IO +namespace AmaiSosu.GUI.IO { /// public class MoveDirectory : Move diff --git a/AmaiSosu/IO/MoveFactory.cs b/AmaiSosu.GUI/IO/MoveFactory.cs similarity index 99% rename from AmaiSosu/IO/MoveFactory.cs rename to AmaiSosu.GUI/IO/MoveFactory.cs index 71d06e4..001c685 100644 --- a/AmaiSosu/IO/MoveFactory.cs +++ b/AmaiSosu.GUI/IO/MoveFactory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace AmaiSosu.IO +namespace AmaiSosu.GUI.IO { /// /// Returns Move instances built using the inbound arguments. This factory is designed for backing up or diff --git a/AmaiSosu/IO/MoveFile.cs b/AmaiSosu.GUI/IO/MoveFile.cs similarity index 96% rename from AmaiSosu/IO/MoveFile.cs rename to AmaiSosu.GUI/IO/MoveFile.cs index cf0c32b..a66e48a 100644 --- a/AmaiSosu/IO/MoveFile.cs +++ b/AmaiSosu.GUI/IO/MoveFile.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace AmaiSosu.IO +namespace AmaiSosu.GUI.IO { /// public class MoveFile : Move diff --git a/AmaiSosu/Main.cs b/AmaiSosu.GUI/Main.cs similarity index 87% rename from AmaiSosu/Main.cs rename to AmaiSosu.GUI/Main.cs index 98a7cad..b68272a 100644 --- a/AmaiSosu/Main.cs +++ b/AmaiSosu.GUI/Main.cs @@ -5,13 +5,12 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using AmaiSosu.IO; -using AmaiSosu.Properties; +using AmaiSosu.GUI.IO; +using AmaiSosu.GUI.Properties; +using AmaiSosu.GUI.Resources; using Atarashii.API; -using static AmaiSosu.Resources.FileNames; -using static AmaiSosu.Resources.Messages; -namespace AmaiSosu +namespace AmaiSosu.GUI { /// /// Main AmaiSosu model. @@ -26,7 +25,7 @@ public sealed class Main : INotifyPropertyChanged /// /// Current state of the OpenSauce installation. /// - private string _installState = BrowseHce; + private string _installState = Messages.BrowseHce; /// /// Installation path. @@ -42,7 +41,7 @@ public string Version get { using (var stream = Assembly.GetExecutingAssembly() - .GetManifestResourceStream(AmaiSosuVersion)) + .GetManifestResourceStream(FileNames.AmaiSosuVersion)) using (var reader = new StreamReader(stream ?? throw new FileNotFoundException())) { return reader.ReadToEnd().Trim(); @@ -107,7 +106,7 @@ public void Initialise() } catch (Exception) { - InstallText = BrowseHce; + InstallText = Messages.BrowseHce; } } @@ -118,13 +117,13 @@ public void Install() { try { - var backupDir = System.IO.Path.Combine(_path, AmaiSosuBackup + '.' + Guid.NewGuid()); + var backupDir = System.IO.Path.Combine(_path, FileNames.AmaiSosuBackup + '.' + Guid.NewGuid()); CommitBackups(backupDir); OpenSauce.Install(Path); FinishInstall(backupDir); - InstallText = InstallSuccess; + InstallText = Messages.InstallSuccess; } catch (Exception e) { @@ -164,9 +163,9 @@ private void FinishInstall(string backupDir) var source = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), - OpenSauceDeveloper, OpenSauceDirectory, OpenSauceIDE); + FileNames.OpenSauceDeveloper, FileNames.OpenSauceDirectory, FileNames.OpenSauceIDE); - var target = System.IO.Path.Combine(Path, OpenSauceIDE); + var target = System.IO.Path.Combine(Path, FileNames.OpenSauceIDE); Copy.All(new DirectoryInfo(source), new DirectoryInfo(target)); Directory.Delete(source, true); @@ -180,10 +179,10 @@ private void FinishInstall(string backupDir) /// private void OnPathChanged() { - CanInstall = Directory.Exists(Path) && File.Exists(System.IO.Path.Combine(Path, HceExecutable)); + CanInstall = Directory.Exists(Path) && File.Exists(System.IO.Path.Combine(Path, FileNames.HceExecutable)); InstallText = CanInstall - ? InstallReady - : BrowseHce; + ? Messages.InstallReady + : Messages.BrowseHce; } [NotifyPropertyChangedInvocator] diff --git a/AmaiSosu/MainWindow.xaml b/AmaiSosu.GUI/MainWindow.xaml similarity index 97% rename from AmaiSosu/MainWindow.xaml rename to AmaiSosu.GUI/MainWindow.xaml index a9e06ae..9e15ef1 100644 --- a/AmaiSosu/MainWindow.xaml +++ b/AmaiSosu.GUI/MainWindow.xaml @@ -1,9 +1,10 @@ - - +