Changeset 12 for trunk/lingosource

Timestamp:

09/03/07 08:40:14 (5 years ago)

Author:

alex

Message:

fixed ssome windows bugs in regards to svn functions

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (1 diff)
• castlib1/alexUtilities.ls (modified) (9 diffs)
• castlib1/thisMoviesScript.ls (modified) (2 diffs)
• castlib2/FileIOFunktionen.ls (modified) (2 diffs)
• castlib2/memberInfo.xml (modified) (1 diff)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -172 +172 @@
   subli.add("mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix")
   subli.add("mImportScriptWithThumbnail me, thePath, castlibNumber, dontWarn, infolist")
+  subli.add("")
   subli.add("mUpdateScriptsFromFolder me, thePath, selectionOnly")
+  subli.add("")
+  subli.add("mSVN_Delete_Selected_Scripts me, chooseNewPath")
   subli.add("")
   subli.add("mSVN_Update_Working_Copy me, chooseNewPath")
   subli.add("mSVN_Commit_CurrentScripts me, selected_Members_Only")
+  subli.add("")
+  subli.add("mSVN_Update_CurrentMovie me")
+  subli.add("mSVN_Commit_CurrentMovie me")
   ----------------------------------------------------
   

trunk/lingosource/castlib1/alexUtilities.ls

@@ -151 +151 @@
         startfolder = string(startfolder)
         if length(startfolder) > 0 then
-          pfad = baGetFilename("save", startfolder, theDefaultName, "", 524288+4, theTitle, false, -1, -1)
+          pfad = baGetFilename("save", startfolder, theDefaultName, "", 524288+4+2+4194304, theTitle, false, -1, -1)
         else
-          pfad = baGetFilename("save", "", theDefaultName, "", 524288+4, theTitle, false, -1, -1)
+          pfad = baGetFilename("save", "", theDefaultName, "", 524288+4+2+4194304, theTitle, false, -1, -1)
         end if
       else
@@ -331 +331 @@
   
   if mCheckForXtra(me, "BudAPI") = 1 then -- if buddy is present...
-    retval = baGetFolder( "", "Select a folder", 0, "", 50, 50 )
+    retval = baGetFolder( "", "Select a folder", 3, "", 50, 50 )
   else if mCheckForXtra(me, "FileXtra4") = 1 then -- if not buddy then try filextra
     fx = (xtra "filextra4").new()
@@ -3830 +3830 @@
   
   if the platform contains "mac" then
-    theresult = shell_cmd_list(baUnixName(svnBinary) && "update" && QUOTE & baUnixName(workingFolder) & QUOTE)
+    svnBinary = baUnixName(svnBinary)
+    workingFolder = baUnixName(workingFolder)
   else
-    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
-  end if
+    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
+  end if
+  
+  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
   
   if count(theresult) > 0 then
-    alert "svn response:" && theresult[1]
+    put theresult[1]
+    alert "Done, see the results of the svn operation in the message window."
   else
     alert "svn application did not respond, something seems to have failed. :-("
@@ -3846 +3850 @@
 
 
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mSVN_Commit_CurrentScripts me, selected_Members_Only, chooseNewPath
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Delete_Selected_Scripts me, chooseNewPath
+  
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -3859 +3863 @@
   workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
   if length(workingFolder) < 1 then exit
+  
+  
+  if the platform contains "mac" then
+    isMac = 1
+    svnBinary = baUnixName(svnBinary)
+    
+  else
+    isMac = 0
+    
+  end if
+  
+  
+  thePath = workingFolder
+  
+  cl = the activecastlib
+  
+  olddelim = the itemdelimiter
+  the itemdelimiter = the last char of the applicationpath
+  fname = thePath
+  delete the last item of fname
+  fname = the last item of fname
+  the itemdelimiter = olddelim
+  
+  infolist = 0
+  
+  if fname <> "castlib" & the number of castlib cl then
+    
+    newPath = thePath & "castlib" & the number of castlib cl
+    
+    if baFolderExists(newPath) = 0 then
+      
+      infolistPath = thePath & "memberInfo.xml"
+      
+      infolist = mReadXML_2_List(me, infolistPath)
+      
+      if ilk(infolist) <> #proplist then
+        
+        alert "The specified folder doesn't seem to contain info for this castlib: file memberInfo.xml missing."
+        return 0
+        
+      else
+        
+        thePath = newPath
+        
+      end if
+      
+    else
+      
+      thePath = newPath
+      
+    end if
+  end if
+  
+  
+  if infolist = 0 then
+    
+    infolistPath = thePath & "memberInfo.xml"
+    infolist = mReadXML_2_List(me, infolistPath)
+    
+    if ilk(infolist) <> #proplist then
+      
+      alert "The specified folder doesn't seem to contain info for this castlib: file memberInfo.xml missing."
+      return 0
+      
+    end if
+    
+  end if
+  
+  doCommit = 0
+  saveRequired = 0
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  anz = sel.count
+  cnt = 1
+  repeat with n = 1 to anz
+    repeat with m = sel[n][1] to sel[n][2]
+      memref = member(m, cl)
+      dertyp = memref.type
+      if dertyp = #script then
+        
+        repeat with l = 1 to cnt
+          li = infolist[l]
+          
+          if li.getaprop(#memberName) = memref.name then
+            fpath = thePath & infolist.getpropat(l) & ".ls"
+            
+            if baFileExists(fpath) then
+              
+              if isMac = 1 then
+                ufpath =  baUnixName(fpath)
+              else
+                ufpath =  fpath
+              end if
+              
+              theresult = shell_cmd_list(svnBinary && "delete" && QUOTE & ufpath & QUOTE)
+              if count(theresult) < 1 then
+                put "failed to svn delete member " & memref & " no result from svn?!"
+              else
+                put theresult[1]
+                doCommit = 1
+              end if
+              
+              li.deleteAt(l)
+              memref.erase()
+              saveRequired = 1
+              put "Erase member:" && memref.name
+              
+            end if
+            
+          end if
+        end repeat
+        
+      end if
+    end repeat
+  end repeat
+  
+  
+  if saveRequired = 1 then
+    
+    if (baMsgBoxEx("The movie has been changed. Save changes to this movie?", "Save changes?", "Save", "Don't save", "", "Question", 1, "left", "Arial", 14, 4, -2, -2) = "Save") then
+      saveMovie()
+    end if
+    
+  end if
+  
+  
+  if doCommit = 1 then
+    
+    msg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
+    
+    if length(msg) < 1 then
+      alert "You must enter a message for the commit action."
+      exit
+    end if
+    
+    if isMac = 1 then
+      workingFolder = baUnixName(workingFolder)
+    else
+      if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
+    end if
+    
+    theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE)
+    
+    if count(theresult) > 0 then
+      put theresult[1]
+      alert "Done, see the results of the svn operation in the message window."
+    else
+      alert "svn application did not respond, something seems to have failed. :-("
+    end if
+    
+  else
+    
+    alert "Nothing has been committed!"
+    
+  end if
+  
+  return 1
+  
+end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_CurrentMovie me, chooseNewPath
+  
+  workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
+  if length(svnBinary) < 1 then exit
+  
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  if length(workingFolder) < 1 then exit
+  
   
   msg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
@@ -3873 +4052 @@
   end if
   
-  
   saveMovie()
   
-  
-  mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
-  
+  ------------
+  if workingFolder <> the moviepath then
+    erg = baCopyFileProgress(the moviepath & the moviename, workingFolder & the moviename, "Always", "Copying movie to working folder", "", 33)
+    if erg <> 0 then
+      alert "An error occurred during copying the movie:" && erg
+      exit
+    end if
+    clnum = the number of castlibs
+    mp = the moviepath
+    mplen = length(mp)
+    olddelim = the itemdelimiter
+    the itemdelimiter = mp
+    repeat with n = 2 to clnum
+      fname = castlib(n).filename
+      if length(fname) > 0 then
+        
+        offs = offset(mp, fname)
+        if offs <> 1 then
+          alert "Castlib" && castlib(n) && "is not within your current moviepath. This is not supported."
+          exit
+        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 " & n & " to working folder", "", 33)
+        
+      end if
+    end repeat
+    the itemdelimiter = olddelim
+  end if
+  ------------
   
   if the platform contains "mac" then
     svnBinary = baUnixName(svnBinary)
     workingFolder = baUnixName(workingFolder)
+  else
+    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
   end if
   
@@ -3898 +4110 @@
     exit  
   end if
+  
+  
+  ------- NOW, basically there are two options, one is only commiting the files, which we have copied (director movie and castlibs)
+  ------- OR commit the whole folder (-> everything, which is changed or added to <workingFolder>)
+  ------- The problem regarding option #1, is that it would be a new revision for each file -> ugly
+  ------- #2 however "messes" with files, which the user may not expect...
+  ------- I for one prefer #2 anyway, therefore I didn't even implement #1
+  ------- in order to implement #1 you can use a repeat loop just like the above repeat, which goes thorugh each castlib
   
   theresult = shell_cmd_list(svnBinary && "status" && QUOTE & workingFolder & QUOTE)
@@ -3940 +4160 @@
     
     put theResult
-    alert "svn response:" && theresult
+    alert "Done, see the results of the svn operation in the message window."
+    
+  else
+    alert "svn application did not respond, something seems to have failed. :-("
+  end if
+  
+  
+  setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Update_CurrentMovie me, chooseNewPath
+  
+  workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
+  if length(svnBinary) < 1 then exit
+  
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  if length(workingFolder) < 1 then exit
+  
+  if the platform contains "mac" then
+    svnBinary = baUnixName(svnBinary)
+    workingFolder = baUnixName(workingFolder)
+  else
+    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
+  end if
+  
+  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
+  
+  if count(theresult) > 0 then
+    put theresult[1]
+    alert "Done, see the results of the svn operation in the message window."
+  else
+    alert "svn application did not respond, something seems to have failed. :-("
+  end if
+  
+  setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_CurrentScripts me, selected_Members_Only, chooseNewPath
+  
+  workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
+  if length(svnBinary) < 1 then exit
+  
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  if length(workingFolder) < 1 then exit
+  
+  msg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
+  
+  if length(msg) < 1 then
+    alert "You must enter a message for the commit action."
+    exit
+  end if
+  
+  if workingCopies.getaprop(#dontWarnWhenSaving) <> 1 then
+    answer = baMsgBoxEx("The movie will be saved before committing.", "Save movie?", "Save", "Cancel", "Always save", "Question", 1, "left", "Arial", 14, 4, -2, -2)
+    if answer = "Cancel" then exit
+    if answer = "Always save" then workingCopies.setaprop(#dontWarnWhenSaving, 1)
+  end if
+  
+  
+  saveMovie()
+  
+  
+  mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
+  
+  
+  if the platform contains "mac" then
+    svnBinary = baUnixName(svnBinary)
+    workingFolder = baUnixName(workingFolder)
+  else
+    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
+  end if
+  
+  
+  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
+  
+  if count(theresult) < 1 then
+    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE && "2>&1")
+    if count(theresult) < 1 then
+      theError = theresult[1]
+    else
+      theError = "svn did not respond at all."
+    end if
+    alert "Can't proceed svn error while trying to update:" && theError
+    exit  
+  end if
+  
+  theresult = shell_cmd_list(svnBinary && "status" && QUOTE & workingFolder & QUOTE)
+  
+  cnt = count(theresult)
+  if cnt < 1 then
+    alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
+    exit
+  end if
+  
+  repeat with n = 1 to cnt
+    answ = theresult[n]
+    meth = word 1 of answ
+    delete word 1 of answ
+    
+    case meth of
+      "!": -- deleted file (missing here, but in the repository present)
+        -- I don't think, it is a good idea to delete the file in the repository in this case
+        -- as it may also be the case, that we only have a subset of the castlibs/scripts
+        -- therefore I just skip these files and leave it to the user what to do with them in his svn client application
+        -- we only put a message, so the user is made aware of this fact
+        put "Missing file!" && answ && "is missing here, but present in the repository"
+        
+      "?": -- newly added file
+        shell_cmd_list(svnBinary && "add" && QUOTE & answ & QUOTE)
+        
+        put "Added file" && answ && "to the repository"
+        
+      "m":
+        -- just log the changes:
+        put "Update file:" && answ
+        
+    end case
+    
+  end repeat
+  
+  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE)
+  
+  
+  if count(theresult) > 0 then
+    theResult = theresult[1]
+    
+    put theResult
+    alert "Done, see the results of the svn operation in the message window."
     
   else
@@ -4046 +4405 @@
   
   if chooseNewPath = 1 then
-    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 0, "Select working copy", -2, -2)
+    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if
   
   if workingFolder = "" then
     alert "No working copy is specified for this movie. Please select a working copy now."
-    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 0, "Select working copy", -2, -2)
+    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if
   

trunk/lingosource/castlib1/thisMoviesScript.ls

@@ -21 +21 @@
   theResult = prefsScript.mGetPrefValue(#windowrect)
   if ilk(theResult) <> #rect then theResult = rect(0,0,(the activewindow).rect.width, (the activewindow).rect.height).offset(50, 50)
-  (the activewindow).rect = theResult 
+  (the activewindow).rect = theResult
 end
 
@@ -37 +37 @@
   -------------- the only benefit of doing so, was to save the window position, but maybe there was any other problem...?
   
-  --  theResult = call(#mSetPrefValue, [mGetXscript(#GetSetPrefs)], #windowrect, (the activewindow).rect)
-  --  theResult = call(#mSavePrefs, [mGetXscript(#GetSetPrefs)], "handlerMenuToolPrefs", 1)
+  -------------- I've put it back in now, as I am having a problem on windows anyway, that I'll need to investigate further
+  theResult = call(#mSetPrefValue, [mGetXscript(#GetSetPrefs)], #windowrect, (the activewindow).rect)
+  theResult = call(#mSavePrefs, [mGetXscript(#GetSetPrefs)], "handlerMenuToolPrefs", 1)
   
   forget the activewindow

trunk/lingosource/castlib2/FileIOFunktionen.ls

@@ -107 +107 @@
         startfolder = string(startfolder)
         if length(startfolder) > 0 then
-          pfad = baGetFilename("save", startfolder, theDefaultName, "", 524288+4, theTitle, false, -1, -1)
+          pfad = baGetFilename("save", startfolder, theDefaultName, "", 524288+2+4+4194304, theTitle, false, -1, -1)
         else
-        pfad = baGetFilename("save", "", theDefaultName, "", 524288+4, theTitle, false, -1, -1)
+        pfad = baGetFilename("save", "", theDefaultName, "", 524288+2+4+4194304, theTitle, false, -1, -1)
         end if
       else
@@ -281 +281 @@
     prompt = string(prompt)
     
-    return baGetFilename("open", startDir, defaultName, filetypes, 524288+4, prompt, false, -2, -1)
+    return baGetFilename("open", startDir, defaultName, filetypes, 524288+4+2+4194304, prompt, false, -2, -1)
     
   else

trunk/lingosource/castlib2/memberInfo.xml

@@ -66 +66 @@
                 <memberName>commonMovieScript</memberName>
         </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
         <commonMovieScript>
                 <scriptType>#parent</scriptType>