From c57a42aaa3805e55ec60aef3cddefe7f379177bf Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 26 Dec 2019 01:41:05 +0000
Subject: [PATCH] Use database to check for maximum number of sectors to dump
 at once.

---
 DiscImageChef.Core/Devices/Dumping/ATA.cs |  5 ++---
 DiscImageChef.Core/Devices/Dumping/SBC.cs |  2 +-
 DiscImageChef.Core/Devices/Reader.cs      | 23 ++++++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/DiscImageChef.Core/Devices/Dumping/ATA.cs b/DiscImageChef.Core/Devices/Dumping/ATA.cs
index e84dfefd2..d346c2621 100644
--- a/DiscImageChef.Core/Devices/Dumping/ATA.cs
+++ b/DiscImageChef.Core/Devices/Dumping/ATA.cs
@@ -120,7 +120,7 @@ namespace DiscImageChef.Core.Devices.Dumping
                     }
 
                     // Check how many blocks to read, if error show and return
-                    if(ataReader.GetBlocksToRead())
+                    if(ataReader.GetBlocksToRead(_maximumReadable))
                     {
                         _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", ataReader.ErrorMessage);
                         ErrorMessage(ataReader.ErrorMessage);
@@ -612,8 +612,7 @@ namespace DiscImageChef.Core.Devices.Dumping
 
                         DateTime chkStart = DateTime.UtcNow;
 
-                        _sidecarClass =
-                            new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+                        _sidecarClass = new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
 
                         _sidecarClass.InitProgressEvent    += InitProgress;
                         _sidecarClass.UpdateProgressEvent  += UpdateProgress;
diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs
index 325e95dc0..ccb6987b9 100644
--- a/DiscImageChef.Core/Devices/Dumping/SBC.cs
+++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs
@@ -108,7 +108,7 @@ namespace DiscImageChef.Core.Devices.Dumping
             }
 
             // Check how many blocks to read, if error show and return
-            if(scsiReader.GetBlocksToRead())
+            if(scsiReader.GetBlocksToRead(_maximumReadable))
             {
                 _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", scsiReader.ErrorMessage);
                 StoppingErrorMessage?.Invoke(scsiReader.ErrorMessage);
diff --git a/DiscImageChef.Core/Devices/Reader.cs b/DiscImageChef.Core/Devices/Reader.cs
index 522691d33..d85eab523 100644
--- a/DiscImageChef.Core/Devices/Reader.cs
+++ b/DiscImageChef.Core/Devices/Reader.cs
@@ -37,13 +37,11 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Core.Devices
 {
-    /// <summary>
-    ///     Reduces common code used for scanning and dumping
-    /// </summary>
-    partial class Reader
+    /// <summary>Reduces common code used for scanning and dumping</summary>
+    internal partial class Reader
     {
-        Device dev;
-        uint   timeout;
+        readonly Device dev;
+        readonly uint   timeout;
 
         internal Reader(Device dev, uint timeout, byte[] identification, bool raw = false)
         {
@@ -56,7 +54,10 @@ namespace DiscImageChef.Core.Devices
             {
                 case DeviceType.ATA:
                     Identify.IdentifyDevice? ataIdNullable = Identify.Decode(identification);
-                    if(ataIdNullable.HasValue) ataId       = ataIdNullable.Value;
+
+                    if(ataIdNullable.HasValue)
+                        ataId = ataIdNullable.Value;
+
                     break;
                 case DeviceType.NVMe: throw new NotImplementedException("NVMe devices not yet supported.");
             }
@@ -81,6 +82,7 @@ namespace DiscImageChef.Core.Devices
                 case DeviceType.SCSI: return ScsiGetBlocks();
                 default:
                     ErrorMessage = $"Unknown device type {dev.Type}.";
+
                     return 0;
             }
         }
@@ -94,6 +96,7 @@ namespace DiscImageChef.Core.Devices
                 case DeviceType.SCSI: return ScsiFindReadCommand();
                 default:
                     ErrorMessage = $"Unknown device type {dev.Type}.";
+
                     return true;
             }
         }
@@ -107,6 +110,7 @@ namespace DiscImageChef.Core.Devices
                 case DeviceType.SCSI: return ScsiGetBlockSize();
                 default:
                     ErrorMessage = $"Unknown device type {dev.Type}.";
+
                     return true;
             }
         }
@@ -120,6 +124,7 @@ namespace DiscImageChef.Core.Devices
                 case DeviceType.SCSI: return ScsiGetBlocksToRead(startWithBlocks);
                 default:
                     ErrorMessage = $"Unknown device type {dev.Type}.";
+
                     return true;
             }
         }
@@ -140,6 +145,7 @@ namespace DiscImageChef.Core.Devices
                 default:
                     buffer   = null;
                     duration = 0d;
+
                     return true;
             }
         }
@@ -152,6 +158,7 @@ namespace DiscImageChef.Core.Devices
                 default:
                     buffer   = null;
                     duration = 0d;
+
                     return true;
             }
         }
@@ -165,6 +172,7 @@ namespace DiscImageChef.Core.Devices
                 case DeviceType.SCSI: return ScsiSeek(block, out duration);
                 default:
                     duration = 0d;
+
                     return true;
             }
         }
@@ -176,6 +184,7 @@ namespace DiscImageChef.Core.Devices
                 case DeviceType.ATA: return AtaSeekChs(cylinder, head, sector, out duration);
                 default:
                     duration = 0;
+
                     return true;
             }
         }