Updated System.CommandLine package

francis-page · francis-page · commit 4f56661c4218 · 2022-05-26T13:55:37.000-04:00
diff --git a/UnityDataTool/Program.cs b/UnityDataTool/Program.cs
@@ -14,60 +14,104 @@ public static class Program
     {
         public static int Main(string[] args)
         {
-            var analyzeCommand = new Command("analyze", "Analyze AssetBundles or SerializedFiles.")
-            {
-                new Argument<DirectoryInfo>("path", "The path to the directory containing the files to analyze").ExistingOnly(),
-                new Option<string>(aliases: new[] { "--output-file", "-o" }, description: "Filename of the output database", getDefaultValue: () => "database.db"),
-                new Option<bool>(aliases: new[] { "--extract-references", "-r" }, description: "Extract all object references and add them in the 'refs' table"),
-                new Option<string>(aliases: new[] { "--search-pattern", "-p" }, description: "File search pattern", getDefaultValue: () => "*"),
-            };
-            analyzeCommand.AddAlias("analyse");
-            analyzeCommand.Handler = CommandHandler.Create<DirectoryInfo, string, bool, string>(HandleAnalyze);
-
-            var findRefsCommand = new Command("find-refs", "Find reference chains to specified object(s).")
-            {
-                new Argument<FileInfo>("databasePath", "The path to the database generated by the 'analyze' command using --extract-references").ExistingOnly(),
-                new Option<string>(aliases: new[] { "--output-file", "-o" }, description: "Output file", getDefaultValue: () => "references.txt"),
-                new Option<bool>(aliases: new[] { "--find-all", "-a" }, description: "Find all reference chains originating from the same asset (instead of only one), can be very slow"),
-                new Option<string>(aliases: new[] { "--object-name", "-n" }, description: "Object name"),
-                new Option<string>(aliases: new[] { "--object-type", "-t" }, description: "Optional object type when searching by name"),
-                new Option<long?>(aliases: new[] { "--object-id", "-i" }, description: "Object id"),
-            };
-            findRefsCommand.Handler = CommandHandler.Create<FileInfo, string, long?, string, string, bool>(HandleFindReferences);
-
-            var dumpCommand = new Command("dump", "Dump the content of an AssetBundle or SerializedFile.")
-            {
-                new Argument<FileInfo>("filename", "The path of the file to dump").ExistingOnly(),
-                new Option<DumpFormat>(aliases: new[] { "--output-format", "-f" }, description: "Output format", getDefaultValue: () => DumpFormat.Text),
-                new Option<bool>(aliases: new[] { "--skip-large-arrays", "-s" }, description: "Do not dump large arrays of basic data types"),
-            };
-            dumpCommand.Handler = CommandHandler.Create<FileInfo, DumpFormat, bool>(HandleDump);
+            var rootCommand = new RootCommand();
 
-            var extractArchiveCommand = new Command("extract", "Extract the archive.")
             {
-                new Argument<FileInfo>("filename", "The path of the archive file").ExistingOnly(),
-            };
-            var listArchiveCommand = new Command("list", "List the content of an archive.")
+                var pathArg = new Argument<DirectoryInfo>("path", "The path to the directory containing the files to analyze").ExistingOnly();
+                var oOpt = new Option<string>(aliases: new[] { "--output-file", "-o" }, description: "Filename of the output database", getDefaultValue: () => "database.db");
+                var rOpt = new Option<bool>(aliases: new[] { "--extract-references", "-r" }, description: "Extract all object references and add them in the 'refs' table");
+                var pOpt = new Option<string>(aliases: new[] { "--search-pattern", "-p" }, description: "File search pattern", getDefaultValue: () => "*");
+
+                var analyzeCommand = new Command("analyze", "Analyze AssetBundles or SerializedFiles.")
+                {
+                    pathArg,
+                    oOpt,
+                    rOpt,
+                    pOpt,
+                };
+
+                analyzeCommand.AddAlias("analyse");
+                analyzeCommand.SetHandler(
+                    (DirectoryInfo di, string o, bool r, string p) => HandleAnalyze(di, o, r, p),
+                    pathArg, oOpt, rOpt, pOpt);
+
+                rootCommand.AddCommand(analyzeCommand);
+            }
+
             {
-                new Argument<FileInfo>("filename", "The path of the archive file").ExistingOnly(),
-            };
-            var archiveCommand = new Command("archive", "Unity Archive (AssetBundle) functions.")
+                var pathArg = new Argument<FileInfo>("databasePath", "The path to the database generated by the 'analyze' command using --extract-references").ExistingOnly();
+                var oOpt = new Option<string>(aliases: new[] { "--output-file", "-o" }, description: "Output file", getDefaultValue: () => "references.txt");
+                var aOpt = new Option<bool>(aliases: new[] { "--find-all", "-a" }, description: "Find all reference chains originating from the same asset (instead of only one), can be very slow");
+                var nOpt = new Option<string>(aliases: new[] { "--object-name", "-n" }, description: "Object name");
+                var tOpt = new Option<string>(aliases: new[] { "--object-type", "-t" }, description: "Optional object type when searching by name");
+                var iOpt = new Option<long?>(aliases: new[] { "--object-id", "-i" }, description: "Object id");
+
+                var findRefsCommand = new Command("find-refs", "Find reference chains to specified object(s).")
+                {
+                    pathArg,
+                    oOpt,
+                    aOpt,
+                    nOpt,
+                    tOpt,
+                    iOpt,
+                };
+
+                findRefsCommand.SetHandler(
+                    (FileInfo fi, string o, long? a, string n, string t, bool i) => HandleFindReferences(fi, o, a, n, t, i),
+                    pathArg, oOpt, aOpt, nOpt, tOpt, iOpt);
+
+                rootCommand.Add(findRefsCommand);
+            }
+
             {
-                extractArchiveCommand,
-                listArchiveCommand,
-            };
-            extractArchiveCommand.Handler = CommandHandler.Create<FileInfo>(HandleExtractArchive);
-            listArchiveCommand.Handler = CommandHandler.Create<FileInfo>(HandleListArchive);
+                var pathArg = new Argument<FileInfo>("filename", "The path of the file to dump").ExistingOnly();
+                var fOpt = new Option<DumpFormat>(aliases: new[] { "--output-format", "-f" }, description: "Output format", getDefaultValue: () => DumpFormat.Text);
+                var sOpt = new Option<bool>(aliases: new[] { "--skip-large-arrays", "-s" }, description: "Do not dump large arrays of basic data types");
+
+                var dumpCommand = new Command("dump", "Dump the content of an AssetBundle or SerializedFile.")
+                {
+                    pathArg,
+                    fOpt,
+                    sOpt,
+                };
+                dumpCommand.SetHandler(
+                    (FileInfo fi, DumpFormat f, bool s) => HandleDump(fi, f, s),
+                    pathArg, fOpt, sOpt);
+
+                rootCommand.AddCommand(dumpCommand);
+            }
 
-            var cmd = new RootCommand()
             {
-                analyzeCommand,
-                findRefsCommand,
-                dumpCommand,
-                archiveCommand,
-            };
+                var pathArg = new Argument<FileInfo>("filename", "The path of the archive file").ExistingOnly();
+
+                var extractArchiveCommand = new Command("extract", "Extract the archive.")
+                {
+                    pathArg,
+                };
+
+                extractArchiveCommand.SetHandler(
+                    (FileInfo fi) => HandleExtractArchive(fi),
+                    pathArg);
+
+                var listArchiveCommand = new Command("list", "List the content of an archive.")
+                {
+                    pathArg,
+                };
+
+                listArchiveCommand.SetHandler(
+                    (FileInfo fi) => HandleListArchive(fi),
+                    pathArg);
+
+                var archiveCommand = new Command("archive", "Unity Archive (AssetBundle) functions.")
+                {
+                    extractArchiveCommand,
+                    listArchiveCommand,
+                };
+
+                rootCommand.AddCommand(archiveCommand);
+            }
 
-            return cmd.Invoke(args);
+            return rootCommand.Invoke(args);
         }
 
         enum DumpFormat
diff --git a/UnityDataTool/UnityDataTool.csproj b/UnityDataTool/UnityDataTool.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.115" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
   </ItemGroup>
 
   <ItemGroup>
