Merge branch 'master' into dev

OliBomby · Dec 21, 2022 · bb00f49 · bb00f49
2 parents 18465df + 31548a0
commit bb00f49
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/Mapping_Tools/Mapping_Tools.csproj b/Mapping_Tools/Mapping_Tools.csproj
@@ -69,7 +69,7 @@
  <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
  <PackageReference Include="NAudio" Version="2.0.0" />
  <PackageReference Include="NAudio.Vorbis" Version="1.3.1" />
- <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
  <PackageReference Include="NVorbis" Version="0.10.3" />
  <PackageReference Include="OggVorbisEncoder" Version="1.2.0" />
  <PackageReference Include="Onova" Version="2.6.2" />

diff --git a/Mapping_Tools/Viewmodels/HitsoundCopierVM.cs b/Mapping_Tools/Viewmodels/HitsoundCopierVM.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using System.Text.Json.Serialization;
 using Mapping_Tools.Classes;
 using Mapping_Tools.Classes.BeatmapHelper;
@@ -233,7 +234,9 @@ public HitsoundCopierVm() {
 
  ExportBrowseCommand = new CommandImplementation(
  _ => {
- string[] paths = IOHelper.BeatmapFileDialog(true, !SettingsManager.Settings.CurrentBeatmapDefaultFolder);
+ string pathFromDirectory = Directory.GetParent(PathFrom).FullName;
+
+ string[] paths = IOHelper.BeatmapFileDialog(pathFromDirectory, true);
  if (paths.Length != 0) {
  PathTo = string.Join("|", paths);
  }

diff --git a/Mapping_Tools/Viewmodels/MetadataManagerVM.cs b/Mapping_Tools/Viewmodels/MetadataManagerVM.cs
@@ -2,6 +2,7 @@
 using Mapping_Tools.Classes.SystemTools;
 using Mapping_Tools.Components.Domain;
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -84,7 +85,9 @@ public MetadataManagerVm() {
 
  ExportBrowseCommand = new CommandImplementation(
  _ => {
- var paths = IOHelper.BeatmapFileDialog(true, !SettingsManager.Settings.CurrentBeatmapDefaultFolder);
+ string importPathDirectory = Directory.GetParent(ImportPath).FullName;
+
+ var paths = IOHelper.BeatmapFileDialog(importPathDirectory, true);
  if( paths.Length != 0 ) {
  ExportPath = string.Join("|", paths);
  }

diff --git a/Mapping_Tools/Viewmodels/TimingCopierVM.cs b/Mapping_Tools/Viewmodels/TimingCopierVM.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using Mapping_Tools.Classes.SystemTools;
 using Mapping_Tools.Components.Domain;
 using System.ComponentModel;
@@ -56,8 +57,10 @@ public TimingCopierVm() {
 
  ExportBrowseCommand = new CommandImplementation(
  _ => {
- string[] paths = IOHelper.BeatmapFileDialog(true, !SettingsManager.Settings.CurrentBeatmapDefaultFolder);
- if( paths.Length != 0 ) {
+ string importPathDirectory = Directory.GetParent(ImportPath).FullName;
+ 
+ string[] paths = IOHelper.BeatmapFileDialog(importPathDirectory, true);
+ if ( paths.Length != 0 ) {
  ExportPath = string.Join("|", paths);
  }
  });

diff --git a/Mapping_Tools_Tests/Mapping_Tools_Tests.csproj b/Mapping_Tools_Tests/Mapping_Tools_Tests.csproj
@@ -29,6 +29,6 @@
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
  <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
  <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
- <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
  </ItemGroup>
 </Project>