diff --git a/.gitmodules b/.gitmodules
index 95912de8..e2332b5f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
[submodule "CICMMetadata"]
path = CICMMetadata
url = https://github.com/claunia/CICMMetadata
-[submodule "commandline"]
- path = commandline
- url = https://github.com/claunia/commandline
[submodule "Claunia.RsrcFork"]
path = Claunia.RsrcFork
url = https://github.com/claunia/Claunia.RsrcFork
diff --git a/DiscImageChef.sln b/DiscImageChef.sln
index f731a9bc..75004c3e 100644
--- a/DiscImageChef.sln
+++ b/DiscImageChef.sln
@@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Metadata", "D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Settings", "DiscImageChef.Settings\DiscImageChef.Settings.csproj", "{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "commandline\src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Claunia.RsrcFork", "Claunia.RsrcFork\Claunia.RsrcFork\Claunia.RsrcFork.csproj", "{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Filters", "DiscImageChef.Filters\DiscImageChef.Filters.csproj", "{D571B8EF-903D-4353-BDD5-B834F9F029EF}"
@@ -91,10 +89,6 @@ Global
{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|x86.Build.0 = Debug|Any CPU
{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.ActiveCfg = Release|Any CPU
{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.Build.0 = Release|Any CPU
- {E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Debug|x86.Build.0 = Debug|Any CPU
- {E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Release|x86.ActiveCfg = Release|Any CPU
- {E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Release|x86.Build.0 = Release|Any CPU
{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Debug|x86.ActiveCfg = Debug|Any CPU
{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Debug|x86.Build.0 = Debug|Any CPU
{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Release|x86.ActiveCfg = Release|Any CPU
@@ -108,34 +102,12 @@ Global
Policies = $0
$0.StandardHeader = $1
$1.Text = @/***************************************************************************\nThe Disc Image Chef\n----------------------------------------------------------------------------\n \nFilename : ${FileName}\nVersion : 1.0\nAuthor(s) : ${AuthorName}\n \nComponent : Component\n\nRevision : $Revision$\nLast change by : $Author$\nDate : $Date$\n \n--[ Description ] ----------------------------------------------------------\n \nDescription\n \n--[ License ] --------------------------------------------------------------\n \n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as\n published by the Free Software Foundation, either version 3 of the\n License, or (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see .\n\n----------------------------------------------------------------------------\nCopyright (C) 2011-2015 Claunia.com\n****************************************************************************/\n//$Id$
- $1.IncludeInNewFiles = True
$0.TextStylePolicy = $2
- $2.inheritsSet = VisualStudio
- $2.inheritsScope = text/plain
$2.scope = text/x-csharp
- $2.FileWidth = 120
+ $2.TabsToSpaces = True
$0.CSharpFormattingPolicy = $3
- $3.SpacingAfterMethodDeclarationName = False
- $3.SpaceAfterMethodCallName = False
- $3.inheritsSet = Mono
- $3.inheritsScope = text/x-csharp
$3.scope = text/x-csharp
- $3.NewLinesForBracesInProperties = True
- $3.NewLinesForBracesInAccessors = True
- $3.NewLinesForBracesInAnonymousMethods = True
- $3.NewLinesForBracesInControlBlocks = True
- $3.NewLinesForBracesInAnonymousTypes = True
- $3.NewLinesForBracesInObjectCollectionArrayInitializers = True
- $3.NewLinesForBracesInLambdaExpressionBody = True
- $3.NewLineForElse = True
- $3.NewLineForCatch = True
- $3.NewLineForFinally = True
- $3.SpaceBeforeOpenSquareBracket = False
$3.IndentBraces = True
- $3.IndentSwitchSection = True
- $3.NewLineForMembersInObjectInit = True
- $3.NewLineForMembersInAnonymousTypes = True
- $3.NewLineForClausesInQuery = True
$3.IndentBlock = False
$3.IndentSwitchCaseSection = False
$3.SpaceAfterControlFlowStatementKeyword = False
@@ -281,7 +253,6 @@ Global
$31.Indent = @\t
$31.LastFilePostfix = "@:\n "
$31.IncludeDirectoryPaths = True
- $30.inheritsSet = Mono
description = The Disc Image Chef.
version = 3.2.99.2
EndGlobalSection
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index 37720afe..220c7888 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -37,6 +37,9 @@
+
+ ..\packages\CommandLineParser.2.1.1-beta\lib\net40\CommandLine.dll
+
@@ -80,14 +83,22 @@
-
+
+
+
-
-
+
+
+
+
+
+
+
+
@@ -141,9 +152,18 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -179,6 +199,7 @@
TESTING.md
PreserveNewest
+
@@ -229,10 +250,6 @@
{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}
DiscImageChef.Settings
-
- {E1BD3C65-49C3-49E7-BABA-C60980CB3F20}
- CommandLine
-
{D571B8EF-903D-4353-BDD5-B834F9F029EF}
DiscImageChef.Filters
diff --git a/DiscImageChef/Main.cs b/DiscImageChef/Main.cs
index 4b09965b..aeb06dcc 100644
--- a/DiscImageChef/Main.cs
+++ b/DiscImageChef/Main.cs
@@ -48,9 +48,14 @@ namespace DiscImageChef
Settings.Settings.LoadSettings();
Core.Statistics.LoadStats();
- Parser.Default.ParseArguments(args)
+ Parser.Default.ParseArguments(args, new[] {typeof(AnalyzeOptions), typeof(CompareOptions), typeof(ChecksumOptions),
+ typeof(EntropyOptions), typeof(VerifyOptions), typeof(PrintHexOptions),
+ typeof(DecodeOptions), typeof(DeviceInfoOptions), typeof(MediaInfoOptions),
+ typeof(MediaScanOptions), typeof(FormatsOptions), typeof(BenchmarkOptions),
+ typeof(CreateSidecarOptions),
+ typeof(DumpMediaOptions), typeof(DeviceReportOptions),
+ typeof(ConfigureOptions), typeof(StatsOptions), typeof(LsOptions),
+ typeof(ExtractFilesOptions)})
.WithParsed(opts =>
{
if(opts.Debug)
diff --git a/DiscImageChef/packages.config b/DiscImageChef/packages.config
new file mode 100644
index 00000000..d34c1336
--- /dev/null
+++ b/DiscImageChef/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/commandline b/commandline
deleted file mode 160000
index a9ab54fb..00000000
--- a/commandline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9ab54fb647952c05060f9f5c95e93bcdc46f9f7