From 03573f1cb6fd3a66b32cce94efa1d339b71d93f4 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 3 Jan 2020 18:24:44 +0000
Subject: [PATCH] Rename commands and add aliases.

---
 .../.idea.DiscImageChef/.idea/contentModel.xml | 18 +++++++++---------
 DiscImageChef/Commands/Device/DeviceFamily.cs  |  1 -
 DiscImageChef/Commands/Device/DeviceReport.cs  |  2 +-
 .../Device/{ListDevices.cs => Devices.cs}      |  4 ++--
 .../Commands/Device/{DeviceInfo.cs => Info.cs} |  2 +-
 .../Commands/Filesystem/ExtractFiles.cs        |  4 ++--
 DiscImageChef/Commands/Filesystem/Ls.cs        |  6 ++++--
 .../Filesystem/{ListOptions.cs => Options.cs}  |  4 ++--
 DiscImageChef/Commands/Image/Checksum.cs       |  2 ++
 DiscImageChef/Commands/Image/Compare.cs        |  2 ++
 .../Image/{ConvertImage.cs => Convert.cs}      |  2 +-
 .../Commands/Image/{ImageInfo.cs => Info.cs}   |  2 +-
 .../Commands/Image/{PrintHex.cs => Print.cs}   |  2 +-
 .../Commands/Media/{DumpMedia.cs => Dump.cs}   |  4 ++--
 .../Commands/Media/{MediaInfo.cs => Info.cs}   |  4 ++--
 .../Commands/Media/{MediaScan.cs => Scan.cs}   |  4 ++--
 DiscImageChef/DiscImageChef.csproj             | 18 +++++++++---------
 17 files changed, 43 insertions(+), 38 deletions(-)
 rename DiscImageChef/Commands/Device/{ListDevices.cs => Devices.cs} (97%)
 rename DiscImageChef/Commands/Device/{DeviceInfo.cs => Info.cs} (99%)
 rename DiscImageChef/Commands/Filesystem/{ListOptions.cs => Options.cs} (98%)
 rename DiscImageChef/Commands/Image/{ConvertImage.cs => Convert.cs} (99%)
 rename DiscImageChef/Commands/Image/{ImageInfo.cs => Info.cs} (98%)
 rename DiscImageChef/Commands/Image/{PrintHex.cs => Print.cs} (98%)
 rename DiscImageChef/Commands/Media/{DumpMedia.cs => Dump.cs} (99%)
 rename DiscImageChef/Commands/Media/{MediaInfo.cs => Info.cs} (99%)
 rename DiscImageChef/Commands/Media/{MediaScan.cs => Scan.cs} (98%)

diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 9317b7a0e..8edcafaf2 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -34,37 +34,37 @@
           </e>
           <e p="Device" t="Include">
             <e p="DeviceFamily.cs" t="Include" />
-            <e p="DeviceInfo.cs" t="Include" />
             <e p="DeviceReport.cs" t="Include" />
-            <e p="ListDevices.cs" t="Include" />
+            <e p="Devices.cs" t="Include" />
+            <e p="Info.cs" t="Include" />
           </e>
           <e p="Filesystem" t="Include">
             <e p="ExtractFiles.cs" t="Include" />
             <e p="FilesystemFamily.cs" t="Include" />
-            <e p="ListOptions.cs" t="Include" />
             <e p="Ls.cs" t="Include" />
+            <e p="Options.cs" t="Include" />
           </e>
           <e p="Formats.cs" t="Include" />
           <e p="Image" t="Include">
             <e p="Analyze.cs" t="Include" />
             <e p="Checksum.cs" t="Include" />
             <e p="Compare.cs" t="Include" />
-            <e p="ConvertImage.cs" t="Include" />
+            <e p="Convert.cs" t="Include" />
             <e p="CreateSidecar.cs" t="Include" />
             <e p="Decode.cs" t="Include" />
             <e p="Entropy.cs" t="Include" />
             <e p="ImageFamily.cs" t="Include" />
-            <e p="ImageInfo.cs" t="Include" />
-            <e p="PrintHex.cs" t="Include" />
+            <e p="Info.cs" t="Include" />
+            <e p="Print.cs" t="Include" />
             <e p="Verify.cs" t="Include" />
           </e>
           <e p="ListEncodings.cs" t="Include" />
           <e p="ListNamespaces.cs" t="Include" />
           <e p="Media" t="Include">
-            <e p="DumpMedia.cs" t="Include" />
+            <e p="Dump.cs" t="Include" />
+            <e p="Info.cs" t="Include" />
             <e p="MediaFamily.cs" t="Include" />
-            <e p="MediaInfo.cs" t="Include" />
-            <e p="MediaScan.cs" t="Include" />
+            <e p="Scan.cs" t="Include" />
           </e>
           <e p="Remote.cs" t="Include" />
         </e>
diff --git a/DiscImageChef/Commands/Device/DeviceFamily.cs b/DiscImageChef/Commands/Device/DeviceFamily.cs
index 41fd592c6..464e581c4 100644
--- a/DiscImageChef/Commands/Device/DeviceFamily.cs
+++ b/DiscImageChef/Commands/Device/DeviceFamily.cs
@@ -38,7 +38,6 @@ namespace DiscImageChef.Commands.Device
     {
         public DeviceFamily() : base("device", "Commands that talks to devices")
         {
-            AddAlias("d");
             AddAlias("dev");
 
             AddCommand(new DeviceInfoCommand());
diff --git a/DiscImageChef/Commands/Device/DeviceReport.cs b/DiscImageChef/Commands/Device/DeviceReport.cs
index 6bd0c74b3..2ab8d5e8c 100644
--- a/DiscImageChef/Commands/Device/DeviceReport.cs
+++ b/DiscImageChef/Commands/Device/DeviceReport.cs
@@ -54,7 +54,7 @@ namespace DiscImageChef.Commands.Device
 {
     internal class DeviceReportCommand : Command
     {
-        public DeviceReportCommand() : base("device-report",
+        public DeviceReportCommand() : base("report",
                                             "Tests the device capabilities and creates an JSON report of them.")
         {
             AddArgument(new Argument<string>
diff --git a/DiscImageChef/Commands/Device/ListDevices.cs b/DiscImageChef/Commands/Device/Devices.cs
similarity index 97%
rename from DiscImageChef/Commands/Device/ListDevices.cs
rename to DiscImageChef/Commands/Device/Devices.cs
index d78121bd9..c110c11e9 100644
--- a/DiscImageChef/Commands/Device/ListDevices.cs
+++ b/DiscImageChef/Commands/Device/Devices.cs
@@ -38,11 +38,11 @@ using DiscImageChef.Console;
 using DiscImageChef.Core;
 using DiscImageChef.Devices;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Device
 {
     internal class ListDevicesCommand : Command
     {
-        public ListDevicesCommand() : base("list-devices", "Lists all connected devices.")
+        public ListDevicesCommand() : base("list", "Lists all connected devices.")
         {
             AddArgument(new Argument<string>
             {
diff --git a/DiscImageChef/Commands/Device/DeviceInfo.cs b/DiscImageChef/Commands/Device/Info.cs
similarity index 99%
rename from DiscImageChef/Commands/Device/DeviceInfo.cs
rename to DiscImageChef/Commands/Device/Info.cs
index 563ee6bdb..7e2bee24c 100644
--- a/DiscImageChef/Commands/Device/DeviceInfo.cs
+++ b/DiscImageChef/Commands/Device/Info.cs
@@ -52,7 +52,7 @@ namespace DiscImageChef.Commands.Device
 {
     internal class DeviceInfoCommand : Command
     {
-        public DeviceInfoCommand() : base("device-info", "Gets information about a device.")
+        public DeviceInfoCommand() : base("info", "Gets information about a device.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/Commands/Filesystem/ExtractFiles.cs b/DiscImageChef/Commands/Filesystem/ExtractFiles.cs
index a2686aaa4..480411f48 100644
--- a/DiscImageChef/Commands/Filesystem/ExtractFiles.cs
+++ b/DiscImageChef/Commands/Filesystem/ExtractFiles.cs
@@ -44,11 +44,11 @@ using DiscImageChef.Console;
 using DiscImageChef.Core;
 using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Filesystem
 {
     internal class ExtractFilesCommand : Command
     {
-        public ExtractFilesCommand() : base("extract-files", "Extracts all files in disc image.")
+        public ExtractFilesCommand() : base("extract", "Extracts all files in disc image.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/Commands/Filesystem/Ls.cs b/DiscImageChef/Commands/Filesystem/Ls.cs
index 9b2d1aec1..4ee8dd86d 100644
--- a/DiscImageChef/Commands/Filesystem/Ls.cs
+++ b/DiscImageChef/Commands/Filesystem/Ls.cs
@@ -43,12 +43,14 @@ using DiscImageChef.CommonTypes.Structs;
 using DiscImageChef.Console;
 using DiscImageChef.Core;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Filesystem
 {
     internal class LsCommand : Command
     {
-        public LsCommand() : base("ls", "Lists files in disc image.")
+        public LsCommand() : base("list", "Lists files in disc image.")
         {
+            AddAlias("ls");
+
             Add(new Option(new[]
                 {
                     "--encoding", "-e"
diff --git a/DiscImageChef/Commands/Filesystem/ListOptions.cs b/DiscImageChef/Commands/Filesystem/Options.cs
similarity index 98%
rename from DiscImageChef/Commands/Filesystem/ListOptions.cs
rename to DiscImageChef/Commands/Filesystem/Options.cs
index 29614ec43..00b74286e 100644
--- a/DiscImageChef/Commands/Filesystem/ListOptions.cs
+++ b/DiscImageChef/Commands/Filesystem/Options.cs
@@ -41,11 +41,11 @@ using DiscImageChef.CommonTypes.Interfaces;
 using DiscImageChef.Console;
 using DiscImageChef.Core;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Filesystem
 {
     internal class ListOptionsCommand : Command
     {
-        public ListOptionsCommand() : base("list-options",
+        public ListOptionsCommand() : base("options",
                                            "Lists all options supported by read-only filesystems and writable media images.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
diff --git a/DiscImageChef/Commands/Image/Checksum.cs b/DiscImageChef/Commands/Image/Checksum.cs
index 88c818acf..a099d2bc8 100644
--- a/DiscImageChef/Commands/Image/Checksum.cs
+++ b/DiscImageChef/Commands/Image/Checksum.cs
@@ -51,6 +51,8 @@ namespace DiscImageChef.Commands.Image
 
         public ChecksumCommand() : base("checksum", "Checksums an image.")
         {
+            AddAlias("chk");
+
             Add(new Option(new[]
                 {
                     "--adler32", "-a"
diff --git a/DiscImageChef/Commands/Image/Compare.cs b/DiscImageChef/Commands/Image/Compare.cs
index 5c5f97bbd..d9bd25abf 100644
--- a/DiscImageChef/Commands/Image/Compare.cs
+++ b/DiscImageChef/Commands/Image/Compare.cs
@@ -49,6 +49,8 @@ namespace DiscImageChef.Commands.Image
     {
         public CompareCommand() : base("compare", "Compares two disc images.")
         {
+            AddAlias("cmp");
+
             AddArgument(new Argument<string>
             {
                 Arity = ArgumentArity.ExactlyOne, Description = "First media image path", Name = "image-path1"
diff --git a/DiscImageChef/Commands/Image/ConvertImage.cs b/DiscImageChef/Commands/Image/Convert.cs
similarity index 99%
rename from DiscImageChef/Commands/Image/ConvertImage.cs
rename to DiscImageChef/Commands/Image/Convert.cs
index 851015156..8a0de5e9d 100644
--- a/DiscImageChef/Commands/Image/ConvertImage.cs
+++ b/DiscImageChef/Commands/Image/Convert.cs
@@ -52,7 +52,7 @@ namespace DiscImageChef.Commands.Image
 {
     internal class ConvertImageCommand : Command
     {
-        public ConvertImageCommand() : base("convert-image", "Converts one image to another format.")
+        public ConvertImageCommand() : base("convert", "Converts one image to another format.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/Commands/Image/ImageInfo.cs b/DiscImageChef/Commands/Image/Info.cs
similarity index 98%
rename from DiscImageChef/Commands/Image/ImageInfo.cs
rename to DiscImageChef/Commands/Image/Info.cs
index aba1564a1..d10ce6058 100644
--- a/DiscImageChef/Commands/Image/ImageInfo.cs
+++ b/DiscImageChef/Commands/Image/Info.cs
@@ -43,7 +43,7 @@ namespace DiscImageChef.Commands.Image
 {
     internal class ImageInfoCommand : Command
     {
-        public ImageInfoCommand() : base("image-info",
+        public ImageInfoCommand() : base("info",
                                          "Opens a media image and shows information about the media it represents and metadata.")
         {
             AddArgument(new Argument<string>
diff --git a/DiscImageChef/Commands/Image/PrintHex.cs b/DiscImageChef/Commands/Image/Print.cs
similarity index 98%
rename from DiscImageChef/Commands/Image/PrintHex.cs
rename to DiscImageChef/Commands/Image/Print.cs
index 510ceb27f..0bafd5e70 100644
--- a/DiscImageChef/Commands/Image/PrintHex.cs
+++ b/DiscImageChef/Commands/Image/Print.cs
@@ -42,7 +42,7 @@ namespace DiscImageChef.Commands.Image
 {
     internal class PrintHexCommand : Command
     {
-        public PrintHexCommand() : base("printhex", "Prints a sector, in hexadecimal values, to the console.")
+        public PrintHexCommand() : base("print", "Prints a sector, in hexadecimal values, to the console.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/Commands/Media/DumpMedia.cs b/DiscImageChef/Commands/Media/Dump.cs
similarity index 99%
rename from DiscImageChef/Commands/Media/DumpMedia.cs
rename to DiscImageChef/Commands/Media/Dump.cs
index dbb7767dc..b96383d56 100644
--- a/DiscImageChef/Commands/Media/DumpMedia.cs
+++ b/DiscImageChef/Commands/Media/Dump.cs
@@ -49,12 +49,12 @@ using DiscImageChef.Core.Logging;
 using DiscImageChef.Devices;
 using Schemas;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Media
 {
     // TODO: Add raw dumping
     internal class DumpMediaCommand : Command
     {
-        public DumpMediaCommand() : base("dump-media", "Dumps the media inserted on a device to a media image.")
+        public DumpMediaCommand() : base("dump", "Dumps the media inserted on a device to a media image.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/Commands/Media/MediaInfo.cs b/DiscImageChef/Commands/Media/Info.cs
similarity index 99%
rename from DiscImageChef/Commands/Media/MediaInfo.cs
rename to DiscImageChef/Commands/Media/Info.cs
index 82bd1a999..0a3c3d04c 100644
--- a/DiscImageChef/Commands/Media/MediaInfo.cs
+++ b/DiscImageChef/Commands/Media/Info.cs
@@ -59,11 +59,11 @@ using DMI = DiscImageChef.Decoders.Xbox.DMI;
 using Session = DiscImageChef.Decoders.CD.Session;
 using Spare = DiscImageChef.Decoders.DVD.Spare;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Media
 {
     internal class MediaInfoCommand : Command
     {
-        public MediaInfoCommand() : base("media-info", "Gets information about the media inserted on a device.")
+        public MediaInfoCommand() : base("info", "Gets information about the media inserted on a device.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/Commands/Media/MediaScan.cs b/DiscImageChef/Commands/Media/Scan.cs
similarity index 98%
rename from DiscImageChef/Commands/Media/MediaScan.cs
rename to DiscImageChef/Commands/Media/Scan.cs
index 33fea0fc5..14b0e6c04 100644
--- a/DiscImageChef/Commands/Media/MediaScan.cs
+++ b/DiscImageChef/Commands/Media/Scan.cs
@@ -38,11 +38,11 @@ using DiscImageChef.Core;
 using DiscImageChef.Core.Devices.Scanning;
 using DiscImageChef.Devices;
 
-namespace DiscImageChef.Commands
+namespace DiscImageChef.Commands.Media
 {
     internal class MediaScanCommand : Command
     {
-        public MediaScanCommand() : base("media-scan", "Scans the media inserted on a device.")
+        public MediaScanCommand() : base("scan", "Scans the media inserted on a device.")
         {
             Add(new Option(new[]
                 {
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index d8d4e084e..6684ed5dc 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -57,30 +57,30 @@
     <Compile Include="Commands\Database\Statistics.cs" />
     <Compile Include="Commands\Database\Update.cs" />
     <Compile Include="Commands\Device\DeviceFamily.cs" />
-    <Compile Include="Commands\Device\DeviceInfo.cs" />
+    <Compile Include="Commands\Device\Info.cs" />
     <Compile Include="Commands\Device\DeviceReport.cs" />
-    <Compile Include="Commands\Device\ListDevices.cs" />
+    <Compile Include="Commands\Device\Devices.cs" />
     <Compile Include="Commands\Filesystem\ExtractFiles.cs" />
     <Compile Include="Commands\Filesystem\FilesystemFamily.cs" />
-    <Compile Include="Commands\Filesystem\ListOptions.cs" />
+    <Compile Include="Commands\Filesystem\Options.cs" />
     <Compile Include="Commands\Filesystem\Ls.cs" />
     <Compile Include="Commands\Formats.cs" />
     <Compile Include="Commands\Image\Analyze.cs" />
     <Compile Include="Commands\Image\Checksum.cs" />
     <Compile Include="Commands\Image\Compare.cs" />
-    <Compile Include="Commands\Image\ConvertImage.cs" />
+    <Compile Include="Commands\Image\Convert.cs" />
     <Compile Include="Commands\Image\CreateSidecar.cs" />
     <Compile Include="Commands\Image\Decode.cs" />
     <Compile Include="Commands\Image\Entropy.cs" />
     <Compile Include="Commands\Image\ImageFamily.cs" />
-    <Compile Include="Commands\Image\ImageInfo.cs" />
-    <Compile Include="Commands\Image\PrintHex.cs" />
+    <Compile Include="Commands\Image\Info.cs" />
+    <Compile Include="Commands\Image\Print.cs" />
     <Compile Include="Commands\Image\Verify.cs" />
     <Compile Include="Commands\ListNamespaces.cs" />
-    <Compile Include="Commands\Media\DumpMedia.cs" />
+    <Compile Include="Commands\Media\Dump.cs" />
     <Compile Include="Commands\Media\MediaFamily.cs" />
-    <Compile Include="Commands\Media\MediaInfo.cs" />
-    <Compile Include="Commands\Media\MediaScan.cs" />
+    <Compile Include="Commands\Media\Info.cs" />
+    <Compile Include="Commands\Media\Scan.cs" />
     <Compile Include="Commands\Remote.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="Commands\Configure.cs" />