Skip to content

Commit a0570fe

Browse files
committed
Overhaul output to use a tree instead of a table
1 parent abc2369 commit a0570fe

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

CikExtractor/Program.cs

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -129,44 +129,29 @@ public override int Execute(CommandContext context, Settings settings)
129129
var cikFolderPath = Path.GetFullPath(settings.CikExtractionFolder);
130130
Directory.CreateDirectory(cikFolderPath);
131131

132-
var packageTable = new Table()
133-
.Title("Packages")
134-
.AddColumns(
135-
new TableColumn("Package Name"),
136-
new TableColumn("License Type"),
137-
new TableColumn("Keys")
138-
)
139-
.RoundedBorder()
140-
.Expand();
141-
142-
foreach (var license in manager.Licenses.Where(x => x.PackedContentKeys.Count > 0))
132+
var tree = new Tree(":post_office:");
133+
foreach (var license in manager.Licenses.Where(x => x.PackedContentKeys.Count != 0))
143134
{
144-
var keysTable = new Table()
145-
.AddColumns(
146-
new TableColumn("Key Id"),
147-
new TableColumn("Key")
148-
)
149-
.RoundedBorder()
150-
.Expand();
135+
var packageNode = tree.AddNode($":package: [blue]{license.PackageName}[/]");
136+
packageNode.AddNode($"[white bold]License Type[/]: [green bold]{license.LicenseType}[/]");
151137

152138
foreach (var pair in license.PackedContentKeys)
153139
{
154140
var contentKey = Crypto.DecryptContentKey(deviceKey, pair.Value);
155-
156141
var filePath = Path.Join(cikFolderPath, $"{pair.Key}.cik");
157142

158-
File.WriteAllBytes(filePath,
159-
pair.Key.ToByteArray()
143+
File.WriteAllBytes(filePath,
144+
pair.Key
145+
.ToByteArray()
160146
.Concat(contentKey)
161147
.ToArray());
162148

163-
keysTable.AddRow(pair.Key.ToString(), Convert.ToHexString(contentKey));
149+
var keyNode = packageNode.AddNode($":key: [blue]{pair.Key}[/]");
150+
keyNode.AddNode($"[white bold]Key[/]: [green bold]{Convert.ToHexString(contentKey)}[/]");
164151
}
165-
166-
packageTable.AddRow(new Text(license.PackageName), new Text(license.LicenseType.ToString()), keysTable);
167152
}
168153

169-
AnsiConsole.Write(packageTable);
154+
AnsiConsole.Write(tree);
170155

171156
return 0;
172157
}

0 commit comments

Comments
 (0)