From c2d527925954560ce217d9c0246f6ee8505f113b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 16 Jun 2014 01:50:49 +0100 Subject: [PATCH] Add verbose mode for "formats" verb. --- DiscImageChef/Commands/Formats.cs | 27 ++++++++++++++++++++++++--- DiscImageChef/Main.cs | 2 ++ DiscImageChef/Options.cs | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/DiscImageChef/Commands/Formats.cs b/DiscImageChef/Commands/Formats.cs index 1d05fad4..de7b6d90 100644 --- a/DiscImageChef/Commands/Formats.cs +++ b/DiscImageChef/Commands/Formats.cs @@ -14,16 +14,37 @@ namespace DiscImageChef.Commands plugins.RegisterAllPlugins(); Console.WriteLine("Supported images:"); + if(MainClass.isVerbose) + Console.WriteLine("GUID\t\t\t\t\tPlugin"); foreach (KeyValuePair kvp in plugins.ImagePluginsList) - Console.WriteLine(kvp.Value.Name); + { + if(MainClass.isVerbose) + Console.WriteLine("{0}\t{1}", kvp.Value.PluginUUID, kvp.Value.Name); + else + Console.WriteLine(kvp.Value.Name); + } Console.WriteLine(); Console.WriteLine("Supported filesystems:"); + if(MainClass.isVerbose) + Console.WriteLine("GUID\t\t\t\t\tPlugin"); foreach (KeyValuePair kvp in plugins.PluginsList) - Console.WriteLine(kvp.Value.Name); + { + if(MainClass.isVerbose) + Console.WriteLine("{0}\t{1}", kvp.Value.PluginUUID, kvp.Value.Name); + else + Console.WriteLine(kvp.Value.Name); + } Console.WriteLine(); Console.WriteLine("Supported partitions:"); + if(MainClass.isVerbose) + Console.WriteLine("GUID\t\t\t\t\tPlugin"); foreach (KeyValuePair kvp in plugins.PartPluginsList) - Console.WriteLine(kvp.Value.Name); + { + if(MainClass.isVerbose) + Console.WriteLine("{0}\t{1}", kvp.Value.PluginUUID, kvp.Value.Name); + else + Console.WriteLine(kvp.Value.Name); + } } } } diff --git a/DiscImageChef/Main.cs b/DiscImageChef/Main.cs index 0f23b8f0..cd4261d9 100644 --- a/DiscImageChef/Main.cs +++ b/DiscImageChef/Main.cs @@ -106,6 +106,8 @@ namespace DiscImageChef Commands.Verify.doVerify(VerifyOptions); break; case "formats": + FormatsSubOptions FormatsOptions = (FormatsSubOptions)invokedVerbInstance; + isVerbose = FormatsOptions.Verbose; Commands.Formats.ListFormats(); break; default: diff --git a/DiscImageChef/Options.cs b/DiscImageChef/Options.cs index baa69cd1..adf903f0 100644 --- a/DiscImageChef/Options.cs +++ b/DiscImageChef/Options.cs @@ -79,7 +79,7 @@ namespace DiscImageChef public string InputFile { get; set; } } - public class FormatsSubOptions + public class FormatsSubOptions : CommonSubOptions { }