Merge pull request #2 from ShardTheBroken/0.2/multislot

Version 0.2.0

Author: BrokenShards

.gitignore

@@ -1,2 +1,2 @@
-*/obj
-*/bin
+*\obj
+*\bin

.vs/SCVITool/v15/.suo

@@ -51,6 +51,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Source\Constants.cs" />
     <Compile Include="Source\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>

.vs/SCVITool/v15/Server/sqlite3/storage.ide

@@ -0,0 +1,46 @@
+// Constants.cs //
+
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace SCVITool
+{
+	public static class Constants
+	{
+		public static readonly string AppDataPath = Path.Combine( Environment.GetFolderPath(
+			Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.None ), "SoulcaliburVI" );
+		public static readonly string SavedPath = Path.Combine( AppDataPath, "Saved" );
+
+		public static readonly string ExecutablePath = GetExecutablePath();
+		public static readonly string BackupPath = Path.Combine( ExecutablePath, "Backups" );
+		
+		static string GetExecutablePath()
+		{
+			string path = Path.GetDirectoryName( Assembly.GetExecutingAssembly().CodeBase );
+
+			try
+			{
+				string s5  = path.Substring( 0,  5 ).ToLower();
+				string s6  = path.Substring( 0,  6 ).ToLower();
+				string s8  = path.Substring( 0,  8 ).ToLower();
+				string s10 = path.Substring( 0, 10 ).ToLower();
+
+				if( s5 == "dir:/" || s5 == "dir:\\" )
+					path = path.Substring( 5 );
+				else if( s6 == "file:/" || s6 == "file:\\" || s6 == "path:/" || s6 == "path:\\" )
+					path = path.Substring( 6 );
+				else if( s8 == "folder:/" || s8 == "folder:\\" )
+					path = path.Substring( 8 );
+				else if( s10 == "directory:/" || s10 == "directory:\\" )
+					path = path.Substring( 10 );
+			}
+			catch( Exception e )
+			{
+				Console.WriteLine( e.Message );
+			}
+
+			return path;
+		}
+	}
+}

.vs/SCVITool/v15/Server/sqlite3/storage.ide-shm

@@ -1,7 +1,6 @@
 // MainForm.cs //
 
 using System;
-using System.IO;
 using System.Windows.Forms;
 
 namespace SCVITool
@@ -15,12 +14,20 @@ public MainForm()
 
 		private void BackupClicked( object sender, EventArgs e )
 		{
-			if( !SaveManager.Backup() )
+			int index = -1;
+
+			slotBox.Text = slotBox.Text.Trim();
+
+			if( !int.TryParse( slotBox.Text, out index ) || !SaveManager.Backup( index ) )
 				MessageBox.Show( this, SaveManager.ErrorMessage, "Backup failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation );
 		}
 		private void RestoreClicked( object sender, EventArgs e )
 		{
-			if( !SaveManager.Restore() )
+			int index = -1;
+
+			slotBox.Text = slotBox.Text.Trim();
+
+			if( !int.TryParse( slotBox.Text, out index ) || !SaveManager.Restore( index ) )
 				MessageBox.Show( this, SaveManager.ErrorMessage, "Restore failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation );
 		}
 	}

.vs/SCVITool/v15/Server/sqlite3/storage.ide-wal

@@ -11,8 +11,8 @@ static class Program
 		static class Version
 		{
 			public const uint Major = 0;
-			public const uint Minor = 1;
-			public const uint Patch = 1;
+			public const uint Minor = 2;
+			public const uint Patch = 0;
 
 			public new static string ToString()
 			{
@@ -29,7 +29,9 @@ static class Version
 		}
 
 		static readonly string About = "SCVITool Version " + Version.ToString();
-		const string Help = "`SCVITool.exe [arg]`\n`-b` or `-backup` to perform a backup.\n`-r` or `-restore` to reastore the backup.";
+		const string Help = "`SCVITool.exe [arg] [index]`\n" +
+		                    "`-b` or `-backup` to perform a backup. The next available slot will be used if an index is not provided.\n" + 
+		                    "`-r` or `-restore` to restore the backup. A slot index must be provided or this will fail.";
 
 		[STAThread]
 		static int Main( string[] args )
@@ -38,17 +40,30 @@ static int Main( string[] args )
 			{
 				Console.WriteLine( About );
 
-				if( args.Length > 1 )
+				if( args.Length > 2 )
 				{
 					Console.WriteLine( Help );
 					return -1;
 				}
 
 				string arg = args[ 0 ].ToLower();
 
+				int index = -1;
+
+				if( args.Length > 1 )
+				{
+					if( !int.TryParse( args[ 1 ], out index ) )
+					{
+						Console.Write( "Unable to parse \"" );
+						Console.Write( args[ 1 ] );
+						Console.WriteLine( "\" as an integer." );
+						return -3;
+					}
+				}
+
 				if( arg == "-b" || arg == "-backup" )
 				{
-					if( !SaveManager.Backup() )
+					if( !SaveManager.Backup( index ) )
 					{
 						Console.Write( "Backup failed: " );
 						Console.WriteLine( SaveManager.ErrorMessage );
@@ -57,7 +72,7 @@ static int Main( string[] args )
 				}
 				else if( arg == "-r" || arg == "-restore" )
 				{
-					if( !SaveManager.Restore() )
+					if( !SaveManager.Restore( index ) )
 					{
 						Console.Write( "Restoration failed: " );
 						Console.WriteLine( SaveManager.ErrorMessage );

SCVITool.csproj

@@ -7,19 +7,14 @@ namespace SCVITool
 {
 	public static class SaveManager
 	{
-		static readonly string SavePath = Path.Combine( Environment.GetFolderPath( 
-			Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.None ), "SoulcaliburVI" );
-		static readonly string SavedPath  = Path.Combine( SavePath, "Saved" );
-		static readonly string BackupPath = Path.Combine( SavePath, "Saved_Backup" );
-
 		public static string ErrorMessage
 		{
 			get; private set;
 		} = string.Empty;
 
-		public static bool Backup()
+		public static bool Backup( int index = -1 )
 		{
-			if( !Directory.Exists( SavedPath ) )
+			if( !Directory.Exists( Constants.SavedPath ) )
 			{
 				ErrorMessage = "Unable to find save data to backup.";
 				return false;
@@ -30,12 +25,42 @@ public static bool Backup()
 
 			try
 			{
-				savedinfo = new DirectoryInfo( SavedPath );
+				savedinfo = new DirectoryInfo( Constants.SavedPath );
+
+				if( index < 0 )
+				{
+					string[] files = Directory.GetDirectories( Constants.BackupPath );
+
+					for( int i = 0; i < int.MaxValue && index < 0; i++ )
+					{
+						string name = "save";
+
+						if( i < 10 )
+							name += '0';
+
+						name += i.ToString();
+
+						foreach( string f in files )
+							if( f.ToLower() != name )
+								index = i;
+
+						if( i == int.MaxValue )
+							throw new InvalidOperationException( "The maximum amount of save slots has been reached." );
+					}
+				}
+
+				string bpath = "save";
+				{
+					if( index < 10 )
+						bpath += '0';
+
+					bpath += index.ToString();
+				}
 
-				if( Directory.Exists( BackupPath ) )
-					Directory.Delete( BackupPath, true );
+				if( Directory.Exists( bpath ) )
+					Directory.Delete( bpath, true );
 
-				backupinfo = Directory.CreateDirectory( BackupPath );
+				backupinfo = Directory.CreateDirectory( bpath );
 			}
 			catch( Exception ex )
 			{
@@ -55,9 +80,23 @@ public static bool Backup()
 
 			return true;
 		}
-		public static bool Restore()
+		public static bool Restore( int index )
 		{
-			if( !Directory.Exists( BackupPath ) )
+			if( index < 0 )
+			{
+				ErrorMessage = "Cannot restore from an invalid save slot index.";
+				return false;
+			}
+
+			string bpath = "save";
+			{
+				if( index < 10 )
+					bpath += '0';
+
+				bpath += index.ToString();
+			}
+
+			if( !Directory.Exists( bpath ) )
 			{
 				ErrorMessage = "No backup save data to restore.";
 				return false;
@@ -68,12 +107,12 @@ public static bool Restore()
 
 			try
 			{
-				backupinfo = new DirectoryInfo( BackupPath );
+				backupinfo = new DirectoryInfo( bpath );
 
-				if( Directory.Exists( SavedPath ) )
-					Directory.Delete( SavedPath, true );
+				if( Directory.Exists( Constants.SavedPath ) )
+					Directory.Delete( Constants.SavedPath, true );
 
-				savedinfo = new DirectoryInfo( SavedPath );
+				savedinfo = new DirectoryInfo( Constants.SavedPath );
 
 				CopyFilesRecursively( backupinfo, savedinfo );
 			}

Source/Constants.cs

@@ -10,11 +10,24 @@ Backing up will will check if the `Saved` folder exists, and if so create a copy
 Restoring will check if the `Saved_Backup` folder exists, and if so, it will delete the `Saved` folder and replace it with the contents of `Saved_Backup`.<br>
 
 ### GUI
-The GUI application provides buttons to backup and restore. That's it.
+The GUI application provides an option to set a backup slot and has buttons to backup and restore. That's it.
 
 ### Console Arguments
-`-b` or `-backup` to perform a backup.<br>
-`-r` or `-restore` to restore the backup.<br>
+`-b [index]` or `-backup [index]` to perform a backup. If the index is ommitted, the next available index will be used.<br>
+`-r [index]` or `-restore [index]` to restore the backup. This will fail if a valid index is not provided.<br>
 
 ## TODO
-- Implement multiple backup "slots" that can be managed in both GUI and console.
+- Maybe look into how custom characters are stored and implement some way of backing them up individually if possible.
+
+## Changelog
+
+### Version 0.2.0
+- Now backups are stored alongside SCVITool.
+- Multiple backup slots are now supported and can be managed in both the GUI and console.
+
+### Version 0.1.1
+- Implemented console functionality and refactored the project.
+
+### Version 0.1.0
+- Initial release.
+