checking for alternating paths on DS_Remastered, fixes #4

Author: lucidlemon

AutoUpdater.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>2.0.0.0</version>
-    <url>https://github.com/lucidlemon/PraiseTheSave/releases/download/1.2.0/PraiseTheSave.exe</url>
+    <version>2.0.1.0</version>
+    <url>https://github.com/lucidlemon/PraiseTheSave/releases/download/2.0.1/PraiseTheSave.exe</url>
     <changelog>https://github.com/lucidlemon/PraiseTheSave/releases</changelog>
     <mandatory>false</mandatory>
 </item>

PraiseTheSave/MainScreen.cs

@@ -118,27 +118,31 @@ public MainScreen()
 
             InitializeComponent();
 
+            string DS1_Path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\NBGI\DarkSouls";
+            string DSR_Path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\NBGI\DARK SOULS REMASTERED";
+
+            if(!Directory.Exists(DSR_Path))
+            {
+                DSR_Path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\FromSoftware\DARK SOULS REMASTERED";
+            }
+
             games = new Dictionary<string, Game>
             {
                 {
                     "DS1",
-                    new Game(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\NBGI\DarkSouls",
-                DefSettings.dirDS1, Resource1.initialsDs1, ds1_found_folder, ds1_last_change_label)
+                    new Game(DS1_Path, DefSettings.dirDS1, Resource1.initialsDs1, ds1_found_folder, ds1_last_change_label)
                 },
                 {
                     "DS2",
-                    new Game(@"%AppData%\DarkSoulsII", DefSettings.dirDS2, Resource1.initialsDs2,
-                ds2_found_folder, ds2_last_change_label)
+                    new Game(@"%AppData%\DarkSoulsII", DefSettings.dirDS2, Resource1.initialsDs2, ds2_found_folder, ds2_last_change_label)
                 },
                 {
                     "DS3",
-                    new Game(@"%AppData%\DarkSoulsIII", DefSettings.dirDS3, Resource1.initialsDs3,
-                ds3_found_folder, ds3_last_change_label)
+                    new Game(@"%AppData%\DarkSoulsIII", DefSettings.dirDS3, Resource1.initialsDs3, ds3_found_folder, ds3_last_change_label)
                 },
                 {
                     "DSR",
-                    new Game(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\NBGI\DARK SOULS REMASTERED",
-                DefSettings.dirDSR, Resource1.initialsDsr, ds1R_found_folder, ds1R_last_change_label)
+                    new Game(DSR_Path, DefSettings.dirDSR, Resource1.initialsDsr, ds1R_found_folder, ds1R_last_change_label)
                 }
             };
 
@@ -220,7 +224,7 @@ public void RefreshInfo()
             {
                 backupFolderSizeLabel.Text = Resource1.msgBackupFolderDNE;
             }
-            
+
 
             saveAmountInput.Value = DefSettings.SaveAmount;
             saveIntervalInput.Value = DefSettings.SaveInterval;
@@ -270,13 +274,13 @@ private void ChooseDirectory(object sender, EventArgs e)
 
         private void SaveAmountInput_ValueChanged(object sender, EventArgs e)
         {
-            DefSettings.SaveAmount = (int) saveAmountInput.Value;
+            DefSettings.SaveAmount = (int)saveAmountInput.Value;
             DefSettings.Save();
         }
 
         private void NumericUpDown1_ValueChanged(object sender, EventArgs e)
         {
-            DefSettings.SaveInterval = (int) saveIntervalInput.Value;
+            DefSettings.SaveInterval = (int)saveIntervalInput.Value;
             DefSettings.Save();
 
             backupTimer.Interval = (DefSettings.SaveInterval * 60 * 1000);

PraiseTheSave/PraiseTheSave.csproj

@@ -25,11 +25,13 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>https://github.com/lucidlemon/PraiseTheSave/</InstallUrl>
+    <InstallUrl>https://github.com/lucidlemon/PraiseTheSave/Releases/</InstallUrl>
+    <ProductName>Praise The Save</ProductName>
+    <PublisherName>Daniel Winter</PublisherName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.2.0.%2a</ApplicationVersion>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>2.1.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -75,6 +77,12 @@
   <PropertyGroup>
     <ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>PraiseTheKey.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="AutoUpdater.NET, Version=1.4.10.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
       <HintPath>..\packages\Autoupdater.NET.Official.1.4.10\lib\net452\AutoUpdater.NET.dll</HintPath>
@@ -128,6 +136,7 @@
       <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="packages.config" />
+    <None Include="PraiseTheKey.pfx" />
     <None Include="PraiseTheSave_1_TemporaryKey.pfx" />
     <None Include="PraiseTheSave_TemporaryKey.pfx" />
     <None Include="Properties\Settings.settings">

PraiseTheSave/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("PraiseTheSave")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Backup Tool for Dark Souls Games")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PraiseTheSave")]
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("2.0.1.*")]
+[assembly: AssemblyFileVersion("2.0.1.*")]
 [assembly: NeutralResourcesLanguage("en-US")]