Merge pull request #86 from FlaminSarge/folders

Use modernized folder selection dialog for selecting non-xbox location
Fr33dan · May 8, 2024 · 98f8a4d · 98f8a4d
2 parents d5090d3 + 0751338
commit 98f8a4d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/GPSaveConverter/GPSaveConverter.csproj b/GPSaveConverter/GPSaveConverter.csproj
@@ -202,6 +202,9 @@
     <PackageReference Include="NLog.Windows.Forms">
       <Version>4.6.0</Version>
     </PackageReference>
+    <PackageReference Include="Ookii.Dialogs.WinForms">
+      <Version>4.0.0</Version>
+    </PackageReference>
     <PackageReference Include="System.AppContext">
       <Version>4.3.0</Version>
     </PackageReference>

diff --git a/GPSaveConverter/Library/PCGameWiki.cs b/GPSaveConverter/Library/PCGameWiki.cs
@@ -35,6 +35,10 @@ public static async Task FetchSaveLocation(GameInfo i)
                     {
                         return;
                     }
+                    if (queryRoot["query"]["pages"][0]["missing"] != null && queryRoot["query"]["pages"][0]["missing"].AsValue().GetValue<bool>())
+                    {
+                        return;
+                    }
                     int pageID = queryRoot["query"]["pages"][0]["pageid"].AsValue().GetValue<int>();
 
 
@@ -54,6 +58,10 @@ public static async Task FetchSaveLocation(GameInfo i)
                             sectionIndex = n["index"].GetValue<string>();
                         }
                     }
+                    if (sectionIndex == null || sectionIndex == "-1")
+                    {
+                        return;
+                    }
 
                     url = String.Format(@"https://www.pcgamingwiki.com/w/api.php?action=parse&pageid={0}&formatversion=2&format=json&prop=wikitext&section={1}", pageID, sectionIndex);
                     string saveFileSectionJson = await wc.DownloadStringTaskAsync(url);

diff --git a/GPSaveConverter/SaveFileConverterForm.cs b/GPSaveConverter/SaveFileConverterForm.cs
@@ -9,6 +9,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Ookii.Dialogs.WinForms;
 
 namespace GPSaveConverter
 {
@@ -56,7 +57,11 @@ private async Task<bool> promptForNonXboxSaveLocation(string reason)
             }
             if (res == DialogResult.OK)
             {
-                FolderBrowserDialog dialog = new FolderBrowserDialog();
+                VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog();
+                if (ActiveGame.BaseNonXboxSaveLocation != null && ActiveGame.BaseNonXboxSaveLocation != string.Empty)
+                {
+                    dialog.SelectedPath = ActiveGame.BaseNonXboxSaveLocation;
+                }
                 res = dialog.ShowDialog();
                 if (res == DialogResult.OK)
                 {