Add extract with header feature, implements #2

Author: damieng

Source/Main.lfm

@@ -4,8 +4,8 @@ object frmMain: TfrmMain
   Top = 650
   Width = 556
   AllowDropFiles = True
-  ClientHeight = 0
-  ClientWidth = 0
+  ClientHeight = 364
+  ClientWidth = 556
   Color = clBtnFace
   Font.CharSet = ANSI_CHARSET
   Font.Pitch = fpVariable
@@ -372,14 +372,28 @@ object frmMain: TfrmMain
       Caption = 'Copy details to clipboard'
       OnClick = itmEditCopyClick
     end
+    object Separator2: TMenuItem
+      Caption = '-'
+    end
     object itmSaveFileAs: TMenuItem
       Caption = 'Save file as...'
       OnClick = itmSaveFileAsClick
     end
+    object itmSaveFileWithHeaderAs: TMenuItem
+      Caption = 'Save file with header as...'
+      OnClick = itmSaveFileWithHeaderAsClick
+    end
+    object Separator3: TMenuItem
+      Caption = '-'
+    end
     object itmSaveSelectedFilesTo: TMenuItem
       Caption = 'Save selected files to...'
       OnClick = itmSaveSelectedFilesToClick
     end
+    object itmSaveSelectedFilesWithHeadersTo: TMenuItem
+      Caption = 'Save selected files with headers to...'
+      OnClick = itmSaveSelectedFilesWithHeadersToClick
+    end
   end
   object dlgFind: TFindDialog
     Options = [frDown, frHideUpDown, frDisableWholeWord, frHideEntireScope]

Source/Main.pas

@@ -33,6 +33,8 @@   TfrmMain = class(TForm)
     itmSaveFileAs: TMenuItem;
     itmSaveSelectedFilesTo: TMenuItem;
     itmCopyMapToClipboard: TMenuItem;
+    itmSaveFileWithHeaderAs: TMenuItem;
+    itmSaveSelectedFilesWithHeadersTo: TMenuItem;
     mnuMain: TMainMenu;
     itmDisk: TMenuItem;
     itmOpen: TMenuItem;
@@ -49,6 +51,8 @@   TfrmMain = class(TForm)
     dlgSaveBinary: TSaveDialog;
     dlgSelectDirectory: TSelectDirectoryDialog;
     Separator1: TMenuItem;
+    Separator2: TMenuItem;
+    Separator3: TMenuItem;
     splVertical: TSplitter;
     staBar: TStatusBar;
     pnlRight: TPanel;
@@ -91,8 +95,10 @@   TfrmMain = class(TForm)
     procedure itmOpenClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure itmOpenRecentClick(Sender: TObject);
+    procedure itmSaveFileWithHeaderAsClick(Sender: TObject);
     procedure itmSaveSelectedFilesToClick(Sender: TObject);
     procedure itmSaveFileAsClick(Sender: TObject);
+    procedure itmSaveSelectedFilesWithHeadersToClick(Sender: TObject);
     procedure lvwMainDblClickFile(Sender: TObject);
     procedure popListItemPopup(Sender: TObject);
     procedure tvwMainChange(Sender: TObject; Node: TTreeNode);
@@ -136,6 +142,8 @@   TfrmMain = class(TForm)
     function FindTreeNodeFromData(Node: TTreeNode; Data: TObject): TTreeNode;
     function MapByte(Raw: byte): string;
 
+    procedure SaveExtractedFile(WithHeader: boolean);
+    procedure SaveExtractedFilesToFolder(WithHeader: boolean);
     procedure WriteSectorLine(Offset: integer; SecHex: string; SecData: string);
     procedure SetListSimple;
     procedure OnApplicationDropFiles(Sender: TObject; const FileNames: array of string);
@@ -235,7 +243,17 @@ procedure TfrmMain.itmOpenRecentClick(Sender: TObject);
   end;
 end;
 
+procedure TfrmMain.itmSaveSelectedFilesWithHeadersToClick(Sender: TObject);
+begin
+  SaveExtractedFilesToFolder(true);
+end;
+
 procedure TfrmMain.itmSaveSelectedFilesToClick(Sender: TObject);
+begin
+  SaveExtractedFilesToFolder(false);
+end;
+
+procedure TfrmMain.SaveExtractedFilesToFolder(WithHeader: boolean);
 var
   ListItem: TListItem;
   Folder: string;
@@ -251,7 +269,7 @@ procedure TfrmMain.itmSaveSelectedFilesToClick(Sender: TObject);
     begin
       DiskFile := TDSKFile(ListItem.Data);
       Stream := TFileStream.Create(Folder + DiskFile.FileName, fmCreate);
-      Data := DiskFile.GetData();
+      Data := DiskFile.GetData(WithHeader);
       try
         Stream.WriteBuffer(Pointer(Data)^, Length(Data));
       finally
@@ -260,7 +278,17 @@ procedure TfrmMain.itmSaveSelectedFilesToClick(Sender: TObject);
     end;
 end;
 
+procedure TfrmMain.itmSaveFileWithHeaderAsClick(Sender: TObject);
+begin
+     SaveExtractedFile(true);
+end;
+
 procedure TfrmMain.itmSaveFileAsClick(Sender: TObject);
+begin
+  SaveExtractedFile(false);
+end;
+
+procedure TfrmMain.SaveExtractedFile(WithHeader: boolean);
 var
   DiskFile: TDSKFile;
   Data: TDiskByteArray;
@@ -275,7 +303,7 @@ procedure TfrmMain.itmSaveFileAsClick(Sender: TObject);
   if not dlgSaveBinary.Execute then exit;
 
   Stream := TFileStream.Create(dlgSaveBinary.FileName, fmCreate);
-  Data := DiskFile.GetData();
+  Data := DiskFile.GetData(WithHeader);
   try
     Stream.WriteBuffer(Pointer(Data)^, Length(Data));
   finally
@@ -301,13 +329,19 @@ procedure TfrmMain.popListItemPopup(Sender: TObject);
 begin
   itmSaveSelectedFilesTo.Visible := tvwMain.Selected.Text = 'Files';
   itmSaveSelectedFilesTo.Enabled := lvwMain.SelCount > 0;
+  itmSaveSelectedFilesWithHeadersTo.Visible := itmSaveSelectedFilesTo.Visible;
+  itmSaveSelectedFilesWithHeadersTo.Enabled := itmSaveSelectedFilesTo.Enabled;
 
   itmSaveFileAs.Visible := False;
+  itmSaveFileWithHeaderAs.Visible := False;
+
   if (lvwMain.SelCount = 1) and (lvwMain.Selected.Data <> nil) and (TObject(lvwMain.Selected.Data).ClassType = TDSKFile) then
   begin
     itmSaveFileAs.Visible := True;
+    itmSaveFileWithHeaderAs.Visible := True;
     DiskFile := TDSKFile((lvwMain.Selected).Data);
     itmSaveFileAs.Caption := Format('Save %s as...', [DiskFile.FileName]);
+    itmSaveFileWithHeaderAs.Caption := Format('Save %s with header as...', [DiskFile.FileName]);
   end;
 end;
 

Source/filesystem.pas

@@ -60,7 +60,7 @@   TDSKFile = class(TObject)
     Size: integer;
     Meta: string;
 
-    function GetData: TDiskByteArray;
+    function GetData(WithHeader: boolean): TDiskByteArray;
 
     constructor Create(ParentFileSystem: TDSKFileSystem);
     destructor Destroy; override;
@@ -322,7 +322,7 @@ destructor TDSKFile.Destroy;
   inherited Destroy;
 end;
 
-function TDSKFile.GetData: TDiskByteArray;
+function TDSKFile.GetData(WithHeader:boolean): TDiskByteArray;
 var
   Block, BytesLeft, TargetIdx, BlockSize, SectorsLeft, SectorsPerBlock: integer;
   Disk: TDSKDisk;
@@ -364,8 +364,8 @@ function TDSKFile.GetData: TDiskByteArray;
     until SectorsLeft = 0;
   end;
 
-  // Strip any headers (maybe make this optional in the future)
-  if (HeaderType = 'PLUS3DOS') or (HeaderType = 'AMSDOS') then
+  // Strip any headers
+  if (not WithHeader) and ((HeaderType = 'PLUS3DOS') or (HeaderType = 'AMSDOS')) then
     Result := Copy(FileData, 128, Size - 128)
   else
     Result := FileData;