More parameter inspection for -i parameter

Author: BobanSpasic

MDX_Tool.lpi

@@ -21,7 +21,7 @@
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="MDX_Tool"/>
+            <Filename Value="bin\debug\MDX_Tool"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -148,6 +148,11 @@
     <RunParams>
       <FormatVersion Value="2"/>
     </RunParams>
+    <RequiredPackages>
+      <Item>
+        <PackageName Value="HashLib4PascalPackage"/>
+      </Item>
+    </RequiredPackages>
     <Units>
       <Unit>
         <Filename Value="MDX_Tool.lpr"/>

MDX_Tool.lpr

@@ -12,7 +12,6 @@
  Third aspect (not yet implemented) will be the conversion from VMEM to VCED and vice-versa.
  
  ToDo:
- - get voice list
  - conversion VMEM <> VCED
  - duplicate finder along a collection of files
 }
@@ -24,11 +23,12 @@
 uses
  {$IFDEF UNIX}
   cthreads,
-             {$ENDIF}
+               {$ENDIF}
   Classes,
   SysUtils,
   CustApp,
-  untUtils, untDXUtils,
+  untUtils,
+  untDXUtils,
   untDXObjInterface;
 
 type
@@ -55,10 +55,12 @@   TMDX_Tool = class(TCustomApplication)
     msInputFile: TMemoryStream;
     i: integer;
     iStartPos: integer;
+    iDmpPos: integer;
   begin
     fInput := '';
     // quick check parameters
-    ErrorMsg := CheckOptions('hirvcsxjf:d:', 'help info repair voices crop split xsplit join file: dir:');
+    ErrorMsg := CheckOptions('himnrvcsxjf:d:',
+      'help info hname vname repair voices crop split xsplit join file: dir:');
 
     if ErrorMsg <> '' then
     begin
@@ -117,20 +119,56 @@   TMDX_Tool = class(TCustomApplication)
         msInputFile := TMemoryStream.Create;
         msInputFile.LoadFromFile(fInput);
         iStartPos := 0;
+        iDmpPos := 0;
 
         if ContainsDX_SixOP_Data_New(msInputFile, iStartPos, slReport) then
         begin
-
+          for i := 0 to slReport.Count - 1 do
+            WriteLn(slReport[i]);
+          iStartPos := 0;
+          if ContainsDX7BankDump(msInputFile, iStartPos, iDmpPos) then
+            if CheckIntegrity(msInputFile, iDmpPos) then
+              WriteLn('VMEM data integrity is OK');
+        end
+        else
+        begin
+          for i := 0 to slReport.Count - 1 do
+            WriteLn(slReport[i]);
         end;
 
-        for i := 0 to slReport.Count - 1 do
-          WriteLn(slReport[i]);
-
         msInputFile.Free;
         slReport.Free;
       end;
     end;
 
+    if HasOption('m', 'hname') then
+    begin
+      if not FileExists(fInput) then
+      begin
+        WriteLn('Parameter -f {filename} is missing or the file {filename} could not be found');
+        Terminate;
+        Exit;
+      end
+      else
+      begin
+        Hash2Name(fInput);
+      end;
+    end;
+
+    if HasOption('n', 'vname') then
+    begin
+      if not FileExists(fInput) then
+      begin
+        WriteLn('Parameter -f {filename} is missing or the file {filename} could not be found');
+        Terminate;
+        Exit;
+      end
+      else
+      begin
+        Voice2Name(fInput);
+      end;
+    end;
+
     if HasOption('v', 'voices') then
     begin
       if not FileExists(fInput) then
@@ -192,10 +230,11 @@   TMDX_Tool = class(TCustomApplication)
         end
         else
         begin
-          fOutputDir :=IncludeTrailingPathDelimiter(GetOptionValue('d', 'outdir'));
-          if pos(':\', fOutputDir) = 0 then fOutputDir := IncludeTrailingPathDelimiter(GetCurrentDir) + fOutputDir;
+          fOutputDir := IncludeTrailingPathDelimiter(GetOptionValue('d', 'outdir'));
+          if pos(':\', fOutputDir) = 0 then
+            fOutputDir := IncludeTrailingPathDelimiter(GetCurrentDir) + fOutputDir;
           if not DirectoryExists(fOutputDir) then
-          ForceDirectories(fOutputDir);
+            ForceDirectories(fOutputDir);
           msInputFile := TMemoryStream.Create;
           msInputFile.LoadFromFile(fInput);
 
@@ -225,10 +264,11 @@   TMDX_Tool = class(TCustomApplication)
         end
         else
         begin
-          fOutputDir :=IncludeTrailingPathDelimiter(GetOptionValue('d', 'outdir'));
-          if pos(':\', fOutputDir) = 0 then fOutputDir := IncludeTrailingPathDelimiter(GetCurrentDir) + fOutputDir;
+          fOutputDir := IncludeTrailingPathDelimiter(GetOptionValue('d', 'outdir'));
+          if pos(':\', fOutputDir) = 0 then
+            fOutputDir := IncludeTrailingPathDelimiter(GetCurrentDir) + fOutputDir;
           if not DirectoryExists(fOutputDir) then
-          ForceDirectories(fOutputDir);
+            ForceDirectories(fOutputDir);
           msInputFile := TMemoryStream.Create;
           msInputFile.LoadFromFile(fInput);
 
@@ -240,10 +280,11 @@   TMDX_Tool = class(TCustomApplication)
       end;
     end;
 
-     if HasOption('j', 'join') then
+    if HasOption('j', 'join') then
     begin
-      fOutputDir :=IncludeTrailingPathDelimiter(GetOptionValue('d', 'dir'));
-      if pos(':\', fOutputDir) = 0 then fOutputDir := IncludeTrailingPathDelimiter(GetCurrentDir) + fOutputDir;
+      fOutputDir := IncludeTrailingPathDelimiter(GetOptionValue('d', 'dir'));
+      if pos(':\', fOutputDir) = 0 then
+        fOutputDir := IncludeTrailingPathDelimiter(GetCurrentDir) + fOutputDir;
       if not DirectoryExists(fOutputDir) then
       begin
         WriteLn('Parameter -d {directory} is missing or the directory could not be found');
@@ -284,14 +325,16 @@   TMDX_Tool = class(TCustomApplication)
   begin
     writeln('');
     writeln('');
-    writeln('MDX_Tool 1.2 - tool for various manipulation of DX7 VMEM and VCED SysEx files');
+    writeln('MDX_Tool 1.4 - tool for various manipulation of DX7 VMEM and VCED SysEx files');
     writeln('Author: Boban Spasic');
     writeln('https://github.com/BobanSpasic/MDX_Tool');
     writeln('');
     writeln('Usage: ', ExtractFileName(ExeName), ' -parameters');
     writeln('  Parameters (short and long form):');
     writeln('       -h                 --help                   This help message');
     writeln('       -i                 --info                   Information');
+    writeln('       -n                 --vname                  Rename file to the name of the contained voice');
+    writeln('       -m                 --hname                  Rename file to the SHA2-256 hash of the file');
     writeln('       -r                 --repair                 Repair/extract DX7 VMEM data from files');
     writeln('       -c                 --crop                   Crop headers from the VMEM/VCED files');
     writeln('       -s                 --split                  Split bank (VMEM) into single voices (VCED)');