refactor(MetadataFile): moving files around

LaoSparrow · LaoSparrow · commit 13aa18510123 · 2025-04-19T20:57:51.000+08:00
diff --git a/PCL2.Neo.Tests/Models/Minecraft/MetadataFileTest.cs b/PCL2.Neo.Tests/Models/Minecraft/MetadataFileTest.cs
@@ -1,7 +1,7 @@
-using PCL2.Neo.Minecraft.Models;
+using PCL2.Neo.Models.Minecraft;
 using System.Text.Json.Nodes;
 
-namespace PCL2.Neo.Tests.Minecraft.Models;
+namespace PCL2.Neo.Tests.Models.Minecraft;
 
 public class MetadataFileTest
 {
@@ -18,6 +18,7 @@ public void MainParsingTest()
             {
                 Assert.That(meta.Arguments.Game.Count, Is.EqualTo(jsonObj["arguments"]!["game"]!.AsArray().Count));
             }
+
             Assert.Multiple(() =>
             {
                 Assert.That(meta.Assets, Is.Not.Empty);
@@ -39,6 +40,7 @@ public void MainParsingTest()
                     Assert.That(file.Url, Is.Not.Empty);
                 });
             }
+
             Assert.That(meta.Id, Is.Not.Empty);
             Assert.Multiple(() =>
             {
@@ -106,28 +108,24 @@ public void ArgumentsParsingTest()
             "${version_type}",
             new MetadataFile.ConditionalArg
             {
-                Rules = [
+                Rules =
+                [
                     new MetadataFile.Rule
                     {
                         Action = MetadataFile.Rule.ActionEnum.Allow,
-                        Features = new Dictionary<string, bool>
-                        {
-                            ["is_demo_user"] = true
-                        }
+                        Features = new Dictionary<string, bool> { ["is_demo_user"] = true }
                     }
                 ],
                 Value = ["--demo"]
             },
             new MetadataFile.ConditionalArg
             {
-                Rules = [
+                Rules =
+                [
                     new MetadataFile.Rule
                     {
                         Action = MetadataFile.Rule.ActionEnum.Allow,
-                        Features = new Dictionary<string, bool>
-                        {
-                            ["has_custom_resolution"] = true
-                        }
+                        Features = new Dictionary<string, bool> { ["has_custom_resolution"] = true }
                     }
                 ],
                 Value =
@@ -140,14 +138,12 @@ public void ArgumentsParsingTest()
             },
             new MetadataFile.ConditionalArg
             {
-                Rules = [
+                Rules =
+                [
                     new MetadataFile.Rule
                     {
                         Action = MetadataFile.Rule.ActionEnum.Allow,
-                        Features = new Dictionary<string, bool>
-                        {
-                            ["has_quick_plays_support"] = true
-                        }
+                        Features = new Dictionary<string, bool> { ["has_quick_plays_support"] = true }
                     }
                 ],
                 Value =
@@ -158,14 +154,12 @@ public void ArgumentsParsingTest()
             },
             new MetadataFile.ConditionalArg
             {
-                Rules = [
+                Rules =
+                [
                     new MetadataFile.Rule
                     {
                         Action = MetadataFile.Rule.ActionEnum.Allow,
-                        Features = new Dictionary<string, bool>
-                        {
-                            ["is_quick_play_singleplayer"] = true
-                        }
+                        Features = new Dictionary<string, bool> { ["is_quick_play_singleplayer"] = true }
                     }
                 ],
                 Value =
@@ -176,14 +170,12 @@ public void ArgumentsParsingTest()
             },
             new MetadataFile.ConditionalArg
             {
-                Rules = [
+                Rules =
+                [
                     new MetadataFile.Rule
                     {
                         Action = MetadataFile.Rule.ActionEnum.Allow,
-                        Features = new Dictionary<string, bool>
-                        {
-                            ["is_quick_play_multiplayer"] = true
-                        }
+                        Features = new Dictionary<string, bool> { ["is_quick_play_multiplayer"] = true }
                     }
                 ],
                 Value =
@@ -194,14 +186,12 @@ public void ArgumentsParsingTest()
             },
             new MetadataFile.ConditionalArg
             {
-                Rules = [
+                Rules =
+                [
                     new MetadataFile.Rule
                     {
                         Action = MetadataFile.Rule.ActionEnum.Allow,
-                        Features = new Dictionary<string, bool>
-                        {
-                            ["is_quick_play_realms"] = true
-                        }
+                        Features = new Dictionary<string, bool> { ["is_quick_play_realms"] = true }
                     }
                 ],
                 Value =
@@ -254,6 +244,5 @@ public void ArgumentsParsingTest()
                 }
             }
         }
-
     }
 }
diff --git a/PCL2.Neo/Models/Minecraft/MetadataFile.cs b/PCL2.Neo/Models/Minecraft/MetadataFile.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace PCL2.Neo.Minecraft.Models;
+namespace PCL2.Neo.Models.Minecraft;
 
 public class MetadataFile
 {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using PCL2.Neo.Minecraft.Models;`
	`1`	`+using PCL2.Neo.Models.Minecraft;`
`2`	`2`	`using System.Text.Json.Nodes;`
`3`	`3`
`4`		`-namespace PCL2.Neo.Tests.Minecraft.Models;`
	`4`	`+namespace PCL2.Neo.Tests.Models.Minecraft;`
`5`	`5`
`6`	`6`	`public class MetadataFileTest`
`7`	`7`	`{`
`@@ -18,6 +18,7 @@ public void MainParsingTest()`
`18`	`18`	`{`
`19`	`19`	`Assert.That(meta.Arguments.Game.Count, Is.EqualTo(jsonObj["arguments"]!["game"]!.AsArray().Count));`
`20`	`20`	`}`
	`21`	`+`
`21`	`22`	`Assert.Multiple(() =>`
`22`	`23`	`{`
`23`	`24`	`Assert.That(meta.Assets, Is.Not.Empty);`
`@@ -39,6 +40,7 @@ public void MainParsingTest()`
`39`	`40`	`Assert.That(file.Url, Is.Not.Empty);`
`40`	`41`	`});`
`41`	`42`	`}`
	`43`	`+`
`42`	`44`	`Assert.That(meta.Id, Is.Not.Empty);`
`43`	`45`	`Assert.Multiple(() =>`
`44`	`46`	`{`
`@@ -106,28 +108,24 @@ public void ArgumentsParsingTest()`
`106`	`108`	`"${version_type}",`
`107`	`109`	`new MetadataFile.ConditionalArg`
`108`	`110`	`{`
`109`		`- Rules = [`
	`111`	`+ Rules =`
	`112`	`+ [`
`110`	`113`	`new MetadataFile.Rule`
`111`	`114`	`{`
`112`	`115`	`Action = MetadataFile.Rule.ActionEnum.Allow,`
`113`		`- Features = new Dictionary<string, bool>`
`114`		`- {`
`115`		`- ["is_demo_user"] = true`
`116`		`- }`
	`116`	`+ Features = new Dictionary<string, bool> { ["is_demo_user"] = true }`
`117`	`117`	`}`
`118`	`118`	`],`
`119`	`119`	`Value = ["--demo"]`
`120`	`120`	`},`
`121`	`121`	`new MetadataFile.ConditionalArg`
`122`	`122`	`{`
`123`		`- Rules = [`
	`123`	`+ Rules =`
	`124`	`+ [`
`124`	`125`	`new MetadataFile.Rule`
`125`	`126`	`{`
`126`	`127`	`Action = MetadataFile.Rule.ActionEnum.Allow,`
`127`		`- Features = new Dictionary<string, bool>`
`128`		`- {`
`129`		`- ["has_custom_resolution"] = true`
`130`		`- }`
	`128`	`+ Features = new Dictionary<string, bool> { ["has_custom_resolution"] = true }`
`131`	`129`	`}`
`132`	`130`	`],`
`133`	`131`	`Value =`
`@@ -140,14 +138,12 @@ public void ArgumentsParsingTest()`
`140`	`138`	`},`
`141`	`139`	`new MetadataFile.ConditionalArg`
`142`	`140`	`{`
`143`		`- Rules = [`
	`141`	`+ Rules =`
	`142`	`+ [`
`144`	`143`	`new MetadataFile.Rule`
`145`	`144`	`{`
`146`	`145`	`Action = MetadataFile.Rule.ActionEnum.Allow,`
`147`		`- Features = new Dictionary<string, bool>`
`148`		`- {`
`149`		`- ["has_quick_plays_support"] = true`
`150`		`- }`
	`146`	`+ Features = new Dictionary<string, bool> { ["has_quick_plays_support"] = true }`
`151`	`147`	`}`
`152`	`148`	`],`
`153`	`149`	`Value =`
`@@ -158,14 +154,12 @@ public void ArgumentsParsingTest()`
`158`	`154`	`},`
`159`	`155`	`new MetadataFile.ConditionalArg`
`160`	`156`	`{`
`161`		`- Rules = [`
	`157`	`+ Rules =`
	`158`	`+ [`
`162`	`159`	`new MetadataFile.Rule`
`163`	`160`	`{`
`164`	`161`	`Action = MetadataFile.Rule.ActionEnum.Allow,`
`165`		`- Features = new Dictionary<string, bool>`
`166`		`- {`
`167`		`- ["is_quick_play_singleplayer"] = true`
`168`		`- }`
	`162`	`+ Features = new Dictionary<string, bool> { ["is_quick_play_singleplayer"] = true }`
`169`	`163`	`}`
`170`	`164`	`],`
`171`	`165`	`Value =`
`@@ -176,14 +170,12 @@ public void ArgumentsParsingTest()`
`176`	`170`	`},`
`177`	`171`	`new MetadataFile.ConditionalArg`
`178`	`172`	`{`
`179`		`- Rules = [`
	`173`	`+ Rules =`
	`174`	`+ [`
`180`	`175`	`new MetadataFile.Rule`
`181`	`176`	`{`
`182`	`177`	`Action = MetadataFile.Rule.ActionEnum.Allow,`
`183`		`- Features = new Dictionary<string, bool>`
`184`		`- {`
`185`		`- ["is_quick_play_multiplayer"] = true`
`186`		`- }`
	`178`	`+ Features = new Dictionary<string, bool> { ["is_quick_play_multiplayer"] = true }`
`187`	`179`	`}`
`188`	`180`	`],`
`189`	`181`	`Value =`
`@@ -194,14 +186,12 @@ public void ArgumentsParsingTest()`
`194`	`186`	`},`
`195`	`187`	`new MetadataFile.ConditionalArg`
`196`	`188`	`{`
`197`		`- Rules = [`
	`189`	`+ Rules =`
	`190`	`+ [`
`198`	`191`	`new MetadataFile.Rule`
`199`	`192`	`{`
`200`	`193`	`Action = MetadataFile.Rule.ActionEnum.Allow,`
`201`		`- Features = new Dictionary<string, bool>`
`202`		`- {`
`203`		`- ["is_quick_play_realms"] = true`
`204`		`- }`
	`194`	`+ Features = new Dictionary<string, bool> { ["is_quick_play_realms"] = true }`
`205`	`195`	`}`
`206`	`196`	`],`
`207`	`197`	`Value =`
`@@ -254,6 +244,5 @@ public void ArgumentsParsingTest()`
`254`	`244`	`}`
`255`	`245`	`}`
`256`	`246`	`}`
`257`		`-`
`258`	`247`	`}`
`259`	`248`	`}`