Changeset 3480

Timestamp:

Feb 28, 2019, 7:26:17 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• LoadUrl, EditUrl: Removed error checking after wget failed. The call of Cmd always returns the rc from opening the command prompt window, not that of the called wget. quietshell could be used instead, but that runs hidden and would require error checking.
• Added stop of further Edit processing after recognition of a URL and calling LoadUrl. The stop in PreLoadFile stops then also Edit.

Location:

trunk/src/netlabs/macros

Files:

• edit.e (modified) (4 diffs)
• tools.e (modified) (17 diffs)

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

@@ -94 +94 @@
    if pos( '://', StrippedFileSpec) > 0 then
       call LoadUrl( StrippedFileSpec, Options)
-      return
+      -- Don't execute the rest of PreLoadFile and Edit -> LoadFile
+      stop
    endif
 
@@ -147 +148 @@
    filestoloadmax = filestoload
 
+   rc = 0
    return
 
@@ -558 +560 @@
             -- Preload the file
             call PreLoadFile( FileSpec, Options)
-            -- No break from here to get the rc from LoadFile
+            if rc then
+               dprintf( 'rc from PreLoadFile( FileSpec) = 'rc)
+               -- Don't process LoadFile when LoadUrl returned rc <> 0
+               iterate
+            endif
 
             -- Load the file
@@ -565 +571 @@
 
             if edit_rc then
+               dprintf( sayerrortext( edit_rc)': 'FileSpec)
                sayerror sayerrortext( edit_rc)': 'FileSpec
                NumErrors = NumErrors + 1

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

@@ -110 +110 @@
 
       -- Refer to defined config key
-      if wordpos( ToolBaseName,'md5sum md5suml md5') then
+      if wordpos( ToolBaseName, 'md5sum md5suml md5') then
          ToolBaseName = 'md5'
       endif
@@ -260 +260 @@
                          GethWndC( APP_HANDLE) ||
                          Text) with Button 2 NewValue \0
-   NewValue = strip(NewValue)
+   NewValue = strip( NewValue)
    if Button = \1 then
       --'buffer_command' put_in_buffer( 'Grep' NewValue)
@@ -359 +359 @@
       'edit' OutFile
       editrc = rc
-      if rc = -282 then  -- sayerror('New file')
+      if rc = -282 then  -- sayerror( 'New file')
          'xcom quit'
          rc = editrc
@@ -372 +372 @@
       .filename = translate( LongName, '!!!!!', '*\/:?')
       -- This won't work, because file doesn't exist on disk:
-      --call delete_ea('.LONGNAME')
+      --call delete_ea( '.LONGNAME')
       --'add_ea .LONGNAME' LongName
       --NepmdWriteStringEa( .filename, '.LONGNAME', LongName)
 
       if .last > 0 then
-         next = textline(1)
+         next = textline( 1)
       else
          next = ''
@@ -425 +425 @@
    Params = '"'fn'"'
 
+/*                                            -- TODO -- LOCAL ONLY --------------------------------
    RootDir = NepmdScanEnv( 'NEPMD_ROOTDIR')
    rc1 = rc
@@ -431 +432 @@
    endif
    NetlabsDir = RootDir'\netlabs'
+*/
+   SrcDir  = 'g:\dev\netlabs\nepmd\trunk\src'
+   NetlabsDir = SrcDir'\netlabs'
 
    UserDir = NepmdScanEnv( 'NEPMD_USERDIR')
@@ -628 +632 @@
    -- Check result
    Button = asc( leftstr( Result, 1))
-   EOS = pos( \0, Result, 2)        -- CHR(0) signifies End Of String
+   EOS = pos( \0, Result, 2)        -- CHR( 0) signifies End Of String
    Selected = substr( Result, 2, EOS - 2)
    if Button = 1 then      -- Open in App
@@ -634 +638 @@
    elseif Button = 2 then  -- Download and Save
       call SaveUrl( Url)
-      if rc <> 0 then
-         sayerror 'Error on downloading URL, rc = 'rc
-      endif
+      -- No error checking required, because on error of wget, the rest
+      -- is not executed anymore
    elseif Button = 3 then  -- Download and Edit
       'Edit' Url
-      if rc <> 0 then
-         sayerror 'Error on downloading URL, rc = 'rc
-      endif
+      -- No error checking required, because on error of wget, the rest
+      -- of Edit -> LoadFile is not executed anymore
    else                    -- Return
       'PostMe OpenUrlDlg' Url
@@ -705 +707 @@
       'u='FileSpec, 't='TmpFile, 'o='Options, 'l='LogFile)
 
-   rc = 0
    Cmd
+   -- Can't get rc from the called command:
+   -- rc from Cmd is rc from the Os2 command that opens a command prompt
+   -- window, not the rc from the command that Os2 executes.
    return
 
@@ -823 +827 @@
       'u='FileSpec, 't='TmpFile, 'l='LogFile)
 
-   rc = 0
    Cmd
+   -- Can't get rc from the called command:
+   -- rc from Cmd is rc from the Os2 command that opens a command prompt
+   -- window, not the rc from the command that Os2 executes.
    return
 
@@ -1092 +1098 @@
    -- Parse button number and selected list item string
    Button = asc( leftstr( ret, 1))
-   EOS = pos( \0, ret, 2)        -- CHR(0) signifies End Of String
+   EOS = pos( \0, ret, 2)        -- CHR( 0) signifies End Of String
    Select = substr( ret, 2, EOS - 2)
 
@@ -1186 +1192 @@
                            'Throw away changes to file on disk?',
                            MB_OKCANCEL + MB_WARNING + MB_DEFBUTTON1 + MB_MOVEABLE) <> MBID_OK then
-            return -293  -- sayerror("has been modified")
+            return -293  -- sayerror( "has been modified")
          else
             .modify = 0
@@ -1207 +1213 @@
       endif
 
-      Args = arg(1)
+      Args = arg( 1)
       if Args = '' then
          'CommandLine uconv 'DefaultOptions  -- recursive call
@@ -1268 +1274 @@
                            'Throw away changes to file on disk?',
                            MB_OKCANCEL + MB_WARNING + MB_DEFBUTTON1 + MB_MOVEABLE) <> MBID_OK then
-            return -293  -- sayerror("has been modified")
+            return -293  -- sayerror( "has been modified")
          else
             .modify = 0
@@ -1288 +1294 @@
       endif
 
-      Args = arg(1)
+      Args = arg( 1)
       if Args = '' then
          'CommandLine recode 'DefaultOptions  -- recursive call
@@ -1356 +1362 @@
 
       'xcom e 'Md5Log1
-      next = textline(1)
+      next = textline( 1)
       parse value next with '=' md51   -- Bob Eager's md5.exe
       if md51 = '' then
@@ -1365 +1371 @@
       'xcom q'
       'xcom e 'Md5Log2
-      next = textline(1)
+      next = textline( 1)
       parse value next with '=' md52   -- Bob Eager's md5.exe
       if md52 = '' then