Changeset 28

Timestamp:

Apr 7, 2016, 7:01:24 PM (9 years ago)

Author:

chronos

Message:

• Modified: Dynamically calculate sector count from drive size and sector size.

Location:

trunk

Files:

• CoolDisk.lpi (modified) (4 diffs)
• Form/UFormMain.pas (modified) (2 diffs)
• UPhysDrive.pas (modified) (6 diffs)
• UProject.pas (modified) (1 diff)

trunk/CoolDisk.lpi

@@ -34 +34 @@
               <SyntaxMode Value="Delphi"/>
               <CStyleOperator Value="False"/>
+              <AllowLabel Value="False"/>
               <CPPInline Value="False"/>
             </SyntaxOptions>
@@ -40 +41 @@
             <SmartLinkUnit Value="True"/>
             <Optimizations>
-              <OptimizationLevel Value="2"/>
+              <OptimizationLevel Value="3"/>
             </Optimizations>
           </CodeGeneration>
@@ -47 +48 @@
               <GenerateDebugInfo Value="False"/>
             </Debugging>
+            <LinkSmart Value="True"/>
             <Options>
               <Win32>
@@ -158 +160 @@
       <SyntaxOptions>
         <SyntaxMode Value="Delphi"/>
+        <CStyleOperator Value="False"/>
         <IncludeAssertionCode Value="True"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>

trunk/Form/UFormMain.pas

@@ -247 +247 @@
         Model := OpenDialog1.FileName;
         SectorSize := 4096;
-        SectorCount := Size div SectorSize;
         Core.DriveList.LoadToStrings(ComboBoxDrive.Items);
       end;
@@ -319 +318 @@
     Core.Project.DriveInfo.Assign(TDriveInfo(ComboBoxDrive.Items.Objects[ComboBoxDrive.ItemIndex]));
   Core.Project.ScanProfile.LoadFromDriveInfo(Core.Project.DriveInfo);
-
 
   Redraw;

trunk/UPhysDrive.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs, UFindFile, UCommon
+  Classes, SysUtils, Contnrs, UFindFile, UCommon, Math
   {$IFDEF Windows},ActiveX,ComObj,Variants
   {$ENDIF};
@@ -16 +16 @@
 
   TDriveInfo = class
+  private
+    FSectorSize: Integer;
+    FSectorCount: Int64;
+    FSize: Int64;
+    function GetSectorCount: Int64;
+    procedure SetSectorSize(AValue: Integer);
+    procedure SetSize(AValue: Int64);
+  public
     Kind: TDriveKind;
     Model: string;
-    Size: Int64;
-    SectorCount: Int64;
-    SectorSize: Integer;
     Path: string;
+    constructor Create;
     procedure Assign(Source: TDriveInfo);
+    property SectorSize: Integer read FSectorSize write SetSectorSize;
+    property SectorCount: Int64 read GetSectorCount;
+    property Size: Int64 read FSize write SetSize;
   end;
 
@@ -42 +51 @@
   UPrefixMultiplier;
 
+resourcestring
+  SMinSectorSize = 'Minimum sector size is 1';
+
 { TDriveInfo }
+
+procedure TDriveInfo.SetSectorSize(AValue: Integer);
+begin
+  if FSectorSize = AValue then Exit;
+  if Avalue < 1 then
+    raise Exception.Create(SMinSectorSize);
+  FSectorSize := AValue;
+  FSectorCount := Ceil(FSize / FSectorSize);
+end;
+
+function TDriveInfo.GetSectorCount: Int64;
+begin
+  Result := Ceil(FSize / FSectorSize);
+end;
+
+procedure TDriveInfo.SetSize(AValue: Int64);
+begin
+  if FSize=AValue then Exit;
+  FSize:=AValue;
+end;
+
+constructor TDriveInfo.Create;
+begin
+  FSectorSize := 1;
+end;
 
 procedure TDriveInfo.Assign(Source: TDriveInfo);
@@ -49 +86 @@
   Model := Source.Model;
   Size := Source.Size;
-  SectorCount := Source.SectorCount;
+  FSectorCount := Source.FSectorCount;
   SectorSize := Source.SectorSize;
 end;
@@ -108 +145 @@
       NewDriveInfo.Model := Trim(LoadFileToStr(List[I] + '/device/model'));
       NewDriveInfo.SectorSize := StrToInt(Trim(LoadFileToStr(List[I] + '/queue/physical_block_size')));
-      NewDriveInfo.SectorCount := StrToInt(Trim(LoadFileToStr(List[I] + '/size'))) * 512 div NewDriveInfo.SectorSize;
-      NewDriveInfo.Size := NewDriveInfo.SectorCount * NewDriveInfo.SectorSize;
+      NewDriveInfo.Size := StrToInt(Trim(LoadFileToStr(List[I] + '/size'))) * 512;
       NewDriveInfo.Path := '/dev/' + ExtractFileName(List[I]);
       Add(NewDriveInfo);
@@ -123 +159 @@
   NewDriveInfo.Model := 'File';
   NewDriveInfo.SectorSize := 4096;
-  NewDriveInfo.SectorCount := 0;
   NewDriveInfo.Size := 0;
   NewDriveInfo.Path := '';

trunk/UProject.pas

@@ -120 +120 @@
     with RootNode do begin
       DriveInfo.SectorSize := ReadInteger(RootNode, 'SectorSize', 4096);
-      DriveInfo.SectorCount := ReadInteger(RootNode, 'SectorCount', 0);
       ScanProfile.SectorCount := DriveInfo.SectorCount;
       DriveInfo.Model := ReadString(RootNode, 'DriveName', '');