aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

* commandline:

Browse Source 
Moved commandline submodule to my own fork.

	* DiscImageChef.sln:
	* DiscImageChef/Main.cs:
	* DiscImageChef/Options.cs:
	* DiscImageChef/Commands/Decode.cs:
	* DiscImageChef/Commands/Verify.cs:
	* DiscImageChef/Commands/Entropy.cs:
	* DiscImageChef/Commands/Analyze.cs:
	* DiscImageChef/Commands/Compare.cs:
	* DiscImageChef/Commands/Formats.cs:
	* DiscImageChef/DiscImageChef.csproj:
	* DiscImageChef/Commands/PrintHex.cs:
	* DiscImageChef/Commands/Checksum.cs:
	* DiscImageChef/Commands/Benchmark.cs:
	* DiscImageChef/Commands/MediaScan.cs:
	* DiscImageChef/Commands/MediaInfo.cs:
	* DiscImageChef/Commands/DumpMedia.cs:
	* DiscImageChef/Commands/DeviceInfo.cs:
	* DiscImageChef/Commands/DeviceReport.cs:
	* DiscImageChef/Commands/CreateSidecar.cs:
	  Updated to new CommandLine API.
This commit is contained in:
Natalia Portillo
2016-04-08 01:13:42 +01:00
parent 139a78fc63
commit 942a96defa
21 changed files with 405 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef/Commands/Analyze.cs
View File

@@ -46,7 +46,7 @@ namespace DiscImageChef.Commands
{
public static class Analyze
{
public static void doAnalyze(AnalyzeSubOptions options)
public static void doAnalyze(AnalyzeOptions options)
{
DicConsole.DebugWriteLine("Analyze command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Analyze command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/Benchmark.cs
View File

@@ -45,7 +45,7 @@ namespace DiscImageChef.Commands
{
public static class Benchmark
{
public static void doBenchmark(BenchmarkSubOptions options)
public static void doBenchmark(BenchmarkOptions options)
{
int bufferSize = options.BufferSize * 1024 * 1024;
long minMemory = long.MaxValue;

2
DiscImageChef/Commands/Checksum.cs
View File

@@ -49,7 +49,7 @@ namespace DiscImageChef.Commands
// How many sectors to read at once
const uint sectorsToRead = 256;
public static void doChecksum(ChecksumSubOptions options)
public static void doChecksum(ChecksumOptions options)
{
DicConsole.DebugWriteLine("Checksum command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Checksum command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/Compare.cs
View File

@@ -45,7 +45,7 @@ namespace DiscImageChef.Commands
{
public static class Compare
{
public static void doCompare(CompareSubOptions options)
public static void doCompare(CompareOptions options)
{
DicConsole.DebugWriteLine("Compare command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Compare command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/CreateSidecar.cs
View File

@@ -51,7 +51,7 @@ namespace DiscImageChef.Commands
{
public static class CreateSidecar
{
public static void doSidecar(CreateSidecarSubOptions options)
public static void doSidecar(CreateSidecarOptions options)
{
CICMMetadataType sidecar = new CICMMetadataType();
PluginBase plugins = new PluginBase();

2
DiscImageChef/Commands/Decode.cs
View File

@@ -43,7 +43,7 @@ namespace DiscImageChef.Commands
{
public static class Decode
{
public static void doDecode(DecodeSubOptions options)
public static void doDecode(DecodeOptions options)
{
DicConsole.DebugWriteLine("Decode command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Decode command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -46,7 +46,7 @@ namespace DiscImageChef.Commands
{
public static class DeviceInfo
{
public static void doDeviceInfo(DeviceInfoSubOptions options)
public static void doDeviceInfo(DeviceInfoOptions options)
{
DicConsole.DebugWriteLine("Device-Info command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Device-Info command", "--verbose={0}", options.Verbose);

10
DiscImageChef/Commands/DeviceReport.cs
View File

@@ -46,7 +46,7 @@ namespace DiscImageChef.Commands
{
public static class DeviceReport
{
public static void doDeviceReport(DeviceReportSubOptions options)
public static void doDeviceReport(DeviceReportOptions options)
{
DicConsole.DebugWriteLine("Device-Report command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Device-Report command", "--verbose={0}", options.Verbose);
@@ -97,7 +97,7 @@ namespace DiscImageChef.Commands
Core.Statistics.AddCommand("device-report");
}
static void doATADeviceReport(DeviceReportSubOptions options, Device dev)
static void doATADeviceReport(DeviceReportOptions options, Device dev)
{
DiscImageChef.Decoders.ATA.AtaErrorRegistersCHS errorRegs;
byte[] buffer;
@@ -1074,17 +1074,17 @@ namespace DiscImageChef.Commands
xmlFs.Close();
}
static void doNVMeDeviceReport(DeviceReportSubOptions options, Device dev)
static void doNVMeDeviceReport(DeviceReportOptions options, Device dev)
{
throw new NotImplementedException("NVMe devices not yet supported.");
}
static void doSDDeviceReport(DeviceReportSubOptions options, Device dev)
static void doSDDeviceReport(DeviceReportOptions options, Device dev)
{
throw new NotImplementedException("MMC/SD devices not yet supported.");
}
static void doSCSIDeviceReport(DeviceReportSubOptions options, Device dev)
static void doSCSIDeviceReport(DeviceReportOptions options, Device dev)
{
byte[] senseBuffer;
byte[] buffer;

10
DiscImageChef/Commands/DumpMedia.cs
View File

@@ -56,7 +56,7 @@ namespace DiscImageChef.Commands
static Core.IBGLog ibgLog;
// TODO: Implement dump map
public static void doDumpMedia(DumpMediaSubOptions options)
public static void doDumpMedia(DumpMediaOptions options)
{
DicConsole.DebugWriteLine("Dump-Media command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Dump-Media command", "--verbose={0}", options.Verbose);
@@ -116,7 +116,7 @@ namespace DiscImageChef.Commands
Core.Statistics.AddCommand("dump-media");
}
static void doATAMediaScan(DumpMediaSubOptions options, Device dev)
static void doATAMediaScan(DumpMediaOptions options, Device dev)
{
if(options.Raw)
{
@@ -899,17 +899,17 @@ namespace DiscImageChef.Commands
DicConsole.ErrorWriteLine("Unable to communicate with ATA device.");
}
static void doNVMeMediaScan(DumpMediaSubOptions options, Device dev)
static void doNVMeMediaScan(DumpMediaOptions options, Device dev)
{
throw new NotImplementedException("NVMe devices not yet supported.");
}
static void doSDMediaScan(DumpMediaSubOptions options, Device dev)
static void doSDMediaScan(DumpMediaOptions options, Device dev)
{
throw new NotImplementedException("MMC/SD devices not yet supported.");
}
static void doSCSIMediaScan(DumpMediaSubOptions options, Device dev)
static void doSCSIMediaScan(DumpMediaOptions options, Device dev)
{
byte[] cmdBuf = null;
byte[] senseBuf = null;

2
DiscImageChef/Commands/Entropy.cs
View File

@@ -45,7 +45,7 @@ namespace DiscImageChef.Commands
{
public static class Entropy
{
public static void doEntropy(EntropySubOptions options)
public static void doEntropy(EntropyOptions options)
{
DicConsole.DebugWriteLine("Entropy command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Entropy command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/Formats.cs
View File

@@ -46,7 +46,7 @@ namespace DiscImageChef.Commands
{
public static class Formats
{
public static void ListFormats(FormatsSubOptions FormatsOptions)
public static void ListFormats(FormatsOptions FormatsOptions)
{
PluginBase plugins = new PluginBase();
plugins.RegisterAllPlugins();

2
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -46,7 +46,7 @@ namespace DiscImageChef.Commands
{
public static class MediaInfo
{
public static void doMediaInfo(MediaInfoSubOptions options)
public static void doMediaInfo(MediaInfoOptions options)
{
DicConsole.DebugWriteLine("Media-Info command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Media-Info command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/MediaScan.cs
View File

@@ -48,7 +48,7 @@ namespace DiscImageChef.Commands
static Core.MHDDLog mhddLog;
static Core.IBGLog ibgLog;
public static void doMediaScan(MediaScanSubOptions options)
public static void doMediaScan(MediaScanOptions options)
{
DicConsole.DebugWriteLine("Media-Scan command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Media-Scan command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/PrintHex.cs
View File

@@ -43,7 +43,7 @@ namespace DiscImageChef.Commands
{
public static class PrintHex
{
public static void doPrintHex(PrintHexSubOptions options)
public static void doPrintHex(PrintHexOptions options)
{
DicConsole.DebugWriteLine("PrintHex command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("PrintHex command", "--verbose={0}", options.Verbose);

2
DiscImageChef/Commands/Verify.cs
View File

@@ -44,7 +44,7 @@ namespace DiscImageChef.Commands
{
public static class Verify
{
public static void doVerify(VerifySubOptions options)
public static void doVerify(VerifyOptions options)
{
DicConsole.DebugWriteLine("Verify command", "--debug={0}", options.Debug);
DicConsole.DebugWriteLine("Verify command", "--verbose={0}", options.Verbose);

8
DiscImageChef/DiscImageChef.csproj
View File

@@ -158,10 +158,6 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\commandline\src\libcmdline\CommandLine35.csproj">
<Project>{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}</Project>
<Name>CommandLine35</Name>
</ProjectReference>
<ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
<Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
<Name>DiscImageChef.Checksums</Name>
@@ -210,5 +206,9 @@
<Project>{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}</Project>
<Name>DiscImageChef.Settings</Name>
</ProjectReference>
<ProjectReference Include="..\commandline\src\CommandLine\CommandLine.csproj">
<Project>{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}</Project>
<Name>CommandLine</Name>
</ProjectReference>
</ItemGroup>
</Project>

293
DiscImageChef/Main.cs
View File

@@ -40,34 +40,19 @@ using System;
using System.Reflection;
using DiscImageChef.Console;
using DiscImageChef.Settings;
using CommandLine;
namespace DiscImageChef
{
class MainClass
{
public static void Main(string[] args)
public static void Main(string [] args)
{
string invokedVerb = "";
object invokedVerbInstance = null;
var options = new Options();
if (!CommandLine.Parser.Default.ParseArguments(args, options,
(verb, subOptions) =>
{
// if parsing succeeds the verb name and correct instance
// will be passed to onVerbCommand delegate (string,object)
invokedVerb = verb;
invokedVerbInstance = subOptions;
}))
{
Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
}
object[] attributes = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
string AssemblyTitle = ((AssemblyTitleAttribute) attributes[0]).Title;
object [] attributes = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
string AssemblyTitle = ((AssemblyTitleAttribute)attributes [0]).Title;
attributes = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
Version AssemblyVersion = typeof(MainClass).Assembly.GetName().Version;
string AssemblyCopyright = ((AssemblyCopyrightAttribute) attributes[0]).Copyright;
string AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes [0]).Copyright;
DicConsole.WriteLineEvent += System.Console.WriteLine;
DicConsole.WriteEvent += System.Console.Write;
@@ -80,137 +65,145 @@ namespace DiscImageChef
Settings.Settings.LoadSettings();
Core.Statistics.LoadStats();
switch (invokedVerb)
Parser.Default.ParseArguments<AnalyzeOptions, CompareOptions, ChecksumOptions, EntropyOptions, VerifyOptions, PrintHexOptions,
DecodeOptions, DeviceInfoOptions, MediaInfoOptions, MediaScanOptions, FormatsOptions, BenchmarkOptions, CreateSidecarOptions,
DumpMediaOptions, DeviceReportOptions, ConfigureOptions, StatsOptions>(args)
.WithParsed<AnalyzeOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Analyze.doAnalyze(opts);
})
.WithParsed<CompareOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Compare.doCompare(opts);
})
.WithParsed<ChecksumOptions>(opts =>
{
case "analyze":
AnalyzeSubOptions AnalyzeOptions = (AnalyzeSubOptions)invokedVerbInstance;
if (AnalyzeOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (AnalyzeOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Analyze.doAnalyze(AnalyzeOptions);
break;
case "compare":
CompareSubOptions CompareOptions = (CompareSubOptions)invokedVerbInstance;
if (CompareOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (CompareOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Compare.doCompare(CompareOptions);
break;
case "checksum":
ChecksumSubOptions ChecksumOptions = (ChecksumSubOptions)invokedVerbInstance;
if (ChecksumOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (ChecksumOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Checksum.doChecksum(ChecksumOptions);
break;
case "entropy":
EntropySubOptions entropyOptions = (EntropySubOptions)invokedVerbInstance;
if (entropyOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (entropyOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Entropy.doEntropy(entropyOptions);
break;
case "verify":
VerifySubOptions VerifyOptions = (VerifySubOptions)invokedVerbInstance;
if (VerifyOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (VerifyOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Verify.doVerify(VerifyOptions);
break;
case "printhex":
PrintHexSubOptions PrintHexOptions = (PrintHexSubOptions)invokedVerbInstance;
if (PrintHexOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (PrintHexOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.PrintHex.doPrintHex(PrintHexOptions);
break;
case "decode":
DecodeSubOptions DecodeOptions = (DecodeSubOptions)invokedVerbInstance;
if (DecodeOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (DecodeOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Decode.doDecode(DecodeOptions);
break;
case "formats":
FormatsSubOptions FormatsOptions = (FormatsSubOptions)invokedVerbInstance;
if (FormatsOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (FormatsOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Formats.ListFormats(FormatsOptions);
break;
case "device-info":
DeviceInfoSubOptions DeviceInfoOptions = (DeviceInfoSubOptions)invokedVerbInstance;
if (DeviceInfoOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (DeviceInfoOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.DeviceInfo.doDeviceInfo(DeviceInfoOptions);
break;
case "media-info":
MediaInfoSubOptions MediaInfoOptions = (MediaInfoSubOptions)invokedVerbInstance;
if (MediaInfoOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (MediaInfoOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.MediaInfo.doMediaInfo(MediaInfoOptions);
break;
case "benchmark":
BenchmarkSubOptions BenchmarkOptions = (BenchmarkSubOptions)invokedVerbInstance;
if (BenchmarkOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (BenchmarkOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Benchmark.doBenchmark(BenchmarkOptions);
break;
case "create-sidecar":
CreateSidecarSubOptions CreateSidecarOptions = (CreateSidecarSubOptions)invokedVerbInstance;
if (CreateSidecarOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (CreateSidecarOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.CreateSidecar.doSidecar(CreateSidecarOptions);
break;
case "media-scan":
MediaScanSubOptions MediaScanOptions = (MediaScanSubOptions)invokedVerbInstance;
if (MediaScanOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (MediaScanOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.MediaScan.doMediaScan(MediaScanOptions);
break;
case "dump-media":
DumpMediaSubOptions DumpMediaOptions = (DumpMediaSubOptions)invokedVerbInstance;
if (DumpMediaOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (DumpMediaOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.DumpMedia.doDumpMedia(DumpMediaOptions);
break;
case "device-report":
DeviceReportSubOptions DeviceReportOptions = (DeviceReportSubOptions)invokedVerbInstance;
if (DeviceReportOptions.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (DeviceReportOptions.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.DeviceReport.doDeviceReport(DeviceReportOptions);
break;
case "configure":
Commands.Configure.doConfigure ();
break;
case "stats":
Commands.Statistics.showStats ();
break;
default:
throw new ArgumentException("Should never arrive here!");
}
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Checksum.doChecksum(opts);
})
.WithParsed<EntropyOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Entropy.doEntropy(opts);
})
.WithParsed<VerifyOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Verify.doVerify(opts);
})
.WithParsed<PrintHexOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.PrintHex.doPrintHex(opts);
})
.WithParsed<DecodeOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Decode.doDecode(opts);
})
.WithParsed<DeviceInfoOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.DeviceInfo.doDeviceInfo(opts);
})
.WithParsed<MediaInfoOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.MediaInfo.doMediaInfo(opts);
})
.WithParsed<MediaScanOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.MediaScan.doMediaScan(opts);
})
.WithParsed<FormatsOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Formats.ListFormats(opts);
})
.WithParsed<BenchmarkOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.Benchmark.doBenchmark(opts);
})
.WithParsed<CreateSidecarOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.CreateSidecar.doSidecar(opts);
})
.WithParsed<DumpMediaOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.DumpMedia.doDumpMedia(opts);
})
.WithParsed<DeviceReportOptions>(opts =>
{
if (opts.Debug)
DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine;
if (opts.Verbose)
DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
Commands.DeviceReport.doDeviceReport(opts);
})
.WithParsed<ConfigureOptions>(opts => { Commands.Configure.doConfigure();})
.WithParsed<StatsOptions>(opts => { Commands.Statistics.showStats(); })
.WithNotParsed(errs => Environment.Exit(1));
Core.Statistics.SaveStats();
}

219
DiscImageChef/Options.cs
View File

@@ -40,22 +40,23 @@ using CommandLine.Text;
namespace DiscImageChef
{
public abstract class CommonSubOptions
public abstract class CommonOptions
{
[Option('v', "verbose", DefaultValue = false, HelpText = "Shows verbose output")]
[Option('v', "verbose", Default = false, HelpText = "Shows verbose output")]
public bool Verbose { get; set; }
[Option('d', "debug", DefaultValue = false, HelpText = "Shows debug output from plugins")]
[Option('d', "debug", Default = false, HelpText = "Shows debug output from plugins")]
public bool Debug { get; set; }
}
public class AnalyzeSubOptions : CommonSubOptions
[Verb("analyze", HelpText = "Analyzes a disc image and searches for partitions and/or filesystems.")]
public class AnalyzeOptions : CommonOptions
{
[Option('p', "partitions", DefaultValue = true,
[Option('p', "partitions", Default = true,
HelpText = "Searches and interprets partitions.")]
public bool SearchForPartitions { get; set; }
[Option('f', "filesystems", DefaultValue = true,
[Option('f', "filesystems", Default = true,
HelpText = "Searches and interprets partitions.")]
public bool SearchForFilesystems { get; set; }
@@ -63,7 +64,8 @@ namespace DiscImageChef
public string InputFile { get; set; }
}
public class CompareSubOptions : CommonSubOptions
[Verb("compare", HelpText = "Compares two disc images.")]
public class CompareOptions : CommonOptions
{
[Option("input1", Required = true, HelpText = "First disc image.")]
public string InputFile1 { get; set; }
@@ -72,65 +74,66 @@ namespace DiscImageChef
public string InputFile2 { get; set; }
}
public class ChecksumSubOptions : CommonSubOptions
[Verb("checksum", HelpText = "Checksums an image.")]
public class ChecksumOptions : CommonOptions
{
[Option('t', "separated-tracks", DefaultValue = true,
[Option('t', "separated-tracks", Default = true,
HelpText = "Checksums each track separately.")]
public bool SeparatedTracks { get; set; }
[Option('w', "whole-disc", DefaultValue = true,
[Option('w', "whole-disc", Default = true,
HelpText = "Checksums the whole disc.")]
public bool WholeDisc { get; set; }
[Option('a', "adler32", DefaultValue = true,
[Option('a', "adler32", Default = true,
HelpText = "Calculates Adler-32.")]
public bool DoAdler32 { get; set; }
[Option("crc16", DefaultValue = true,
[Option("crc16", Default = true,
HelpText = "Calculates CRC16.")]
public bool DoCRC16 { get; set; }
[Option('c', "crc32", DefaultValue = true,
[Option('c', "crc32", Default = true,
HelpText = "Calculates CRC32.")]
public bool DoCRC32 { get; set; }
[Option("crc64", DefaultValue = false,
[Option("crc64", Default = false,
HelpText = "Calculates CRC64 (ECMA).")]
public bool DoCRC64 { get; set; }
/*[Option("fletcher16", DefaultValue = false,
/*[Option("fletcher16", Default = false,
HelpText = "Calculates Fletcher-16.")]
public bool DoFletcher16 { get; set; }
[Option("fletcher32", DefaultValue = false,
[Option("fletcher32", Default = false,
HelpText = "Calculates Fletcher-32.")]
public bool DoFletcher32 { get; set; }*/
[Option('m', "md5", DefaultValue = true,
[Option('m', "md5", Default = true,
HelpText = "Calculates MD5.")]
public bool DoMD5 { get; set; }
[Option("ripemd160", DefaultValue = false,
[Option("ripemd160", Default = false,
HelpText = "Calculates RIPEMD160.")]
public bool DoRIPEMD160 { get; set; }
[Option('s', "sha1", DefaultValue = true,
[Option('s', "sha1", Default = true,
HelpText = "Calculates SHA1.")]
public bool DoSHA1 { get; set; }
[Option("sha256", DefaultValue = false,
[Option("sha256", Default = false,
HelpText = "Calculates SHA256.")]
public bool DoSHA256 { get; set; }
[Option("sha384", DefaultValue = false,
[Option("sha384", Default = false,
HelpText = "Calculates SHA384.")]
public bool DoSHA384 { get; set; }
[Option("sha512", DefaultValue = false,
[Option("sha512", Default = false,
HelpText = "Calculates SHA512.")]
public bool DoSHA512 { get; set; }
[Option('f', "spamsum", DefaultValue = true,
[Option('f', "spamsum", Default = true,
HelpText = "Calculates SpamSum fuzzy hash.")]
public bool DoSpamSum { get; set; }
@@ -138,17 +141,18 @@ namespace DiscImageChef
public string InputFile { get; set; }
}
public class EntropySubOptions : CommonSubOptions
[Verb("entropy", HelpText = "Calculates entropy and/or duplicated sectors of an image.")]
public class EntropyOptions : CommonOptions
{
[Option('p', "duplicated-sectors", DefaultValue = true,
[Option('p', "duplicated-sectors", Default = true,
HelpText = "Calculates how many sectors are duplicated (have same exact data in user area).")]
public bool DuplicatedSectors { get; set; }
[Option('t', "separated-tracks", DefaultValue = true,
[Option('t', "separated-tracks", Default = true,
HelpText = "Calculates entropy for each track separately.")]
public bool SeparatedTracks { get; set; }
[Option('w', "whole-disc", DefaultValue = true,
[Option('w', "whole-disc", Default = true,
HelpText = "Calculates entropy for the whole disc.")]
public bool WholeDisc { get; set; }
@@ -156,13 +160,14 @@ namespace DiscImageChef
public string InputFile { get; set; }
}
public class VerifySubOptions : CommonSubOptions
[Verb("verify", HelpText = "Verifies a disc image integrity, and if supported, sector integrity.")]
public class VerifyOptions : CommonOptions
{
[Option('w', "verify-disc", DefaultValue = true,
[Option('w', "verify-disc", Default = true,
HelpText = "Verify disc image if supported.")]
public bool VerifyDisc { get; set; }
[Option('s', "verify-sectors", DefaultValue = true,
[Option('s', "verify-sectors", Default = true,
HelpText = "Verify all sectors if supported.")]
public bool VerifySectors { get; set; }
@@ -170,21 +175,22 @@ namespace DiscImageChef
public string InputFile { get; set; }
}
public class PrintHexSubOptions : CommonSubOptions
[Verb("printhex", HelpText = "Prints a sector, in hexadecimal values, to the console.")]
public class PrintHexOptions : CommonOptions
{
[Option('s', "start", Required = true,
HelpText = "Start sector.")]
public ulong StartSector { get; set; }
[Option('l', "length", DefaultValue = (ulong)1,
[Option('l', "length", Default = (ulong)1,
HelpText = "How many sectors to print.")]
public ulong Length { get; set; }
[Option('r', "long-sectors", DefaultValue = false,
[Option('r', "long-sectors", Default = false,
HelpText = "Print sectors with tags included.")]
public bool LongSectors { get; set; }
[Option('w', "width", DefaultValue = (ushort)32,
[Option('w', "width", Default = (ushort)32,
HelpText = "How many bytes to print per line.")]
public ushort WidthBytes { get; set; }
@@ -192,21 +198,22 @@ namespace DiscImageChef
public string InputFile { get; set; }
}
public class DecodeSubOptions : CommonSubOptions
[Verb("decode", HelpText = "Decodes and pretty prints disk and/or sector tags.")]
public class DecodeOptions : CommonOptions
{
[Option('s', "start", DefaultValue = (ulong)0,
[Option('s', "start", Default = (ulong)0,
HelpText = "Start sector.")]
public ulong StartSector { get; set; }
[Option('l', "length", DefaultValue = "all",
[Option('l', "length", Default = "all",
HelpText = "How many sectors to decode, or \"all\".")]
public string Length { get; set; }
[Option('k', "disk-tags", DefaultValue = true,
[Option('k', "disk-tags", Default = true,
HelpText = "Decode disk tags.")]
public bool DiskTags { get; set; }
[Option('t', "sector-tags", DefaultValue = true,
[Option('t', "sector-tags", Default = true,
HelpText = "Decode sector tags.")]
public bool SectorTags { get; set; }
@@ -214,56 +221,63 @@ namespace DiscImageChef
public string InputFile { get; set; }
}
public class DeviceInfoSubOptions : CommonSubOptions
[Verb("device-info", HelpText = "Gets information about a device.")]
public class DeviceInfoOptions : CommonOptions
{
[Option('i', "device", Required = true, HelpText = "Device path.")]
public string DevicePath { get; set; }
[Option('w', "output-prefix", Required = false, DefaultValue = "", HelpText = "Write binary responses from device with that prefix.")]
[Option('w', "output-prefix", Required = false, Default = "", HelpText = "Write binary responses from device with that prefix.")]
public string OutputPrefix { get; set; }
}
public class MediaInfoSubOptions : CommonSubOptions
[Verb("media-info", HelpText = "Gets information about the media inserted on a device.")]
public class MediaInfoOptions : CommonOptions
{
[Option('i', "device", Required = true, HelpText = "Device path.")]
public string DevicePath { get; set; }
[Option('w', "output-prefix", Required = false, DefaultValue = "", HelpText = "Write binary responses from device with that prefix.")]
[Option('w', "output-prefix", Required = false, Default = "", HelpText = "Write binary responses from device with that prefix.")]
public string OutputPrefix { get; set; }
}
public class MediaScanSubOptions : CommonSubOptions
[Verb("media-scan", HelpText = "Scans the media inserted on a device.")]
public class MediaScanOptions : CommonOptions
{
[Option('i', "device", Required = true, HelpText = "Device path.")]
public string DevicePath { get; set; }
[Option('m', "mhdd-log", Required = false, DefaultValue = "", HelpText = "Write a log of the scan in the format used by MHDD.")]
[Option('m', "mhdd-log", Required = false, Default = "", HelpText = "Write a log of the scan in the format used by MHDD.")]
public string MHDDLogPath { get; set; }
[Option('b', "ibg-log", Required = false, DefaultValue = "", HelpText = "Write a log of the scan in the format used by ImgBurn.")]
[Option('b', "ibg-log", Required = false, Default = "", HelpText = "Write a log of the scan in the format used by ImgBurn.")]
public string IBGLogPath { get; set; }
}
public class FormatsSubOptions : CommonSubOptions
[Verb("formats", HelpText = "Lists all supported disc images, partition schemes and file systems.")]
public class FormatsOptions : CommonOptions
{
}
public class BenchmarkSubOptions : CommonSubOptions
[Verb("benchmark", HelpText = "Benchmarks hashing and entropy calculation.")]
public class BenchmarkOptions : CommonOptions
{
[Option('b', "block-size", Required = false, DefaultValue = (int)512, HelpText = "Block size.")]
[Option('b', "block-size", Required = false, Default = (int)512, HelpText = "Block size.")]
public int BlockSize { get; set; }
[Option('s', "buffer-size", Required = false, DefaultValue = (int)128, HelpText = "Buffer size in mebibytes.")]
[Option('s', "buffer-size", Required = false, Default = (int)128, HelpText = "Buffer size in mebibytes.")]
public int BufferSize { get; set; }
}
public class CreateSidecarSubOptions : CommonSubOptions
[Verb("create-sidecar", HelpText = "Creates CICM Metadata XML sidecar.")]
public class CreateSidecarOptions : CommonOptions
{
[Option('i', "input", Required = true, HelpText = "Disc image.")]
public string InputFile { get; set; }
}
public class DumpMediaSubOptions : CommonSubOptions
[Verb("dump-media", HelpText = "Dumps the media inserted on a device to a media image.")]
public class DumpMediaOptions : CommonOptions
{
[Option('i', "device", Required = true, HelpText = "Device path.")]
public string DevicePath { get; set; }
@@ -271,122 +285,43 @@ namespace DiscImageChef
[Option('w', "output-prefix", Required = true, HelpText = "Prefix for media dump.")]
public string OutputPrefix { get; set; }
[Option('r', "raw", DefaultValue = false,
[Option('r', "raw", Default = false,
HelpText = "Print sectors with tags included.")]
public bool Raw { get; set; }
[Option('s', "stop-on-error", DefaultValue = false,
[Option('s', "stop-on-error", Default = false,
HelpText = "Stop media dump on first error.")]
public bool StopOnError { get; set; }
[Option('f', "force", DefaultValue = false,
[Option('f', "force", Default = false,
HelpText = "Continue dump whatever happens.")]
public bool Force { get; set; }
[Option('p', "retry-passes", DefaultValue = (ushort)5,
[Option('p', "retry-passes", Default = (ushort)5,
HelpText = "How many retry passes to do.")]
public ushort RetryPasses { get; set; }
[Option("persistent", DefaultValue = false,
[Option("persistent", Default = false,
HelpText = "Try to recover partial or incorrect data.")]
public bool Persistent { get; set; }
}
public class DeviceReportSubOptions : CommonSubOptions
[Verb("device-report", HelpText = "Tests the device capabilities and creates an XML report of them.")]
public class DeviceReportOptions : CommonOptions
{
[Option('i', "device", Required = true, HelpText = "Device path.")]
public string DevicePath { get; set; }
}
public class ConfigureSubOptions : CommonSubOptions
[Verb("configure", HelpText = "Configures user settings and statistics.")]
public class ConfigureOptions
{
}
public class StatsSubOptions : CommonSubOptions
[Verb("stats", HelpText = "Shows statistics.")]
public class StatsOptions
{
}
public class Options
{
public Options()
{
AnalyzeVerb = new AnalyzeSubOptions();
CompareVerb = new CompareSubOptions();
ChecksumVerb = new ChecksumSubOptions();
EntropyVerb = new EntropySubOptions();
VerifyVerb = new VerifySubOptions();
FormatsVerb = new FormatsSubOptions();
PrintHexVerb = new PrintHexSubOptions();
DecodeVerb = new DecodeSubOptions();
DeviceInfoVerb = new DeviceInfoSubOptions();
MediaInfoVerb = new MediaInfoSubOptions();
BenchmarkVerb = new BenchmarkSubOptions();
CreateSidecarVerb = new CreateSidecarSubOptions();
MediaScanVerb = new MediaScanSubOptions();
DumpMediaVerb = new DumpMediaSubOptions();
DeviceReportVerb = new DeviceReportSubOptions();
ConfigureVerb = new ConfigureSubOptions();
StatsVerb = new StatsSubOptions();
}
[VerbOption("analyze", HelpText = "Analyzes a disc image and searches for partitions and/or filesystems.")]
public AnalyzeSubOptions AnalyzeVerb { get; set; }
[VerbOption("compare", HelpText = "Compares two disc images.")]
public CompareSubOptions CompareVerb { get; set; }
[VerbOption("checksum", HelpText = "Checksums an image.")]
public ChecksumSubOptions ChecksumVerb { get; set; }
[VerbOption("entropy", HelpText = "Calculates entropy and/or duplicated sectors of an image.")]
public EntropySubOptions EntropyVerb { get; set; }
[VerbOption("verify", HelpText = "Verifies a disc image integrity, and if supported, sector integrity.")]
public VerifySubOptions VerifyVerb { get; set; }
[VerbOption("printhex", HelpText = "Prints a sector, in hexadecimal values, to the console.")]
public PrintHexSubOptions PrintHexVerb { get; set; }
[VerbOption("decode", HelpText = "Decodes and pretty prints disk and/or sector tags.")]
public DecodeSubOptions DecodeVerb { get; set; }
[VerbOption("formats", HelpText = "Lists all supported disc images, partition schemes and file systems.")]
public FormatsSubOptions FormatsVerb { get; set; }
[VerbOption("device-info", HelpText = "Gets information about a device.")]
public DeviceInfoSubOptions DeviceInfoVerb { get; set; }
[VerbOption("media-info", HelpText = "Gets information about the media inserted on a device.")]
public MediaInfoSubOptions MediaInfoVerb { get; set; }
[VerbOption("benchmark", HelpText = "Benchmarks hashing and entropy calculation.")]
public BenchmarkSubOptions BenchmarkVerb { get; set; }
[VerbOption("create-sidecar", HelpText = "Creates CICM Metadata XML sidecar.")]
public CreateSidecarSubOptions CreateSidecarVerb { get; set; }
[VerbOption("media-scan", HelpText = "Scans the media inserted on a device.")]
public MediaScanSubOptions MediaScanVerb { get; set; }
[VerbOption("dump-media", HelpText = "Dumps the media inserted on a device to a media image.")]
public DumpMediaSubOptions DumpMediaVerb { get; set; }
[VerbOption("device-report", HelpText = "Tests the device capabilities and creates an XML report of them.")]
public DeviceReportSubOptions DeviceReportVerb { get; set; }
[VerbOption("configure", HelpText = "Configures user settings and statistics.")]
public ConfigureSubOptions ConfigureVerb { get; set; }
[VerbOption("stats", HelpText = "Shows statistics.")]
public StatsSubOptions StatsVerb { get; set; }
[HelpVerbOption]
public string DoHelpForVerb(string verbName)
{
return HelpText.AutoBuild(this, verbName);
}
}
}