Changeset 10 for trunk/UDriveScan.pas

Timestamp:

Apr 2, 2016, 12:02:59 AM (8 years ago)

Author:

chronos

Message:

• Added support for continue previous stopped scan.
• Modified: Allow to scan only part of drive by specifiing start and end sector.
• Added: Table showing list of operations in project.
• Added: Allow to create new project and close project.

File:

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

trunk/UDriveScan.pas

@@ -25 +25 @@
   TDriveScan = class
   private
+    FDriveName: string;
     FOnChange: TNotifyEvent;
     FOnTerminate: TNotifyEvent;
+    FSectorCurrent: Integer;
     ScanThread: TScanThread;
     procedure DoChange;
     procedure DoTerminate;
+    function GetSectorCount: Integer;
     procedure Run;
+    procedure SetDriveName(AValue: string);
+    procedure SetSectorCount(AValue: Integer);
   public
     Lock: TCriticalSection;
     BlockMap: TBlockMap;
     SectorSize: Integer;
-    SectorCurrent: Integer;
     TimeStart: TDateTime;
     TimeEnd: TDateTime;
     Terminated: Boolean;
     DamagedBlockCount: Integer;
-    Drive: string;
     Mode: TRunMode;
     WritePattern: Byte;
+    SectorStart: Integer;
+    SectorEnd: Integer;
     function GetElapsedTime: TDateTime;
+    procedure CheckDrive;
+    procedure Reset;
     procedure Start;
     procedure Stop;
@@ -50 +57 @@
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
+    property SectorCurrent: Integer read FSectorCurrent;
+    property DriveName: string read FDriveName write SetDriveName;
     property OnTerminate: TNotifyEvent read FOnTerminate write FOnTerminate;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
+    property SectorCount: Integer read GetSectorCount write SetSectorCount;
   end;
 
@@ -114 +124 @@
 procedure TDriveScan.DoTerminate;
 begin
+
   if Assigned(FOnTerminate) then FOnTerminate(Self);
+end;
+
+function TDriveScan.GetSectorCount: Integer;
+begin
+  Result := BlockMap.SectorCount;
 end;
 
@@ -121 +137 @@
   if TimeEnd <> 0 then Result := TimeEnd - TimeStart
     else Result := Now - TimeStart;
+end;
+
+procedure TDriveScan.CheckDrive;
+var
+  F: TFileStream;
+begin
+  if FileExists(DriveName) then begin
+    F := TFileStream.Create(DriveName, fmOpenRead);
+    try
+      BlockMap.SectorCount := F.Size div SectorSize;
+    finally
+      F.Free;
+    end;
+  end else BlockMap.SectorCount := 0;
+end;
+
+procedure TDriveScan.Reset;
+begin
+  TimeStart := Now;
+  DamagedBlockCount := 0;
+  BlockMap.Clear;
+  FSectorCurrent := SectorStart;
 end;
 
@@ -138 +176 @@
   RealSize: Integer;
   Buffer: array of Byte;
-  I: Integer;
 begin
   try
   Lock.Acquire;
-  TimeStart := Now;
   Terminated := False;
-  DamagedBlockCount := 0;
-  if Mode = rmRead then F := TFileStream.Create(Drive, fmOpenRead)
-    else if Mode = rmWrite then F := TFileStream.Create(Drive, fmOpenReadWrite);
-  BlockMap.SectorCount := F.Size div SectorSize;
-  BlockMap.Clear;
+  if Mode = rmRead then F := TFileStream.Create(DriveName, fmOpenRead)
+    else if Mode = rmWrite then F := TFileStream.Create(DriveName, fmOpenReadWrite);
+  try
   SetLength(Buffer, SectorSize);
   if Mode = rmWrite then
     FillChar(Buffer[0], Length(Buffer), WritePattern);
-  for I := 0 to BlockMap.SectorCount - 1 do begin
-    SectorCurrent := I;
+  while FSectorCurrent < SectorEnd do begin
     try
       Lock.Release;
@@ -163 +196 @@
         //Sleep(1);
       end else begin
-        F.Position := I * SectorSize;
+        F.Position := FSectorCurrent * SectorSize;
         if Mode = rmRead then RealSize := F.Read(Buffer[0], SectorSize)
           else if Mode = rmWrite then RealSize := F.Write(Buffer[0], SectorSize)
@@ -172 +205 @@
     end;
     if RealSize <> SectorSize then begin
-      BlockMap.Sectors[I] := bsDamaged;
+      BlockMap.Sectors[FSectorCurrent] := bsDamaged;
       Inc(DamagedBlockCount);
-    end else BlockMap.Sectors[I] := bsOk;
+    end else BlockMap.Sectors[FSectorCurrent] := bsOk;
+    Inc(FSectorCurrent);
     if Terminated then Break;
   end;
-  F.Free;
-
+  finally
+    F.Free;
+  end;
   finally
     Lock.Release;
@@ -185 +220 @@
   DoChange;
   Terminated := True;
-  DoTerminate;
+  ScanThread.Synchronize(DoTerminate);
+end;
+
+procedure TDriveScan.SetDriveName(AValue: string);
+begin
+  if FDriveName = AValue then Exit;
+  FDriveName := AValue;
+  CheckDrive;
+end;
+
+procedure TDriveScan.SetSectorCount(AValue: Integer);
+begin
+  if BlockMap.SectorCount = AValue then Exit;
+  BlockMap.SectorCount := AValue;
 end;
 
@@ -204 +252 @@
   SectorSize := 4096;
   Terminated := True;
+  Reset;
 end;
 
@@ -221 +270 @@
     WriteInteger(Node, 'DamagedBlockCount', DamagedBlockCount);
     WriteInteger(Node, 'WritePattern', WritePattern);
-    WriteString(Node, 'DriveName', Drive);
+    WriteString(Node, 'DriveName', DriveName);
     WriteDateTime(Node, 'TimeStart', TimeStart);
     WriteDateTime(Node, 'TimeEnd', TimeEnd);
+    WriteInteger(Node, 'SectorStart', SectorStart);
+    WriteInteger(Node, 'SectorEnd', SectorEnd);
+    WriteInteger(Node, 'SectorCurrent', FSectorCurrent);
 
     NewNode := OwnerDocument.CreateElement('SectorMap');
@@ -238 +290 @@
     DamagedBlockCount := ReadInteger(Node, 'DamagedBlockCount', 0);
     WritePattern := ReadInteger(Node, 'WritePattern', 0);
-    Drive := ReadString(Node, 'DriveName', '');
+    DriveName := ReadString(Node, 'DriveName', '');
     TimeStart := ReadDateTime(Node, 'TimeStart', 0);
     TimeEnd := ReadDateTime(Node, 'TimeEnd', 0);
+    FSectorCurrent := ReadInteger(Node, 'SectorCurrent', 0);
+    SectorStart := ReadInteger(Node, 'SectorStart', 0);
+    SectorEnd := ReadInteger(Node, 'SectorEnd', SectorCount - 1);
 
     NewNode := FindNode('SectorMap');