Fixed bug that would cause crash for interestingly formatted folders

40163650 · Aug 20, 2023 · cba7cbf · cba7cbf
1 parent 71010e5
commit cba7cbf
Show file tree

Hide file tree

Showing 35 changed files with 9 additions and 8 deletions.
diff --git a/.vs/ProjectEvaluation/songanalyser.metadata.v2 b/.vs/ProjectEvaluation/songanalyser.metadata.v2
diff --git a/.vs/ProjectEvaluation/songanalyser.metadata.v7.bin b/.vs/ProjectEvaluation/songanalyser.metadata.v7.bin
diff --git a/.vs/ProjectEvaluation/songanalyser.projects.v2 b/.vs/ProjectEvaluation/songanalyser.projects.v2
diff --git a/.vs/ProjectEvaluation/songanalyser.projects.v7.bin b/.vs/ProjectEvaluation/songanalyser.projects.v7.bin
diff --git a/.vs/SongAnalyser/DesignTimeBuild/.dtbcache.v2 b/.vs/SongAnalyser/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/SongAnalyser/FileContentIndex/3b562894-524e-4ced-91fe-d3d621faf8aa.vsidx b/.vs/SongAnalyser/FileContentIndex/3b562894-524e-4ced-91fe-d3d621faf8aa.vsidx
diff --git a/.vs/SongAnalyser/FileContentIndex/fa533ab1-a9bb-4d5f-b21d-95b54e9813b4.vsidx b/.vs/SongAnalyser/FileContentIndex/fa533ab1-a9bb-4d5f-b21d-95b54e9813b4.vsidx
diff --git a/.vs/SongAnalyser/FileContentIndex/read.lock b/.vs/SongAnalyser/FileContentIndex/read.lock
diff --git a/.vs/SongAnalyser/v17/.futdcache.v2 b/.vs/SongAnalyser/v17/.futdcache.v2
diff --git a/.vs/SongAnalyser/v17/.suo b/.vs/SongAnalyser/v17/.suo
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2023-08-03T23:13:56.5164331Z;True|2023-02-26T02:20:41.4518513+00:00;True|2023-02-26T02:08:54.4115132+00:00;True|2023-02-26T01:45:56.3187653+00:00;False|2023-02-26T01:45:47.6956226+00:00;True|2023-02-26T01:41:45.5062380+00:00;True|2023-02-26T01:39:30.6417546+00:00;True|2023-02-26T01:35:07.6457339+00:00;True|2022-06-28T11:48:15.1521704+01:00;True|2022-05-28T23:25:28.5880553+01:00;True|2022-05-20T15:39:16.7593643+01:00;True|2022-05-19T11:51:33.2028250+01:00;True|2022-05-18T23:25:52.5439790+01:00;True|2022-05-17T22:40:34.9974871+01:00;False|2022-05-17T22:40:07.0001215+01:00;True|2022-05-17T22:35:55.7124069+01:00;False|2022-05-17T22:35:40.7185512+01:00;True|2022-05-17T22:30:40.3887842+01:00;False|2022-05-17T22:29:42.4052652+01:00;True|2022-05-17T22:24:01.6030290+01:00;</History>
+    <History>True|2023-08-20T13:14:00.4902276Z;True|2023-08-04T00:13:56.5164331+01:00;True|2023-02-26T02:20:41.4518513+00:00;True|2023-02-26T02:08:54.4115132+00:00;True|2023-02-26T01:45:56.3187653+00:00;False|2023-02-26T01:45:47.6956226+00:00;True|2023-02-26T01:41:45.5062380+00:00;True|2023-02-26T01:39:30.6417546+00:00;True|2023-02-26T01:35:07.6457339+00:00;True|2022-06-28T11:48:15.1521704+01:00;True|2022-05-28T23:25:28.5880553+01:00;True|2022-05-20T15:39:16.7593643+01:00;True|2022-05-19T11:51:33.2028250+01:00;True|2022-05-18T23:25:52.5439790+01:00;True|2022-05-17T22:40:34.9974871+01:00;False|2022-05-17T22:40:07.0001215+01:00;True|2022-05-17T22:35:55.7124069+01:00;False|2022-05-17T22:35:40.7185512+01:00;True|2022-05-17T22:30:40.3887842+01:00;False|2022-05-17T22:29:42.4052652+01:00;True|2022-05-17T22:24:01.6030290+01:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/Results.cs b/Results.cs
@@ -201,11 +201,12 @@ private void Results_Load(object sender, EventArgs e)
                 }
 
                 // 273e5 (Bury The Light - Chained.Trap)
-                int hyphenIndex = shortFolder.IndexOf("-") + 2;
+                int hyphenIndex = shortFolder.LastIndexOf("-") + 2;
                 int bracketIndex = shortFolder.IndexOf(")");
                 string mapperAlt = "";
-                if (bracketIndex != -1 && hyphenIndex != -1)
+                if (bracketIndex > 0 && hyphenIndex < bracketIndex)
                 {
+                    Console.WriteLine("BI: " + bracketIndex + " HI: " +  hyphenIndex);
                     mapperAlt = " (" + shortFolder.Substring(hyphenIndex, bracketIndex - hyphenIndex) + ")";
                 }
 

diff --git a/bin/Debug/net6.0-windows/SongAnalyser.dll b/bin/Debug/net6.0-windows/SongAnalyser.dll
diff --git a/bin/Debug/net6.0-windows/SongAnalyser.exe b/bin/Debug/net6.0-windows/SongAnalyser.exe
diff --git a/bin/Debug/net6.0-windows/SongAnalyser.pdb b/bin/Debug/net6.0-windows/SongAnalyser.pdb
diff --git a/bin/Release/net6.0-windows/publish/win-x64/SongAnalyser.exe b/bin/Release/net6.0-windows/publish/win-x64/SongAnalyser.exe
diff --git a/bin/Release/net6.0-windows/publish/win-x64/SongAnalyser.pdb b/bin/Release/net6.0-windows/publish/win-x64/SongAnalyser.pdb
diff --git a/bin/Release/net6.0-windows/win-x64/SongAnalyser.dll b/bin/Release/net6.0-windows/win-x64/SongAnalyser.dll
diff --git a/bin/Release/net6.0-windows/win-x64/SongAnalyser.pdb b/bin/Release/net6.0-windows/win-x64/SongAnalyser.pdb
diff --git a/obj/Debug/net6.0-windows/SongAnalyser.assets.cache b/obj/Debug/net6.0-windows/SongAnalyser.assets.cache
diff --git a/obj/Debug/net6.0-windows/SongAnalyser.csproj.AssemblyReference.cache b/obj/Debug/net6.0-windows/SongAnalyser.csproj.AssemblyReference.cache
diff --git a/obj/Debug/net6.0-windows/SongAnalyser.csproj.CoreCompileInputs.cache b/obj/Debug/net6.0-windows/SongAnalyser.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-78d0a137055c785997f78e952640bfde687ad824
+a1c2d32eb7a748fe3f140476fe32299b60d2f601
diff --git a/obj/Debug/net6.0-windows/SongAnalyser.dll b/obj/Debug/net6.0-windows/SongAnalyser.dll
diff --git a/obj/Debug/net6.0-windows/SongAnalyser.pdb b/obj/Debug/net6.0-windows/SongAnalyser.pdb
diff --git a/obj/Debug/net6.0-windows/apphost.exe b/obj/Debug/net6.0-windows/apphost.exe
diff --git a/obj/Release/net6.0-windows/SongAnalyser.assets.cache b/obj/Release/net6.0-windows/SongAnalyser.assets.cache
diff --git a/obj/Release/net6.0-windows/SongAnalyser.csproj.AssemblyReference.cache b/obj/Release/net6.0-windows/SongAnalyser.csproj.AssemblyReference.cache
diff --git a/obj/Release/net6.0-windows/win-x64/R2R/SongAnalyser.dll b/obj/Release/net6.0-windows/win-x64/R2R/SongAnalyser.dll
diff --git a/obj/Release/net6.0-windows/win-x64/SongAnalyser.csproj.GenerateResource.cache b/obj/Release/net6.0-windows/win-x64/SongAnalyser.csproj.GenerateResource.cache
diff --git a/obj/Release/net6.0-windows/win-x64/SongAnalyser.dll b/obj/Release/net6.0-windows/win-x64/SongAnalyser.dll
diff --git a/obj/Release/net6.0-windows/win-x64/SongAnalyser.pdb b/obj/Release/net6.0-windows/win-x64/SongAnalyser.pdb
diff --git a/obj/SongAnalyser.csproj.nuget.dgspec.json b/obj/SongAnalyser.csproj.nuget.dgspec.json
@@ -76,7 +76,7 @@
               "privateAssets": "none"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/obj/SongAnalyser.csproj.nuget.g.props b/obj/SongAnalyser.csproj.nuget.g.props
@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\matth\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\matth\.nuget\packages\" />

diff --git a/obj/project.assets.json b/obj/project.assets.json
@@ -722,7 +722,7 @@
             "privateAssets": "none"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
       }
     }
   }

diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "FRnxff69oW2VzzToTvLAv5jk/EGjnbW7RiQn/3geN0+JJU1y8GZB0+7FpSO0H5FYtrEeJ54FaOTIH2/sZJX6Xg==",
+  "dgSpecHash": "oIKa/CJPMhHkArLTsAQxMTRonYYqnClUt09KZ1gPeGKZ2/y0aqEkSqv+3sgIU8x49UyBdE6FUwNV+2XtbRRu5w==",
   "success": true,
   "projectFilePath": "C:\\Users\\matth\\Documents\\Visual Studio 2022\\Projects\\BSSongAnalyser\\SongAnalyser\\SongAnalyser.csproj",
   "expectedPackageFiles": [
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		78d0a137055c785997f78e952640bfde687ad824
		a1c2d32eb7a748fe3f140476fe32299b60d2f601
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ @@
                   "privateAssets": "none"
                 }
               },
-              "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+              "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
             }
           }
         }
@@ Expand Down @@