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

Timestamp:

02/21/08 07:51:08 (4 years ago)

Author:

alex

Message:

added functions for lingodoc snippets and fixed issues with external script editors on mac

File:

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

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -147 +147 @@
           
           theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
-          ---------------------
-          
-          mDoShellCmd(me, "bbedit " & tempSrcPath)
+          
+          if theResult = 0 then
+            alert "Unable to save temp file:" && tempSrcHFSPath
+          else
+            mDoShellCmd(me, "bbedit " & tempSrcPath)
+          end if
+          
           
         end if
@@ -206 +210 @@
   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
+  isMac = (the platform contains "mac")
   
   editor = mGetExternalScriptEditor(me)
@@ -258 +235 @@
         if doLiveEdit then
           ---------------------
-          tempSrcPath = tempFolder & "temp_LingoScript_file.ls"
+          tempSrcHFSPath = mGetTempFilePath(me, "temp_LingoScript_file.ls")
           
           if isMac then
             waitparam = ""
             editor = mGetMacBinary(me, editor)
-            tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+            tempSrcPath = mConvertHfs2Unix(me, tempSrcHFSPath)
           else
-            waitparam = " \w"
-            tempSrcHFSPath = tempSrcPath
+            waitparam = " /wait"
+            tempSrcPath = tempSrcHFSPath
           end if
           ---------------------
@@ -272 +249 @@
           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
+          if theResult = 0 then
+            alert "Unable to save temp file:" && tempSrcHFSPath
+          else
+            
+            mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+            
+            theText = mGetTextFromFile(me, tempSrcHFSPath)
+            
+            if length(theText) < 1 then
+              alert "Temp file:" && tempSrcHFSPath && "contains no text. Changes will not be written to script."
+              
+            else
+              
+              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
+              
+            end if
+            
           end if
           
@@ -295 +285 @@
           ---------------------
           -- create a temporary file from scripttext:
-          tempSrcPath = tempFolder & theName & ".ls"
+          tempSrcHFSPath = mGetTempFilePath(me, theName & ".ls")
           
           if isMac then
             waitparam = " &"
-            editor = ""
-            tempSrcHFSPath = tempSrcPath
+            editor = mGetMacBinary(me, editor)
+            tempSrcPath = tempSrcHFSPath
           else
             waitparam = ""
-            tempSrcHFSPath = tempSrcPath
+            tempSrcPath = tempSrcHFSPath
           end if
           
@@ -309 +299 @@
           ---------------------
           
-          mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+          if theResult = 0 then
+            alert "Unable to save temp file:" && tempSrcHFSPath
+          else
+            mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+          end if
           
         end if
@@ -355 +349 @@
           #field: memref.text = theText
         end case
+        
+      else
+        alert "Temp file:" && tempSrcPath && "contains no text. Changes will not be written to script."
         
       end if