Changeset 3654

Timestamp:

Oct 6, 2019, 3:50:02 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Added preserve of fileinfo and EA to Encode.

File:

• trunk/src/netlabs/macros/tools.e (modified) (6 diffs)

trunk/src/netlabs/macros/tools.e ¶

@@ -1112 +1112 @@
       Tool = upcase( leftstr( Tool, 1))''lowcase( substr( Tool, 2))
 
+      -- Handle virtual file
+      lp = lastpos( '\', .filename)
+      if lp = 0 then
+         -- A virtual file: save it as tmp file
+         File = GetTmpPath()''.filename
+         'Save 'File
+         lp = lastpos( '\', .filename)
       -- Check if file exists
-      if not Exist( .filename) then
+      elseif not Exist( .filename) then
          sayerror .filename 'does not exist on disk. Save it first.'
          return sayerror( 'File not found')
@@ -1139 +1146 @@
       endif
 
-      -- Handle virtual file and get Name
-      lp = lastpos( '\', .filename)
-      if lp = 0 then
-         -- A virtual file: save it as tmp file
-         File = GetTmpPath()''.filename
-         'Save 'File
-         lp = lastpos( '\', .filename)
-      endif
+      -- Get Name and Basename
       Name = substr( .filename, lp + 1)
+      lp2 = lastpos( '.', Name)
+      if lp2 > 1 then
+         Basename = leftstr( Name, lp2 - 1)
+      else
+         Basename = Name
+      endif
 
       -- Input file
-      InFile = EnquoteFileSpec( .filename)
+      InFile = .filename
+      EnqInFile = EnquoteFileSpec( InFile)
 
       -- Temporary output file
-      OutFile = EnquoteFileSpec( GetTmpPath()''Name'.'lowcase( Tool))
+      --OutFile = GetTmpPath()''Name'.'lowcase( Tool)
+      OutFile = GetTmpPath()''Basename'.enc'
+      EnqOutFile = EnquoteFileSpec( OutFile)
 
       -- Temporary EA file
-      EaFile = EnquoteFileSpec( GetTmpPath()''Name'.ea')
+      EaFile = GetTmpPath()''Basename'.ea'
+      EnqEaFile = EnquoteFileSpec( EaFile)
 
       -- Log file
-      LogFile = EnquoteFileSpec( GetTmpPath()'encode.log')
+      LogFile = GetTmpPath()'encode.log'
+      EnqLogFile = EnquoteFileSpec( LogFile)
 
       -- Reset readonly file attribute
       if GetReadonly() then
-         quietshell 'attr -r' InFile
+         quietshell 'attr -r' EnqInFile
       endif
 
@@ -1170 +1181 @@
 
       -- Unlock caused by others
-      quietshell 'unlock' InFile
-
-      -- Split Eas to an .ea file
-      Cmd = 'eautil' InFile EaFile '/s /r'
-      quietshell Cmd
-      if rc <> 0 then
-         sayerror 'Error from eautil: rc = 'rc', Cmd = 'Cmd
-         leave
-      endif
-
-      -- Create a 0 byte file if no EAs were found.
-      -- This allows for replacing EAs later on join.
-      if not Exist( EaFile) then
-         call CopyFile( 'nul', EaFile)
-      endif
+      quietshell 'unlock' EnqInFile
+
+      -- Save FileInfo and create EaFile
+      call SaveFileInfoEa( InFile, FileInfo, EaFile)
 
       -- Execute encoding tool
@@ -1243 +1243 @@
          endif
          -- Load file to view output from tool and prepend Msg
-         'e /d 'LogFile
+         'e /d 'EnqLogFile
          insertline Msg, 1
          .modify = 0
@@ -1249 +1249 @@
       endif
 
-      if Tool = 'Uconv' then
+      if lowcase( Tool) <> 'recode' then
          -- Copy OutFile over InFile
          if not Exist( OutFile) then
@@ -1256 +1256 @@
             leave
          endif
-
-         Cmd = 'copy' OutFile InFile
-         quietshell Cmd
-         if rc <> 0 then
-            sayerror 'Error from copy: rc = 'rc', Cmd = 'Cmd
-            leave
-         endif
-
-         quietshell 'del' OutFile
-      endif
-
-      -- Join Eas from an .ea file. EaFile must exist.
-      Cmd = 'eautil' InFile EaFile '/j /o'
-      quietshell Cmd
-      if rc <> 0 then
-         sayerror 'Error from eautil: rc = 'rc', Cmd = 'Cmd
-         leave
-      endif
+         call CopyFile( OutFile, Infile)
+         if not rc then
+            call DeleteFile( OutFile)
+         endif
+      endif
+
+      -- Restore FileInfo and join EaFile
+      call RestoreFileInfoEa( InFile, FileInfo, EaFile)
 
       -- Revert