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

Write remote information in dump log.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-21 23:36:57 +01:00
parent 92384ac816
commit 8a0d073c27
2 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DiscImageChef.Core/Logging/DumpLog.cs
View File

@@ -36,7 +36,6 @@ using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes.Interop; using DiscImageChef.CommonTypes.Interop;
using DiscImageChef.Devices; using DiscImageChef.Devices;
using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID;
using Version = DiscImageChef.CommonTypes.Interop.Version; using Version = DiscImageChef.CommonTypes.Interop.Version;
namespace DiscImageChef.Core.Logging namespace DiscImageChef.Core.Logging
@@ -46,7 +45,7 @@ namespace DiscImageChef.Core.Logging
/// </summary> /// </summary>
public class DumpLog public class DumpLog
{ {
readonly StreamWriter logSw; private readonly StreamWriter logSw;
/// <summary> /// <summary>
/// Initializes the dump log /// Initializes the dump log
@@ -55,23 +54,23 @@ namespace DiscImageChef.Core.Logging
/// <param name="dev">Device</param> /// <param name="dev">Device</param>
public DumpLog(string outputFile, Device dev) public DumpLog(string outputFile, Device dev)
{ {
if(string.IsNullOrEmpty(outputFile)) return; if (string.IsNullOrEmpty(outputFile)) return;
logSw = new StreamWriter(outputFile, true); logSw = new StreamWriter(outputFile, true);
logSw.WriteLine("Start logging at {0}", DateTime.Now); logSw.WriteLine("Start logging at {0}", DateTime.Now);
PlatformID platId = DetectOS.GetRealPlatformID(); var platId = DetectOS.GetRealPlatformID();
string platVer = DetectOS.GetVersion(); var platVer = DetectOS.GetVersion();
AssemblyInformationalVersionAttribute assemblyVersion = var assemblyVersion =
Attribute.GetCustomAttribute(typeof(DumpLog).Assembly, typeof(AssemblyInformationalVersionAttribute)) as Attribute.GetCustomAttribute(typeof(DumpLog).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
AssemblyInformationalVersionAttribute; AssemblyInformationalVersionAttribute;
logSw.WriteLine("################# System information #################"); logSw.WriteLine("################# System information #################");
logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer, logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer,
Environment.Is64BitOperatingSystem ? 64 : 32); Environment.Is64BitOperatingSystem ? 64 : 32);
if(DetectOS.IsMono) logSw.WriteLine("Mono {0}", Version.GetMonoVersion()); if (DetectOS.IsMono) logSw.WriteLine("Mono {0}", Version.GetMonoVersion());
else if(DetectOS.IsNetCore) logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion()); else if (DetectOS.IsNetCore) logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
else logSw.WriteLine(RuntimeInformation.FrameworkDescription); else logSw.WriteLine(RuntimeInformation.FrameworkDescription);
logSw.WriteLine(); logSw.WriteLine();
@@ -79,12 +78,24 @@ namespace DiscImageChef.Core.Logging
logSw.WriteLine("################# Program information ################"); logSw.WriteLine("################# Program information ################");
logSw.WriteLine("DiscImageChef {0}", assemblyVersion?.InformationalVersion); logSw.WriteLine("DiscImageChef {0}", assemblyVersion?.InformationalVersion);
logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32); logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
#if DEBUG #if DEBUG
logSw.WriteLine("DEBUG version"); logSw.WriteLine("DEBUG version");
#endif #endif
logSw.WriteLine("Command line: {0}", Environment.CommandLine); logSw.WriteLine("Command line: {0}", Environment.CommandLine);
logSw.WriteLine(); logSw.WriteLine();
if (dev.IsRemote)
{
logSw.WriteLine("################# Remote information #################");
logSw.WriteLine("Server: {0}", dev.RemoteApplication);
logSw.WriteLine("Version: {0}", dev.RemoteVersion);
logSw.WriteLine("Operating system: {0} {1}", dev.RemoteOperatingSystem,
dev.RemoteOperatingSystemVersion);
logSw.WriteLine("Architecture: {0}", dev.RemoteArchitecture);
logSw.WriteLine("Protocol version: {0}", dev.RemoteProtocolVersion);
logSw.WriteLine("######################################################");
}
logSw.WriteLine("################# Device information #################"); logSw.WriteLine("################# Device information #################");
logSw.WriteLine("Manufacturer: {0}", dev.Manufacturer); logSw.WriteLine("Manufacturer: {0}", dev.Manufacturer);
logSw.WriteLine("Model: {0}", dev.Model); logSw.WriteLine("Model: {0}", dev.Model);
@@ -95,7 +106,7 @@ namespace DiscImageChef.Core.Logging
logSw.WriteLine("CompactFlash device: {0}", dev.IsCompactFlash); logSw.WriteLine("CompactFlash device: {0}", dev.IsCompactFlash);
logSw.WriteLine("PCMCIA device: {0}", dev.IsPcmcia); logSw.WriteLine("PCMCIA device: {0}", dev.IsPcmcia);
logSw.WriteLine("USB device: {0}", dev.IsUsb); logSw.WriteLine("USB device: {0}", dev.IsUsb);
if(dev.IsUsb) if (dev.IsUsb)
{ {
logSw.WriteLine("USB manufacturer: {0}", dev.UsbManufacturerString); logSw.WriteLine("USB manufacturer: {0}", dev.UsbManufacturerString);
logSw.WriteLine("USB product: {0}", dev.UsbProductString); logSw.WriteLine("USB product: {0}", dev.UsbProductString);
@@ -105,7 +116,7 @@ namespace DiscImageChef.Core.Logging
} }
logSw.WriteLine("FireWire device: {0}", dev.IsFireWire); logSw.WriteLine("FireWire device: {0}", dev.IsFireWire);
if(dev.IsFireWire) if (dev.IsFireWire)
{ {
logSw.WriteLine("FireWire vendor: {0}", dev.FireWireVendorName); logSw.WriteLine("FireWire vendor: {0}", dev.FireWireVendorName);
logSw.WriteLine("FireWire model: {0}", dev.FireWireModelName); logSw.WriteLine("FireWire model: {0}", dev.FireWireModelName);
@@ -114,7 +125,6 @@ namespace DiscImageChef.Core.Logging
logSw.WriteLine("FireWire product ID: 0x{0:X8}", dev.FireWireModel); logSw.WriteLine("FireWire product ID: 0x{0:X8}", dev.FireWireModel);
} }
logSw.WriteLine();
logSw.WriteLine("######################################################"); logSw.WriteLine("######################################################");
logSw.WriteLine(); logSw.WriteLine();
@@ -129,9 +139,9 @@ namespace DiscImageChef.Core.Logging
/// <param name="args">Arguments</param> /// <param name="args">Arguments</param>
public void WriteLine(string format, params object[] args) public void WriteLine(string format, params object[] args)
{ {
if(logSw == null) return; if (logSw == null) return;
string text = string.Format(format, args); var text = string.Format(format, args);
logSw.WriteLine("{0:s} {1}", DateTime.Now, text); logSw.WriteLine("{0:s} {1}", DateTime.Now, text);
logSw.Flush(); logSw.Flush();
} }

8
DiscImageChef.Devices/Device/Variables.cs
View File

@@ -219,5 +219,13 @@ namespace DiscImageChef.Devices
public byte[] Cis { get; } public byte[] Cis { get; }
private readonly Remote.Remote remote; private readonly Remote.Remote remote;
public bool IsRemote => remote != null;
public string RemoteApplication => remote?.ServerApplication;
public string RemoteVersion => remote?.ServerVersion;
public string RemoteOperatingSystem => remote?.ServerOperatingSystem;
public string RemoteOperatingSystemVersion => remote?.ServerOperatingSystemVersion;
public string RemoteArchitecture => remote?.ServerArchitecture;
public int RemoteProtocolVersion => remote?.ServerProtocolVersion ?? 0;
} }
} }