Changeset 188

Timestamp:

09/30/08 13:47:30 (4 years ago)

Author:

alex

Message:

testing the cancel function

Location:

trunk/lingosource/castlib1

Files:

• OSCmenu_Utilities.ls (modified) (1 diff)
• doCommandMovieScript.ls (modified) (1 diff)
• subversion_version_field.txt (modified) (1 diff)
• svn_Utilities.ls (modified) (8 diffs)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -341 +341 @@
   
   subli.add("SVN Update selected castlib...")
-  pLookUpCommandList.setaprop("SVN Update selected castlib...", ["mSVN_Update_SelectedCastlib me, chooseNewPath_optional, onlyUpdate_SVN_WorkingFolder_optional", "svn_Utilities"])
+  pLookUpCommandList.setaprop("SVN Update selected castlib...", ["mSVN_Update_SelectedCastlib me, chooseNewPath_optional, onlyUpdate_SVN_WorkingFolder_optional, selectionList_optional", "svn_Utilities"])
   
   subli.add("SVN Update Current Movie...")

trunk/lingosource/castlib1/doCommandMovieScript.ls

@@ -11 +11 @@
 
 ---- This handler used to be in "thisMovieScript", but due to a scope bug with calling handlers in other movies -> tell the stage
--- unfortunately this doesn't fix the problem. have to investiaget later WHY... so calling handlers, which are in this movie will fail
+-- unfortunately this doesn't fix the problem. I have to investigate later WHY... so calling handlers, which are in this movie will fail
 
 

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r188
+r190

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -1905 +1905 @@
   
   if count(castlibList) < 1 then
-    alert "No castlib selected. The parameter didn't yiled a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
+    alert "No castlib selected. The parameter didn't yield a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
     return 0
   end if
@@ -2453 +2453 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, dontShowAlert
+on mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, dontShowAlert
   
   actCL = the activecastlib
+  castlibList = [actCL]
+  
+  selectionList = string(selectionList)
+  if length(selectionList) > 0 then
+    
+    if char 1 of selectionList <> "[" then put "[" before selectionList
+    if the last char of selectionList <> "]" then put "]" after selectionList
+    
+    selectionList = value(selectionList)
+    if listP(selectionList) then
+      clnum = the number of castlibs + 1
+      castlibList = []
+      selectionListCnt = count(selectionList)
+      repeat with n = 1 to selectionListCnt
+        int = integer(selectionList[n])
+        if integerP(int) then
+          if clnum > int then
+            if castlibList.getPos(int) < 1 then castlibList.add(int)
+          end if
+        end if
+      end repeat
+    end if
+  end if
+  
+  if count(castlibList) < 1 then
+    alert "No castlib selected. The parameter didn't yield a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
+    return 0
+  end if
+  put "Updating castlibs:" && castlibList
+  
   
   workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
@@ -2472 +2502 @@
   
   
-  fname = castlib(actCL).filename
+  isMac = (the platform contains "mac")
+  castlibPathList = []
   
   ---------------------------------------
@@ -2482 +2513 @@
     the itemdelimiter = mp
     
-    if length(fname) > 0 then
-      
-      offs = offset(mp, fname)
-      if offs <> 1 then
-        alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+    
+    repeat with actCL in castlibList
+      fname = castlib(actCL).filename
+      if length(fname) > 0 then
+        
+        offs = offset(mp, fname)
+        if offs <> 1 then
+          alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+          return 0
+        end if
+        
+        relpath = fname
+        delete char 1 to mplen of relpath
+        
+        newpath = workingFolder & relpath
+        --        newpathDir = newpath
+        --        delete the last item of newpathDir
+        
+        -- if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
+        -- baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
+        
+        if isMac then
+          castlibPathList.add([#newpath:newpath, #newpathUnix: baUnixName(newpath), #fname:fname])
+        else
+          castlibPathList.add([#newpath:newpath, #newpathUnix: newpath, #fname:fname])
+        end if
+        
+      else
+        
+        -- musty something REALLY wrong, as the filename should ALWAYS be of any length (internal castlibs )
         return 0
+        
       end if
       
-      relpath = fname
-      delete char 1 to mplen of relpath
-      
-      newpath = workingFolder & relpath
-      newpathDir = newpath
-      delete the last item of newpathDir
-      -- if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
-      -- baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
-      
-    else
-      
-      -- musty something REALLY wrong, as the filename should ALWAYS be of any length (internal castlibs )
-      return 0
-      
-    end if
+    end repeat
     
     the itemdelimiter = olddelim
@@ -2510 +2553 @@
   else
     
-    newpath = fname
+    repeat with actCL in castlibList
+      fname = castlib(actCL).filename
+      newpath = fname
+      if isMac then
+        castlibPathList.add([#newpath:newpath, #newpathUnix: baUnixName(newpath), #fname:fname])
+      else
+        castlibPathList.add([#newpath:newpath, #newpathUnix: newpath, #fname:fname])
+      end if
+    end repeat
+    
   end if
   ---------------------------------------
@@ -2539 +2591 @@
     svnBinary = baUnixName(svnBinary)
     workingFolderUnix = baUnixName(workingFolder)
-    newpathUnix = baUnixName(newpath)
+    -- newpathUnix = baUnixName(newpath)
   else
-    newpathUnix = newpath
+    -- newpathUnix = newpath
     workingFolderUnix = workingFolder
     if the last char of workingFolderUnix = the last char of the applicationpath then delete the last char of workingFolderUnix
@@ -2547 +2599 @@
   
   
-  mDisplayWaitStatusText me, "SVN update:" && newpathUnix
-  
-  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & newpathUnix & QUOTE, RETURN, 0, 1)
-  
-  
-  if count(theresult) > 0 then
-    
-    -------- reload the refreshed movie:
-    if the moviepath contains workingFolder then
-      
-      -- go to movie the moviepath & the moviename
-      
+  mDisplayWaitStatusText me, "SVN update..." -- && newpathUnix
+  
+  repeat with castlibPaths in castlibPathList
+    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibPaths[#newpathUnix] & QUOTE, RETURN, 0, 1)
+    if count(theresult) > 0 then
+      if doReturnToOldMovie = 1 then go to movie oldmovie
+      if dontShowAlert <> 1 then alert "svn application did not respond, something seems to have failed. :-("
+      setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
+      if statusSwitched = 1 then statusSwitched = mSwitchToStatusMode(me, 0)
+      exit
     else
-      
-      if onlyUpdate_SVN_WorkingFolder <> 1 then
-        
-        -------------------------- now get the updated movies over here:
-        if the last char of workingFolder <> the last char of the applicationpath then put the last char of the applicationpath after workingFolder
-        
-        put "Copy file from " & workingFolder & " to " & oldmoviepath
-        
-        
-        erg = baCopyFileProgress(newpath, fname, "Always", "Replacing castlib with the version of the working folder", "", 33)
+      put theresult[1]
+    end if
+  end repeat
+  
+  
+  
+  -------- reload the refreshed movie:
+  if the moviepath contains workingFolder then
+    
+    -- go to movie the moviepath & the moviename
+    
+  else
+    
+    if onlyUpdate_SVN_WorkingFolder <> 1 then
+      
+      -------------------------- now get the updated movies over here:
+      if the last char of workingFolder <> the last char of the applicationpath then put the last char of the applicationpath after workingFolder
+      
+      put "Copy file from " & workingFolder & " to " & oldmoviepath
+      
+      
+      repeat with castlibPaths in castlibPathList
+        
+        erg = baCopyFileProgress(castlibPathList[#newpath], castlibPathList[#fname], "Always", "Replacing castlib with the version of the working folder", "", 33)
         if erg <> 0 then
-          alert "An error occurred during copying the file (" & newpath & "). Error:" && erg
+          alert "An error occurred during copying the file (" & castlibPathList[#newpath] & "). Error:" && erg
         else
-          put "Replaced file:" && newpath
+          put "Replaced file:" && castlibPathList[#newpath]
         end if
         
-        
-        ----------------------------------
-        
-      end if
-      
-    end if
-    
-    put theresult[1]
-    
-    if doReturnToOldMovie = 1 then go to movie oldmovie
-    
-    if dontShowAlert <> 1 then alert "Done, see the results of the svn operation in the message window."
-    
-  else
-    
-    if doReturnToOldMovie = 1 then go to movie oldmovie
-    
-    if dontShowAlert <> 1 then alert "svn application did not respond, something seems to have failed. :-("
-  end if
+      end repeat
+      ----------------------------------
+      
+    end if
+    
+  end if
+  
+  
+  
+  if doReturnToOldMovie = 1 then go to movie oldmovie
+  
+  if dontShowAlert <> 1 then alert "Done, see the results of the svn operation in the message window."
+  
   
   
@@ -2875 +2933 @@
     
     if count(castlibList) < 1 then
-      alert "No castlib selected. The parameter didn't yiled a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
+      alert "No castlib selected. The parameter didn't yield a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
       if statusSwitched = 1 then statusSwitched = mSwitchToStatusMode(me, 0)
       return 0