Merge pull request #372 from Dyalog/v3dev

Version 3.0.4

Author: mkromberg

StartupSession/Link/Notify.aplf

@@ -119,7 +119,7 @@
                  :If (0<≢curname)∧(curname≢affected)   ⍝ name changed
                      ⎕EX curname ⋄ msg,←' deleting previously defined 'curname
                  :EndIf
-             :ElseIf (0≠⎕NC affected)∧(0≠≢curfile)      ⍝ name was tied to a different file
+             :ElseIf (0≠⎕NC affected)∧(0≠≢curfile)∧(⎕C curfile)≢⎕C path ⍝ name was tied to a different file
                  warn←1 ⋄ name←'' ⋄ →END⊣msg,←'ignoring attempt to redefine 'affected' which is linked to 'curfile
              :ElseIf ~curnc∊0 ¯1     ⍝ file already tied to a name
                  ⎕EX curname  ⍝ delete name in case the name defined by source has changed
@@ -193,10 +193,12 @@
          :If link.fastLoad<(link.forceFilenames∨link.forceExtensions) ⍝ fastLoad is disabled in Notify
          :AndIf path≢exppath←expfile(link.forceFilenames U.MergeFileName link.forceExtensions)path
              :If ⎕NEXISTS exppath  ⍝ would clash with existing file - do not dare fixing
+             :AndIf (⎕C path)≢⎕C exppath ⍝ Not just a case change
                  warn←1 ⋄ name←'' ⋄ →END⊣msg,←' - file clash: cannot move file to existing 'exppath' - cannot fix 'affected
              :Else
                  msg,←' - moving to 'exppath
-                 exppath ⎕NMOVE path ⋄ path←exppath
+                 (,⊂exppath) U.Relocate ,⊂path
+                 path←exppath
                  ⍝ If we do the line below, then occasionally the watcher fails to callback on move, making the new file definition not fixed
                  ⍝→END U.If 'dir' 'both'∊⍨⊂link.watch      ⍝ file watcher will take care of the rest
                  :While ~⎕NEXISTS exppath ⋄ ⎕DL 0.000001 ⋄ :EndWhile    ⍝ ensure file effectively moved before fixing

StartupSession/Link/Test.dyalog

@@ -761,9 +761,31 @@
 
 
 
-        
-        
-        
+        ∇ ok←test_forcefilenames(folder name);z;ns;foo;goo;goofile
+         ⍝ Test that forceFilenames is handled
+          
+          name ⎕NS ''
+          z←'{forceFilenames:1}' ⎕SE.Link.Create name folder
+          ns←#⍎name
+          
+      ⍝ Create a monadic function
+          _←(⊂foo←' r←foo x' ' x x')QNPUT folder,'/foo.aplf'
+          assert'foo≡ns.⎕NR ''foo''' 'ns.⎕FX ↑foo'
+
+      ⍝ Rename the function to goo
+          _←(⊂goo←' r←goo x' ' x x')QNPUT (folder,'/foo.aplf') 1
+          assert '⎕NEXISTS folder,''//goo.aplf'''
+          assert'goo≡ns.⎕NR ''goo''' 'ns.⎕FX ↑goo'            
+
+      ⍝ Rename case ONLY (see issue #369) 
+          _←(⊂goo←' r←Goo x' ' x x')QNPUT (folder,'/goo.aplf') 1
+          goofile←folder,'/Goo.aplf'
+          assert 'goofile≡⊃⊃0 (⎕NINFO⍠1) folder,''/Goo.*'''
+          assert'goo≡ns.⎕NR ''Goo''' 'ns.⎕FX ↑goo'            
+ 
+          CleanUp folder name
+          ok←1
+        ∇                   
 
 
 

StartupSession/Link/Utils.apln

@@ -295,13 +295,23 @@
           :EndIf
         ∇
 
-        ∇ {r}←to Relocate from;i;nextfrom;nextto
+        ∇ {r}←to Relocate from;i;nextfrom;nextto;tmpfile
     ⍝ move list of files, updating file names as we go through the list
           r←⍬
           :While ~0∊⍴to
               (nextto nextfrom)←⊃¨(to from) ⋄ (to from)↓⍨←1
               :If nextto≢nextfrom
-                  r,←nextto ⎕NMOVE nextfrom
+                  :Trap 22
+                      r,←nextto ⎕NMOVE nextfrom
+                  :Else ⍝ Suspect issue with case sensitive file system
+                      :If (⎕C nextto)≡⎕C nextfrom ⍝ Names differ only in case
+                         tmpfile←(739⌶0),'/Utils.Relocate_',(' '~⍨⍕⎕TS),'.linktmp'
+                         tmpfile ⎕NMOVE nextfrom  ⍝ Must move file out of current folder
+                         r,←nextto ⎕NMOVE tmpfile ⍝ And then recreate with new casing
+                      :Else
+                         ⎕DMX.Message ⎕SIGNAL ⎕EN
+                      :EndIf
+                  :EndTrap
                   from←(nextfrom ⎕R nextto)from  ⍝ update directories in particular
               :Else ⋄ r,←1   ⍝ no need to copy
               :EndIf

StartupSession/Link/Version.aplf

@@ -1,2 +1,2 @@
 version←Version
-version←'3.0.3'
+version←'3.0.4'

StartupSession/Link/Watcher.apln

@@ -184,8 +184,10 @@
       ⍝ everything will freeze
 
       :Trap 0
-         fsw.Dispose
-      :Else       
+         :If 0≠⎕NC ⊂'fsw.Dispose' ⍝ Don't bother if it is already gone
+             fsw.Dispose
+         :EndIf
+      :Else                                                            
          ##.U.Warn 'Trapped error disposing of FSW on ',nsname,' ',⊃⎕DMX.DM
       :EndTrap
     ∇