Changeset 148 for trunk/lingosource/castlib1/bbedit_Utilities.ls

Timestamp:

02/18/08 05:09:49 (4 years ago)

Author:

alex

Message:

enabled most of the bbedit function also for windows using user definad apps as relacements

File:

• trunk/lingosource/castlib1/bbedit_Utilities.ls (modified) (17 diffs)

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -6 +6 @@
 end
 
+
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 on _______________BBEDIT_SCRIPTS end
@@ -11 +12 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mOpen_Linked_Script_With_BBedit me
-  
-  if not(the platform contains "mac") then
-    alert "Sorry, BBEdit is a mac application!" & RETURN & "If you change this handler to match something appropriate for Windows, please drop me a note. alex@farbflash.de"
-    exit
-  end if
+on mOpen_Linked_Script_With_BBedit me, editor
   
   if  mCheckForXtra(me, "ff_shell") = 0 then
@@ -28 +24 @@
   sel = the selection of castlib cl
   
-  clistr = "bbedit"
+  editor = string(editor)
+  if length(editor) < 1 then
+    clistr = "bbedit"
+  else
+    clistr = editor
+  end if
   
   repeat with sub in sel
@@ -51 +52 @@
   
 end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mOpen_Linked_Script_With_ext_editor me
+  editor = mGetExternalScriptEditor(me)
+  if length(editor) < 1 then exit
+  mOpen_Linked_Script_With_BBedit me, editor
+end 
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -132 +141 @@
           ---------------------
           -- create a temporary file from scripttext:
-          tempSrcPath = "/tmp/" & theName & ".ls"
-          
-          -- tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-          -- tempSrcHFSPath = tempSrcHFSPath[1]
-          tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          if mCheckForXtra(me, "BudAPI") then
+            
+            resetUNames = 0
+            if baSysFolder("prefs") starts "/" then
+              baReturnUnixNames(0)
+              resetUNames = 1
+            end if
+            tempSrcHFSPath = basysfolder("temp") & theName & ".ls"
+            baReturnUnixNames(1)
+            tempSrcPath = basysfolder("temp") & theName & ".ls"
+            if resetUNames = 0 then
+              baReturnUnixNames(0)
+            end if  
+          else
+            tempSrcPath = "/tmp/" & theName & ".ls"
+            tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          end if
           
           
@@ -144 +165 @@
           mDoShellCmd(me, "bbedit " & tempSrcPath)
           
-          
         end if
-        
-        --        neuer = new(#field)
-        --        neuer.text = theText
-        --        
-        --        oldclipboardNum = new(#field)
-        --        oldclipboardNum.pasteClipBoardInto()
-        --        
-        --        copyToClipBoard(neuer)
-        --        
-        --        shell_cmd("pbpaste | bbedit")
-        --        
-        --        if oldclipboardNum.type <> #empty then copyToClipBoard(oldclipboardNum)
-        --        oldclipboardNum.erase()
-        --        neuer.erase()
-        --        
-        --        exit
         
       end if
@@ -172 +176 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mReImport_text_Opened_In_BBedit me
-  
-  if not(the platform contains "mac") then
-    alert "Sorry, BBEdit is a mac application!" & RETURN & "If you change this handler to match something appropriate for Windows, please drop me a note. alex@farbflash.de"
-    exit
+on mEdit_text_in_ext_editor me
+  mOpen_text_with_ext_editor me, 1
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetMacBinary me, editor
+  if not(editor starts "/") then
+    editor = mConvertHFS2Unix(me, editor)
+  end if
+  
+  if the last char of editor = "/" then delete the last char of editor
+  
+  olddelim = the itemdelimiter
+  the itemdelimiter = "/"
+  
+  appname = the last item of editor
+  if offset(".app", appname) = length(appname) - 3 then
+    infoplist = editor & "/Contents/Info.plist"
+    exename = mDoShellCmd(me, "grep -A1 -E '<key>CFBundleExecutable<\/key>'" && QUOTE & infoplist & QUOTE & " | grep -vE '<key>CFBundleExecutable</key>' | cut -d\> -f2 | cut -d\< -f1")
+    if the last char of exename = RETURN then delete the last char of exename
+    if the last char of exename = numToChar(10) then delete the last char of exename
+    editor = editor & "/Contents/MacOS/" & exename
+  end if
+  
+  the itemDelimiter = olddelim
+  
+  return editor
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mOpen_text_with_ext_editor me, doLiveEdit
+  
+  if  mCheckForXtra(me, "ff_shell") = 0 then
+    if mCheckForXtra(me, "Shell") = 0 then
+      mShellXtraMissing me
+      exit
+    end if
   end if
   
@@ -182 +220 @@
   sel = the selection of castlib cl
   
+  if mCheckForXtra(me, "BudAPI") then
+    --    tempFolder = basysfolder("temp")
+    
+    if the platform contains "mac" then
+      
+      isMac = 1
+      resetUNames = 0
+      if baSysFolder("prefs") starts "/" then
+        baReturnUnixNames(0)
+        resetUNames = 1
+      end if
+      tempFolderHFS = basysfolder("temp")
+      baReturnUnixNames(1)
+      tempFolder = basysfolder("temp")
+      if resetUNames = 0 then
+        baReturnUnixNames(0)
+      end if
+      
+    else
+      tempFolderHFS = basysfolder("temp")
+      tempFolder = tempFolderHFS
+    end if
+    
+    
+  else
+    alert "You need the buddyApi xtra for this operation"
+    exit
+  end if
+  
+  editor = mGetExternalScriptEditor(me)
+  if length(editor) < 1 then exit
+  
   repeat with sub in sel
     repeat with mem = sub[1] to sub[2]
@@ -187 +257 @@
       memref = member(mem,cl)
       
+      theText = ""
+      theType = memref.type
+      if theType = #script then
+        theText = memref.scripttext
+      else if theType = #text then
+        theText = memref.html
+      else if theType = #field then
+        theText = memref.text
+      end if
+      
+      if length(theText) > 0 then
+        
+        
+        if doLiveEdit then
+          ---------------------
+          tempSrcPath = tempFolder & "temp_LingoScript_file.ls"
+          
+          if isMac then
+            waitparam = ""
+            editor = mGetMacBinary(me, editor)
+            tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          else
+            waitparam = " \w"
+            tempSrcHFSPath = tempSrcPath
+          end if
+          ---------------------
+          
+          theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
+          
+          mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+          
+          theText = mGetTextFromFile(me, tempSrcHFSPath)
+          
+          theText = mForceMacLineBreaks(me, theText)
+          
+          if theType = #script then
+            memref.scripttext = theText
+          else if theType = #text then
+            memref.html = theText
+          else if theType = #field then
+            memref.text = theText
+          end if
+          
+          
+        else
+          
+          theName = memref.name
+          if length(theName) < 1 then
+            theName = "member_" & memref.membernum & "_" & memref.castlibnum
+          end if
+          ---------------------
+          -- create a temporary file from scripttext:
+          tempSrcPath = tempFolder & theName & ".ls"
+          
+          if isMac then
+            waitparam = " &"
+            editor = ""
+            tempSrcHFSPath = tempSrcPath
+          else
+            waitparam = ""
+            tempSrcHFSPath = tempSrcPath
+          end if
+          
+          theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
+          ---------------------
+          
+          mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+          
+        end if
+        
+      end if
+    end repeat
+  end repeat
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mReImport_text_Opened_In_ext_editor me
+  mReImport_text_Opened_In_BBedit me
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mReImport_text_Opened_In_BBedit me
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  
+  repeat with sub in sel
+    repeat with mem = sub[1] to sub[2]
+      
+      memref = member(mem,cl)
       
       theName = memref.name
@@ -193 +356 @@
       end if
       
-      delim = the last char of the moviepath
-      olddelim = the itemdelimiter
-      the itemdelimiter = delim
-      hd = item 1 of getosdirectory()
-      
-      tempSrcPath = hd & delim & "tmp" & delim & theName & ".ls"
-      the itemdelimiter = olddelim
+      if not(the platform contains "mac") then
+        if mCheckForXtra(me, "BudAPI") then
+          tempSrcPath = basysfolder("temp")
+          put theName & ".ls" after tempSrcPath
+        else
+          alert "You need the buddyApi xtra for this operation"
+          exit
+        end if
+      else
+        delim = the last char of the moviepath
+        olddelim = the itemdelimiter
+        the itemdelimiter = delim
+        hd = item 1 of getosdirectory()
+        
+        tempSrcPath = hd & delim & "tmp" & delim & theName & ".ls"
+        the itemdelimiter = olddelim
+      end if
       
       theText = mGetTextFromFile(me, tempSrcPath)
       
       if length(theText) > 0 then
+        
+        theText = mForceMacLineBreaks(me, theText)
         
         case memref.type of
@@ -216 +391 @@
   end repeat
   
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mForceMacLineBreaks me, theText
+  rettext = ""
+  olddelim = the itemdelimiter
+  the itemdelimiter = numToChar(10)
+  thirteen = numToChar(13)
+  num = the number of items of theText
+  repeat with n = num down to 1
+    i = item n of theText
+    put i after rettext
+    if the last char of i <> thirteen then put thirteen after rettext
+  end repeat
+  the itemdelimiter = olddelim
+  return rettext
 end
 
@@ -544 +736 @@
   end if
 end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mLiveCompare_SelectedScript me, convertLineBreaksToUnix
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  
+  if count(sel) > 0 then
+    memref1 = member(sel[1][1], cl)
+    if sel[1][2] <> sel[1][1] then
+      memref2 = member(sel[1][2], cl)
+    else
+      if count(sel) < 2 then
+        alert "Please select two castmembers!"
+        exit
+      end if
+      memref2 = member(sel[2][1], cl)
+    end if
+  else
+    alert "Please select two castmembers!"
+    exit
+  end if
+  
+  memtype = memref1.type
+  if [#script, #field, #text].getPos(memtype) < 1 then
+    alert "The members must be either #script, #field or #text members!"
+    exit
+  else
+    case memtype of
+        
+        -----------------------
+      #script:
+        ext1 = ".ls"
+        st1 = memref1.scripttext
+        
+        -----------------------
+      #text:
+        ext1 = ".html"
+        st1 = memref1.html
+        
+        -----------------------
+      otherwise:
+        ext1 = ".txt"
+        st1 = memref1.text
+        
+    end case
+    
+  end if
+  
+  memtype = memref2.type
+  if [#script, #field, #text].getPos(memtype) < 1 then
+    alert "The members must be either #script, #field or #text members!"
+    exit
+  else
+    case memtype of
+        
+        -----------------------
+      #script:
+        ext2 = ".ls"
+        st2 = memref2.scripttext
+        
+        -----------------------
+      #text:
+        ext2 = ".html"
+        st2 = memref2.html
+        
+        -----------------------
+      otherwise:
+        ext2 = ".txt"
+        st2 = memref2.text
+        
+    end case
+  end if
+  
+  if not(the platform contains "mac") then
+    
+    bbdiffpath = mGetSVNDiffBinaryPath(me)
+    
+    if length(bbdiffpath) < 1 then exit
+    
+    isMac = 0
+  else
+    isMac = 1
+    bbdiffpath = mFindUnixAppInPath(me, "bbdiff")
+    if length(bbdiffpath) < 1 then
+      alert "This function only works with BBDiff, a command line tool provided by BBEdit. Consider installing BBEdits command line tools, it is really helpful."
+      exit
+    end if
+    
+  end if
+  
+  
+  if  mCheckForXtra(me, "ff_shell") = 0 then
+    if mCheckForXtra(me, "Shell") = 0 then
+      mShellXtraMissing me
+      exit
+    end if
+  end if
+  
+  
+  name1 = memref1.name & "_m" & memref1.memberNum & "_c" & memref1.castlibnum
+  fname1 = mGetTempFilePath(me, name1 & ext1)
+  
+  name2 = memref2.name & "_m" & memref2.memberNum & "_c" & memref2.castlibnum
+  fname2 = mGetTempFilePath(me, name2 & ext2)
+  
+  ------------------------------------------ trac subversion support works better with unix linebreaks...
+  if voidP(convertLineBreaksToUnix) then convertLineBreaksToUnix = 1
+  if convertLineBreaksToUnix = "" then convertLineBreaksToUnix = 1
+  
+  if convertLineBreaksToUnix = 1 then
+    st1 = mConvertLineBreaksToUnix(me, st1)
+    st2 = mConvertLineBreaksToUnix(me, st2)
+  end if
+  -----------------------------------------
+  
+  
+  theResult = mSaveTextToTempFile(me, st1, fname1)
+  theResult = mSaveTextToTempFile(me, st2, fname2)
+  ---------------------
+  
+  
+  if isMac then
+    
+    
+    theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& mConvertHFS2Unix(me, fname1) &QUOTE&&QUOTE& mConvertHFS2Unix(me, fname2) &QUOTE && "2>&1", RETURN, 0, 1)
+    
+    -- since we used the --wait and the --resume switch, we will only come to this line AFTER the diff process in bbedit is finished
+    
+    if count(theResult) > 0 then
+      if theResult[1] contains "no such file or directory" then
+        put theResult[1]
+      else
+        put "No differences found for member: " & memref1.name && "(" & memref1 & ") and " & memref2.name && "(" & memref2 & ")"
+      end if
+      writeBack = 0
+      
+    else
+      
+      -------- now write the results of the BBEdit diff back into the script members
+      st1 = mGetTextFromFile(me, fname1)
+      st2 = mGetTextFromFile(me, fname2)
+      
+      writeBack = 1
+      
+    end if
+    
+    ---------------------- windows
+  else
+    
+    
+    theResult = mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE && QUOTE & fname1 &QUOTE&&QUOTE& fname2 &QUOTE, RETURN, 0, 0, 0)
+    
+    -------- now write the results of the BBEdit diff back into the script members
+    st1 = mGetTextFromFile(me, fname1)
+    st2 = mGetTextFromFile(me, fname2)
+    
+    writeBack = 1
+  end if
+  
+  
+  if writeBack = 1 then
+    
+    
+    if convertLineBreaksToUnix = 1 then
+      st1 = mConvertLineBreaksToMac(me, st1)
+      st2 = mConvertLineBreaksToMac(me, st2)
+    end if
+    
+    memtype = memref1.type
+    case memtype of
+        -----------------------
+      #script:
+        memref1.scripttext = st1
+        
+        -----------------------
+      #text:
+        memref1.html = st1
+        
+        -----------------------
+      otherwise:
+        memref1.text = st1
+        
+    end case
+    
+    memtype = memref2.type
+    case memtype of
+        -----------------------
+      #script:
+        memref2.scripttext = st2
+        
+        -----------------------
+      #text:
+        memref2.html = st2
+        
+        -----------------------
+      otherwise:
+        memref2.text = st2
+        
+    end case
+    
+  end if
+  
+  
+end
+
 
 
@@ -891 +1291 @@
   
   
-  --  if not(the platform contains "mac") then
-  --    alert "Sorry, BBEdit is a mac application!" & RETURN & "If you change this handler to match something appropriate for Windows, please drop me a note. alex@farbflash.de"
-  --    exit
-  --  end if
-  --  
-  --  if mCheckForXtra(me, "Shell") = 0 then
-  --    mShellXtraMissing me
-  --    exit
-  --  end if
-  
-  
   bbdiffpath = ""
   if the platform contains "mac" then
@@ -925 +1314 @@
   
   
-  
-  
-  
   cl = the activecastlib
   sel = the selection of castlib cl
@@ -946 +1332 @@
         memname = memref.name
         comm = memref.comments
-        if comm.length then
+        
+        if length(comm) < 1 then
+          -- put memref.name && "(" & memref & ") has no comments - not linked" 
+        else
           
           aPath = mGetFilePathFromMemberComments(me, memref, isMac, CurrentOSXUserName)
           
-          if length(aPath) > 0 then
+          if length(aPath) < 1 then
+            -- put memref.name && "(" & memref & ") has no comments - not linked" 
+          else
             
             fio = (xtra "fileio").new()
+            
             if objectP(fio) then
+              
               fio.openFile(aPath, 0)
-              if fio.status() = 0 then
+              
+              if fio.status() <> 0 then
+                put memref.name && "(" & memref & "): Couldn't open file:" && aPath && "fileIO error:" && fio.error(fio.status())
+              else
+                
                 vergText = fio.readFile()
                 fio.closeFile()
                 memscr = memref.scripttext
-                if vergText <> memscr then
+                
+                if vergText = memscr then
+                  put memref.name && "(" & memref & ") has no changes"
+                else
                   
                   isEqual = 0
@@ -975 +1375 @@
                   end if
                   
-                  if isEqual = 0 then
+                  if isEqual <> 0 then
+                    put memref.name && "(" & memref & ") has no changes"
+                  else
                     
                     if length(bbdiffpath) < 1 then
@@ -1009 +1411 @@
                     else
                       
-                      
-                      --                      tempSrcPath = mDoShellCmd(me, "mktemp -t temp_BBDiff_file1.ls", 1)
-                      --                      tempSrcPath = tempSrcPath[1]
                       tempSrcPath = "/tmp/temp_BBEdit_file.ls"
-                      
-                      -- tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-                      -- tempSrcHFSPath = tempSrcHFSPath[1]
                       tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
                       
                       mSaveTextToTempFile(me, memref.scripttext, tempSrcHFSPath)
-                      
-                      --                    comm = memref.comments
-                      --                    if comm.length then
-                      --                      if char 1 of comm = "~" then
-                      --                        put shell_Cmd("echo -n $HOME") into char 1 of comm
-                      --                      end if
-                      --                    end if
-                      
                       
                       if char 1 of comm = "~" then put "$HOME" into char 1 of comm