Changeset 22 for trunk/UDriveScan.pas

Timestamp:

Apr 4, 2016, 12:24:37 AM (9 years ago)

Author:

chronos

Message:

• Modified: Show name in operation list.
• Fixed: Store scan run mode in project file.

File:

• trunk/UDriveScan.pas (modified) (9 diffs)

trunk/UDriveScan.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Syncobjs, UBlockMap, Forms, DOM,
-  UXMLUtils, Contnrs, UPhysDrive;
+  Classes, SysUtils, Syncobjs, UBlockMap, Forms, DOM, UConfig,
+  UXMLUtils, Contnrs;
 
 type
@@ -36 +36 @@
     WritePattern: Byte;
     procedure LoadFromDriveInfo(DriveInfo: TDriveInfo);
+  end;
+
+  { TTestStream }
+
+  TTestStream = class(TStream)
+  public
+    function Read(var Buffer; Count: Longint): Longint; override;
+    function Write(const Buffer; Count: Longint): Longint; override;
+    function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
   end;
 
@@ -68 +77 @@
     SectorStart: Integer;
     SectorEnd: Integer;
+    function GetName: string;
     function GetElapsedTime: TDateTime;
     procedure Reset;
@@ -106 +116 @@
 end;
 
+{ TTestStream }
+
+function TTestStream.Read(var Buffer; Count: Longint): Longint;
+begin
+//  if Random < 0.00001 then Result := 0
+//   else
+     Result := Count;
+end;
+
+function TTestStream.Write(const Buffer; Count: Longint): Longint;
+begin
+end;
+
+function TTestStream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
+begin
+end;
+
 { TDriveScanList }
 
@@ -206 +233 @@
 procedure TDriveScan.Run;
 var
-  F: TFileStream;
+  F: TStream;
   RealSize: Integer;
   Buffer: array of Byte;
@@ -213 +240 @@
     Lock.Acquire;
     Terminated := False;
-    if Mode = rmRead then F := TFileStream.Create(DriveName, fmOpenRead)
-      else if Mode = rmWrite then F := TFileStream.Create(DriveName, fmOpenReadWrite);
+    if ConfigTest then F := TTestStream.Create
+    else begin
+      if Mode = rmRead then F := TFileStream.Create(DriveName, fmOpenRead)
+        else if Mode = rmWrite then F := TFileStream.Create(DriveName, fmOpenReadWrite);
+    end;
     try
       SetLength(Buffer, SectorSize);
@@ -264 +294 @@
 end;
 
+function TDriveScan.GetName: string;
+begin
+  if Mode = rmRead then Result := 'Read'
+  else if Mode = rmWrite then Result := 'Write pattern $' + IntToHex(WritePattern, 2)
+  else Result := '';
+end;
+
 procedure TDriveScan.Stop;
 begin
@@ -305 +342 @@
   with Node do begin
     WriteInteger(Node, 'DamagedBlockCount', DamagedBlockCount);
+    WriteInteger(Node, 'RunMode', Integer(Mode));
     WriteInteger(Node, 'WritePattern', WritePattern);
     WriteString(Node, 'DriveName', DriveName);
@@ -327 +365 @@
   with Node do begin
     DamagedBlockCount := ReadInteger(Node, 'DamagedBlockCount', 0);
+    Mode := TRunMode(ReadInteger(Node, 'RunMode', 0));
     WritePattern := ReadInteger(Node, 'WritePattern', 0);
     DriveName := ReadString(Node, 'DriveName', '');