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

Move USB device reporting to non-static class and its UI to CLI.

Browse Source
This commit is contained in:
Natalia Portillo
2018-11-25 18:28:57 +00:00
parent 601da83a93
commit dc4be81e35
7 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
DiscImageChef.Core/Devices/Report/USB.cs
View File

@@ -30,17 +30,14 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using System;
using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Console;
using DiscImageChef.Devices;
namespace DiscImageChef.Core.Devices.Report
{
/// <summary>
/// Implements creating a report for a USB device
/// </summary>
static class Usb
public partial class DeviceReport
{
/// <summary>
/// Fills a device report with parameters specific to a USB device
@@ -49,21 +46,9 @@ namespace DiscImageChef.Core.Devices.Report
/// <param name="report">Device report</param>
/// <param name="removable">If device is removable</param>
/// <param name="debug">If debug is enabled</param>
internal static void Report(Device dev, ref DeviceReportV2 report, bool debug, ref bool removable)
public Usb UsbReport()
{
if(report == null) return;
ConsoleKeyInfo pressedKey = new ConsoleKeyInfo();
while(pressedKey.Key != ConsoleKey.Y && pressedKey.Key != ConsoleKey.N)
{
DicConsole.Write("Is the device natively USB (in case of doubt, press Y)? (Y/N): ");
pressedKey = System.Console.ReadKey();
DicConsole.WriteLine();
}
if(pressedKey.Key != ConsoleKey.Y) return;
report.USB = new CommonTypes.Metadata.Usb
Usb usbReport = new Usb
{
Manufacturer = dev.UsbManufacturerString,
Product = dev.UsbProductString,
@@ -71,17 +56,9 @@ namespace DiscImageChef.Core.Devices.Report
VendorID = dev.UsbVendorId
};
pressedKey = new ConsoleKeyInfo();
while(pressedKey.Key != ConsoleKey.Y && pressedKey.Key != ConsoleKey.N)
{
DicConsole.Write("Is the media removable from the reading/writing elements? (Y/N): ");
pressedKey = System.Console.ReadKey();
DicConsole.WriteLine();
}
if(debug) usbReport.Descriptors = dev.UsbDescriptors;
report.USB.RemovableMedia = pressedKey.Key == ConsoleKey.Y;
removable = report.USB.RemovableMedia;
if(debug) report.USB.Descriptors = dev.UsbDescriptors;
return usbReport;
}
}
}