diff --git a/DiscImageChef.Core/Statistics.cs b/DiscImageChef.Core/Statistics.cs index 3a58d51ad..9620abd37 100644 --- a/DiscImageChef.Core/Statistics.cs +++ b/DiscImageChef.Core/Statistics.cs @@ -290,10 +290,18 @@ namespace DiscImageChef.Core AllStats.Commands.Entropy++; CurrentStats.Commands.Entropy++; break; + case "extract-files": + AllStats.Commands.Entropy++; + CurrentStats.Commands.Entropy++; + break; case "formats": AllStats.Commands.Formats++; CurrentStats.Commands.Formats++; break; + case "ls": + AllStats.Commands.Formats++; + CurrentStats.Commands.Formats++; + break; case "media-info": AllStats.Commands.MediaInfo++; CurrentStats.Commands.MediaInfo++; diff --git a/DiscImageChef.Metadata/Statistics.cs b/DiscImageChef.Metadata/Statistics.cs index 31a31d5b4..0763afab3 100644 --- a/DiscImageChef.Metadata/Statistics.cs +++ b/DiscImageChef.Metadata/Statistics.cs @@ -72,7 +72,9 @@ namespace DiscImageChef.Metadata public long DeviceReport; public long DumpMedia; public long Entropy; + public long ExtractFiles; public long Formats; + public long Ls; public long MediaInfo; public long MediaScan; public long PrintHex; diff --git a/DiscImageChef.Server/ChangeLog b/DiscImageChef.Server/ChangeLog index 877994f8e..f03d841aa 100644 --- a/DiscImageChef.Server/ChangeLog +++ b/DiscImageChef.Server/ChangeLog @@ -1,3 +1,11 @@ +2017-06-04 Natalia Portillo + + * Default.aspx: + * Default.aspx.cs: + * Default.aspx.designer.cs: + * UploadStatsController.cs: Store and show statistics for "ls" + and "extract-files" commands. + 2017-06-04 Natalia Portillo * UploadStatsController.cs: Added support for versions. diff --git a/DiscImageChef.Server/Controllers/UploadStatsController.cs b/DiscImageChef.Server/Controllers/UploadStatsController.cs index d5d88fc60..2b57bac77 100644 --- a/DiscImageChef.Server/Controllers/UploadStatsController.cs +++ b/DiscImageChef.Server/Controllers/UploadStatsController.cs @@ -107,6 +107,8 @@ namespace DiscImageChef.Server.Controllers oldStats.Commands.MediaScan += newStats.Commands.MediaScan; oldStats.Commands.PrintHex += newStats.Commands.PrintHex; oldStats.Commands.Verify += newStats.Commands.Verify; + oldStats.Commands.Ls += newStats.Commands.Ls; + oldStats.Commands.ExtractFiles += newStats.Commands.ExtractFiles; } } diff --git a/DiscImageChef.Server/Default.aspx b/DiscImageChef.Server/Default.aspx index a0d018efc..a7ebf686c 100644 --- a/DiscImageChef.Server/Default.aspx +++ b/DiscImageChef.Server/Default.aspx @@ -47,7 +47,9 @@ device-report command has been run times
dump-media command has been run times
entropy command has been run times
+ extract-files command has been run times
formats command has been run times
+ ls command has been run times
media-info command has been run times
media-scan command has been run times
printhex command has been run times
diff --git a/DiscImageChef.Server/Default.aspx.cs b/DiscImageChef.Server/Default.aspx.cs index addb10ff5..a182234d1 100644 --- a/DiscImageChef.Server/Default.aspx.cs +++ b/DiscImageChef.Server/Default.aspx.cs @@ -103,6 +103,8 @@ namespace DiscImageChef.Server lblCreateSidecar.Text = statistics.Commands.CreateSidecar.ToString(); lblDumpMedia.Text = statistics.Commands.DumpMedia.ToString(); lblDeviceReport.Text = statistics.Commands.DeviceReport.ToString(); + lblLs.Text = statistics.Commands.Ls.ToString(); + lblExtractFiles.Text = statistics.Commands.ExtractFiles.ToString(); } else divCommands.Visible = false; diff --git a/DiscImageChef.Server/Default.aspx.designer.cs b/DiscImageChef.Server/Default.aspx.designer.cs index d6dc7c68f..fdbd4523e 100644 --- a/DiscImageChef.Server/Default.aspx.designer.cs +++ b/DiscImageChef.Server/Default.aspx.designer.cs @@ -49,8 +49,12 @@ namespace DiscImageChef.Server { protected System.Web.UI.WebControls.Label lblEntropy; + protected System.Web.UI.WebControls.Label lblExtractFiles; + protected System.Web.UI.WebControls.Label lblFormats; + protected System.Web.UI.WebControls.Label lblLs; + protected System.Web.UI.WebControls.Label lblMediaInfo; protected System.Web.UI.WebControls.Label lblMediaScan; diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index f3db09e29..16cd6c9bf 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,6 @@ +* Commands/ExtractFiles.cs: + Store and show statistics for "ls" and "extract-files" commands. + * Commands/DeviceReport.cs: Don't generate report files with '/', '\\' or '?' characters. diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs index dfaf5cf3f..e599c18af 100644 --- a/DiscImageChef/Commands/ExtractFiles.cs +++ b/DiscImageChef/Commands/ExtractFiles.cs @@ -379,7 +379,7 @@ namespace DiscImageChef.Commands DicConsole.DebugWriteLine("Extract-Files command", ex.StackTrace); } - Core.Statistics.AddCommand("ls"); + Core.Statistics.AddCommand("extract-files"); } } }