Changeset 4041

Timestamp:

Jun 7, 2020, 11:20:21 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• FindFileInList: Allow for limited recursive search. After the trailing '!' char, the recurse depth may be specified (or V or F).

File:

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

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

@@ -2360 +2360 @@
 ; o  To limit the recursion, a number may be appended after the '!'.
 ;    '!O' means no search in subdirectories. A good value is '!3'.
+; o  '!F' means fully recursive, the same as '!'. '!V' means variable. The
+;    recurse depth depends on the amount of subpaths to avoid searching
+;    a whole volume.
 ; o  It's normally not useful to search in subdirs of a search path. To
 ;    avoid this, use multiple calls of FindFileInList, without and with
@@ -2376 +2379 @@
 ;    FullEName  = FindFileInList( 'small.e', .filename'\..', '.!3;..!3;..\..!3')
 ;    FullEName  = FindFileInList( 'small.e', .filename'\..', '.!;..!3')
+;    FullName   = FindFileInList( 'stdlib.h', 'G:\dev\toolkt45\H;G:\dev\toolkt45\IDL;')  (not found)
+;    FullName   = FindFileInList( 'stdlib.h', 'G:\dev\toolkt45\H!;G:\dev\toolkt45\IDL;')
 ; Returns '' if File not found in DirList, otherwise fully qualified name.
 defproc FindFileInList( File, DirList)
@@ -2399 +2404 @@
       do while restenv <> ''
          parse value restenv with ThisDir';'restenv
-         ThisDir = NepmdQueryFullname( ThisDir)
-         if ThisDir = '' then
-            iterate
-         endif
-
          SearchDirList = ''
 
@@ -2433 +2433 @@
 
             -- Check for optional trailing numbers and a trailing exclamation mark
-            TestDir = strip( translate( ThisSearchDir, copies( ' ', 10), '0123456789'))
+            TestDir = strip( translate( ThisSearchDir, copies( ' ', 14), '0123456789VFvf'))
             if rightstr( TestDir, 1) = '!' then
                pExMark = lastpos( '!', ThisSearchDir)
@@ -2442 +2442 @@
                   -- Number of recursive search levels may be appended after the '!'
                   RecurseLevel = substr( ThisSearchDir, pExMark + 1)
+                  if upcase( RecurseLevel) = 'F' then
+                     RecurseLevel = -1
+                  elseif upcase( RecurseLevel) = 'V' then
+                     -- Number of start sublevels = number of backslash chars.
+                     -- This allows for specifying recursive search without searching
+                     -- a whole volume when starting near the root.
+                     NumSubLevels = count( '\', ThisSearchDir)
+                     if NumSubLevels >= 3 then
+                        RecurseLevel = -1
+                     elseif NumSubLevels >= 2 then
+                        RecurseLevel = 3
+                     elseif NumSubLevels >= 1 then
+                        RecurseLevel = 2
+                     endif
+                  endif
                   ThisSearchDir = leftstr( ThisSearchDir, pExMark - 1)
                endif
@@ -2447 +2462 @@
 
             ThisSearchDir = NepmdQueryFullname( ThisSearchDir)
+            if not NepmdDirExists( ThisSearchDir) then
+               iterate
+            endif
 
             if RecurseLevel <> 0 then