Changeset 6 for trunk/lingosource

Timestamp:

08/30/07 14:36:26 (5 years ago)

Author:

alex

Message:

this time it should work better

Location:

trunk/lingosource

Files:

• castlib1/alexUtilities.ls (modified) (8 diffs)
• castlib2/memberInfo.xml (modified) (1 diff)

trunk/lingosource/castlib1/alexUtilities.ls

@@ -3275 +3275 @@
           -----------------------------------------
           
-          
-          mSaveToTextFile me, scrText, thisFolder & theDefaultName & ".ls"
-          
-          
-          bmexp = 0
-          if skipIcons <> 1 then
-            
-            thumbmember = new(#bitmap)
-            thumbmember.picture = memref.thumbnail
-            
-            if thumbmember.width > 0 then
-              bmexp = 1
-              if baFileExists(thisFolder & theDefaultName & ".jpg") then baDeleteFile(thisFolder & theDefaultName & ".jpg")
-              mExportBM me, thumbmember, thisFolder & theDefaultName & ".jpg", "jpg"
+          if theDefaultName <> origname then
+            alterText = ""
+            snam = baShortFileName(thisFolder & origname & ".ls")
+            if length(snam) > 0 then
+              alterText = mGetTextFromFile(me, thisFolder & origname & ".ls")
             end if
-            
-            thumbmember.erase()
-            
+          else
+            alterText = mGetTextFromFile(me, thisFolder & theDefaultName & ".ls")
           end if
           
-          
-          if theDefaultName <> origname then
-            
-            snam = baShortFileName(thisFolder & origname & ".ls")
-            if length(snam) > 0 then baDeleteFile(snam)
-            erg = baRenameFile(thisFolder & theDefaultName & ".ls", thisFolder & origname & ".ls")
-            if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ".ls to " & thisFolder & origname & ".ls"
-            if bmexp = 1 then
-              snam = baShortFileName(thisFolder & origname & ".jpg")
-              if length(snam) > 0 then baDeleteFile(snam)
-              erg = baRenameFile(thisFolder & theDefaultName & ".jpg", thisFolder & origname & ".jpg")
-              if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ".jpg to " & thisFolder & origname & ".jpg"
+          if alterText <> scrText then
+            
+            --------------------- compare without whitespaces:
+            noChanges = (mRemoveWhiteSpaces(me, scrText&"") = mRemoveWhiteSpaces(me, alterText&""))
+            
+            if noChanges = 0 then
+              
+              
+              mSaveToTextFile me, scrText, thisFolder & theDefaultName & ".ls"
+              
+              
+              bmexp = 0
+              if skipIcons <> 1 then
+                
+                thumbmember = new(#bitmap)
+                thumbmember.picture = memref.thumbnail
+                
+                if thumbmember.width > 0 then
+                  bmexp = 1
+                  if baFileExists(thisFolder & theDefaultName & ".jpg") then baDeleteFile(thisFolder & theDefaultName & ".jpg")
+                  mExportBM me, thumbmember, thisFolder & theDefaultName & ".jpg", "jpg"
+                end if
+                
+                thumbmember.erase()
+                
+              end if
+              
+              
+              if theDefaultName <> origname then
+                
+                snam = baShortFileName(thisFolder & origname & ".ls")
+                if length(snam) > 0 then baDeleteFile(snam)
+                erg = baRenameFile(thisFolder & theDefaultName & ".ls", thisFolder & origname & ".ls")
+                if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ".ls to " & thisFolder & origname & ".ls"
+                if bmexp = 1 then
+                  snam = baShortFileName(thisFolder & origname & ".jpg")
+                  if length(snam) > 0 then baDeleteFile(snam)
+                  erg = baRenameFile(thisFolder & theDefaultName & ".jpg", thisFolder & origname & ".jpg")
+                  if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ".jpg to " & thisFolder & origname & ".jpg"
+                end if
+                
+              end if
+              
+              if origname <> memname then
+                put "Renamed member" && memref && "to" && origname & ". Scriptmember names must not be emoty or contain illegal characters (SPACE, /, :, \, &)"
+              end if
+              
             end if
-            
           end if
           
@@ -3314 +3338 @@
           infolist.setaprop(origname, [#scripttype: memref.scripttype, #comments: memref.comments, #membername: memname])
           
-          if origname <> memname then
-            put "Renamed member" && memref && "to" && origname & ". Scriptmember names must not be emoty or contain illegal characters (SPACE, /, :, \, &)"
-          end if
-          
         end if
+        
         
       end repeat
@@ -3327 +3348 @@
   end repeat
   
-  
-  
-end
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mRemoveWhiteSpaces me, theText
+  
+  if mCheckForXtra(me, "Pregex") = 1 then
+    
+    theText = [theText]
+    PRegEx_Replace(theText, "\s" , "g", "")
+    return theText[1]
+    
+  else
+    whitespaces = [" ", RETURN]
+    repeat with ws = count(whitespaces) down to 1
+      theText = mReplaceChunk(me, theText, whitespaces[ws], "")
+    end repeat
+  end if
+  
+  return theText
+  
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+-- using offset() -> no pregex
+on mReplaceChunk me, srcText, fromChunk, toChunk
+  
+  stelle = offset(fromChunk, srcText)
+  
+  if stelle then
+    
+    len = fromChunk.length
+    newtext = ""
+    replText = toChunk
+    
+    repeat while stelle
+      
+      if stelle > 1 then put char 1 to (stelle - 1) of srcText & replText after newtext
+      else put replText after newtext
+      
+      delete char 1 to (stelle + len - 1) of srcText
+      
+      stelle = offset(fromChunk, srcText)
+      
+      if stelle = 0 then put srcText after newtext
+      
+    end repeat
+    
+  else -- no match
+    
+    return srcText
+  end if
+  
+  return newtext
+end
+
+
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3482 +3557 @@
     end if
     
-    
-    
-  end if
-  
-  
+  end if
   
   cl = the activecastlib
@@ -3783 +3854 @@
   if ilk(workingCopies) <> #proplist then workingCopies = [:]
   
-  
   svnBinary = mGetSVNBinaryPath(me, workingCopies)
   if length(svnBinary) < 1 then exit
@@ -3802 +3872 @@
     if answer = "Always save" then workingCopies.setaprop(#dontWarnWhenSaving, 1)
   end if
+  
+  
   saveMovie()
   
+  
   mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
-  
   
   
@@ -3813 +3885 @@
   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"
+    alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
     exit
   end if
@@ -3851 +3937 @@
   
   if count(theresult) > 0 then
-    alert "svn response:" && theresult[1]
+    theResult = theresult[1]
+    
+    put theResult
+    alert "svn response:" && theresult
+    
   else
     alert "svn application did not respond, something seems to have failed. :-("

trunk/lingosource/castlib2/memberInfo.xml

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