rhodes 2.4.1 → 3.0.0.beta.1

data/platform/wp7/RhoRubyLib/net/NetRequest.cs

@@ -9,10 +9,11 @@ namespace rho.net
 {
     public class NetRequest
     {
-        private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+        private RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		    new RhoLogger("Net");
         private static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
-	
+        public void setLog(RhoLogger log) { LOG = log;  }
+
 	    boolean m_bCancel = false;
 	    boolean m_sslVerifyPeer = true;
         ManualResetEvent m_respWaitEvent = new ManualResetEvent(true);
@@ -204,11 +205,27 @@ namespace rho.net
             }
             catch (WebException e)
             {
-                LOG.ERROR("EndGetResponse", e);
-                response = (HttpWebResponse)e.Response;
-                m_code = Convert.ToInt32(response.StatusCode);
+                if (!m_bCancel)
+                {
+                    LOG.ERROR("EndGetResponse", e);
+                    response = (HttpWebResponse)e.Response;
+                    m_code = response != null ? Convert.ToInt32(response.StatusCode) : 0;
+                }
+                else
+                    LOG.INFO("Request was cancelled by user.");
+            }
+            catch (Exception e)
+            {
+                ///LOG.ERROR("EndGetResponse", e);
+                m_respWaitEvent.Set();
+                return;
             }
 
+            if (response == null || m_bCancel)
+            {
+                m_respWaitEvent.Set();
+                return;
+            }
             
             Stream stream = response.GetResponseStream();
 
@@ -260,11 +277,16 @@ namespace rho.net
             }
             catch (WebException e)
             {
-                LOG.ERROR("EndGetResponse", e);
-                response = (HttpWebResponse)e.Response;
-                m_code = Convert.ToInt32(response.StatusCode);
+                if (!m_bCancel)
+                {
+                    LOG.ERROR("EndGetResponse", e);
+                    response = (HttpWebResponse)e.Response;
+                    m_code = response != null ? Convert.ToInt32(response.StatusCode) : 0;
+                }else
+                    LOG.INFO("Request was cancelled by user.");
             }
-
+            if (response == null || m_bCancel)
+                return;
 
             Stream stream = response.GetResponseStream();
 
@@ -406,6 +428,7 @@ namespace rho.net
 		
 		    m_bCancel = false;
 
+            closeConnection();
             m_webRequest = WebRequest.Create(m_strUrl) as HttpWebRequest;
 
             m_webRequest.CookieContainer = new CookieContainer();

data/platform/wp7/RhoRubyLib/rubyext/RhoAsyncHttp.cs

@@ -29,6 +29,13 @@ namespace rho.rubyext
                     CAsyncHttp.getInstance().cancelRequest(cancelCallback);
             }
 
+            [RubyMethodAttribute("cancel", RubyMethodAttributes.PublicSingleton)]
+            public static void Cancel(RubyModule/*!*/ self)
+            {
+                if (CAsyncHttp.getInstance() != null)
+                    CAsyncHttp.getInstance().cancelRequest("*");
+            }
+
             [RubyMethodAttribute("do_request", RubyMethodAttributes.PublicSingleton)]
             public static MutableString doRequest(RubyModule/*!*/ self, [NotNull]String command, Hash args)
             {

data/platform/wp7/RhoRubyLib/rubyext/RhoKernelOps.cs

@@ -15,5 +15,11 @@ namespace rho.rubyext
         {
             return RhodesApp.getCallbackObject(index); ;
         }
+
+        public static Object __rho_exist_in_resources(Object/*!*/ self, String path)
+        {
+            return CRhoFile.isResourceFileExist(path);
+        }
+
     }
 }

data/platform/wp7/RhoRubyLib/sync/SyncEngine.cs

@@ -555,7 +555,7 @@ namespace rho.sync
 	    {
 	        Hashtable<String, int> hashPassed = new Hashtable<String, int>();
 	    
-	        for( int nCurSrc = m_sources.size()-1; nCurSrc > 0 ; )
+	        for( int nCurSrc = m_sources.size()-1; nCurSrc >= 0 ; )
 	        {
 	            SyncSource oCurSrc = (SyncSource)m_sources.elementAt(nCurSrc);
 	            if ( oCurSrc.getAssociations().size() == 0 || hashPassed.containsKey(oCurSrc.getName()) )
@@ -567,6 +567,9 @@ namespace rho.sync
 	                {
 	                    SyncSource.CAssociation oAssoc = (SyncSource.CAssociation)oCurSrc.getAssociations().elementAt(i);
 	                    int nAssocSrcIndex = findSrcIndex( m_sources, oAssoc.m_strSrcName);
+                        if (nAssocSrcIndex >= 0)
+                            ((SyncSource)m_sources.elementAt(nAssocSrcIndex)).addBelongsTo(oAssoc.m_strAttrib, oCurSrc.getID());
+
 	                    if ( nAssocSrcIndex >=0 && nAssocSrcIndex < nSrc )
 	                    {
 	                        m_sources.removeElementAt( nSrc );
@@ -848,7 +851,7 @@ namespace rho.sync
 
 	        return CFilePath.changeBaseName(strDbPath, strNewName+strExt);
 	    }
-	
+/*	
 	    int getStartSource()
 	    {
 	        for( int i = 0; i < m_sources.size(); i++ )
@@ -860,15 +863,15 @@ namespace rho.sync
 	
 	        return -1;
 	    }
-
-	    boolean syncOneSource(int i)
+*/
+	    void syncOneSource(int i)
 	    {
     	    SyncSource src = null;
-    	    boolean bError = false;
+    	    //boolean bError = false;
     	    try{
 		        src = (SyncSource)m_sources.elementAt(i);
 		        if ( src.getSyncType().compareTo("bulk_sync_only")==0 )
-		            return true;
+		            return;
 	
 		        if ( isSessionExist() && getState() != esStop )
 		            src.sync();
@@ -879,31 +882,32 @@ namespace rho.sync
 	    	    if ( src.m_nErrCode == RhoAppAdapter.ERR_NONE )
 	    		    src.m_nErrCode = RhoAppAdapter.ERR_RUNTIME;
 	    	
-	    	    setState(esStop);
-    		    throw exc;
+	    	    //setState(esStop);
+    		    //throw exc;
+                LOG.ERROR("Sync of source '" + src.getName() + "' failed.", exc);
     	    }finally{
     		    getNotify().onSyncSourceEnd( i, m_sources );
-    		    bError = src.m_nErrCode != RhoAppAdapter.ERR_NONE;
+    		    //bError = src.m_nErrCode != RhoAppAdapter.ERR_NONE;
     	    }
     	
-	        return !bError;
+	        //return !bError;
 	    }
 	
 	    void syncAllSources()
 	    {
-	        boolean bError = false;
+//	        boolean bError = false;
 
-	        int nStartSrc = getStartSource();
-	        if ( nStartSrc >= 0 )
-	            bError = !syncOneSource(nStartSrc);
+//	        int nStartSrc = getStartSource();
+//	        if ( nStartSrc >= 0 )
+//	            bError = !syncOneSource(nStartSrc);
 
 	        //TODO: do not stop on error source
 	        for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
 	        {
-	            bError = !syncOneSource(i);
+	            /*bError = !*/syncOneSource(i);
 	        }
 
-	        if ( !bError && !isSchemaChanged() )
+	        if ( !isSchemaChanged() )
 	    	    getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 	    }
 

data/platform/wp7/RhoRubyLib/sync/SyncNotify.cs

@@ -273,7 +273,7 @@ namespace rho.sync
         public void onSyncSourceEnd( int nSrc, Vector<SyncSource> sources )
         {
             SyncSource src = sources.elementAt(nSrc);
-
+/*
             if ( getSync().getState() == SyncEngine.esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
             {
         	    SyncNotification pSN = getSyncNotifyBySrc(src);
@@ -282,7 +282,7 @@ namespace rho.sync
         	    else
         		    fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, "" );
             }
-            else
+            else*/
                 fireSyncNotification( src, true, src.m_nErrCode, "");
 
             cleanCreateObjectErrors();

data/platform/wp7/RhoRubyLib/sync/SyncSource.cs

@@ -60,6 +60,8 @@ namespace rho.sync
         Vector<CAssociation> m_arAssociations = new Vector<CAssociation>();
         Vector<NetRequest.MultipartItem> m_arMultipartItems = new Vector<NetRequest.MultipartItem>();
         Vector<String>                  m_arBlobAttrs = new Vector<String>();
+        Hashtable<String, int> m_hashIgnorePushObjects = new Hashtable<String, int>();
+        Hashtable<String, int> m_hashBelongsTo = new Hashtable<String, int>();
     
         public int getID() { return m_nID; }
         public String getName() { return m_strName; }
@@ -178,20 +180,23 @@ namespace rho.sync
 	        //m_bIsSearch = false;
 	    
 	        try{
-	            if ( isTokenFromDB() && getToken() > 1 )
-	                syncServerChanges();  //sync only server changes, which was paused before
-	            else
-	            {
+	            //if ( isTokenFromDB() && getToken() > 1 )
+	            //    syncServerChanges();  //sync only server changes, which was paused before
+	            //else
+	            //{
 		            if ( isEmptyToken() )
 		                processToken(1);
-		    	
+                    syncClientChanges();
+    		        syncServerChanges();
+		        /*			    	
 		            boolean bSyncedServer = syncClientChanges();
 		            if ( !bSyncedServer )
 		        	    syncServerChanges();
-	            }	        
+                 */
+	            //}
 	        }catch(Exception exc)
 	        {
-	    	    getSync().stopSync();
+	    	    //getSync().stopSync();
 	    	    throw exc;
 	        }finally{
 		       TimeInterval endTime = TimeInterval.getCurrentTime();
@@ -203,6 +208,22 @@ namespace rho.sync
 	        }
 	    }
 
+	    public void syncClientChanges()//throws Exception
+	    {
+      	    PROF.START("Pull");
+
+            boolean bSyncClient = false;
+            {
+                IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and sent<=1 LIMIT 1 OFFSET 0", getID());
+                bSyncClient = !res.isEnd();
+            }
+            if ( bSyncClient )
+                doSyncClientChanges();
+
+            PROF.STOP("Pull");
+	    }
+	
+        /*
         public boolean syncClientChanges()
 	    {
 	        boolean bSyncedServer = false;
@@ -243,6 +264,68 @@ namespace rho.sync
 	    {
 	        IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and update_type='create' and sent>1  LIMIT 1 OFFSET 0", getID());
 	        return !res.isEnd();
+	    }*/
+
+	    public void addBelongsTo(String strAttrib, int nSrcID)
+	    {
+	        m_hashBelongsTo.put(strAttrib, nSrcID);
+	    }
+
+	    int getBelongsToSrcID(String strAttrib)
+	    {
+	        if ( m_hashBelongsTo.containsKey(strAttrib) )
+	            return m_hashBelongsTo.get(strAttrib);
+
+	        return -1;
+	    }
+
+	    void checkIgnorePushObjects()//throws Exception
+	    {
+	        // ignore changes in pending creates
+	        {
+	            IDBResult res = getDB().executeSQL("SELECT distinct(object) FROM changed_values where source_id=? and sent>=2", getID() );
+	            for( ; !res.isEnd(); res.next() )
+	            {
+	                String strObject = res.getStringByIdx(0);
+	                m_hashIgnorePushObjects.put(strObject, 1);
+	            }
+	        }
+
+	        //check for belongs_to
+	        String strAttribQuests = "";
+            Vector<Object> arValues = new Vector<Object>();
+	        arValues.addElement(getID());
+
+            Hashtable<String,int>.Enumerator hashEnum = m_hashBelongsTo.GetEnumerator();
+            while (hashEnum.MoveNext())
+            {
+	            if ( strAttribQuests.length() > 0 )
+	                strAttribQuests += ",";
+
+	            strAttribQuests += "?";
+	            arValues.addElement(hashEnum.Current.Key);
+	        }
+
+	        if ( strAttribQuests.length() > 0 )
+	        {
+	            IDBResult res = getDB().executeSQLEx( "SELECT object, attrib, value FROM changed_values where source_id=? and sent<=1 and attrib IN ( " + strAttribQuests + " )",  
+	        		    arValues );
+
+	            for( ; !res.isEnd(); res.next() )
+	            {
+	                String strObject = res.getStringByIdx(0);
+	                String strAttrib = res.getStringByIdx(1);
+	                String strValue = res.getStringByIdx(2);
+
+	                IDBResult res2 = getDB().executeSQL(
+	                    "SELECT object FROM changed_values where source_id=? and sent>=2 and object=? LIMIT 1 OFFSET 0", 
+	                    getBelongsToSrcID(strAttrib), strValue );
+	            
+	                if (!res2.isEnd())
+	                    m_hashIgnorePushObjects.put(strObject, 1 );
+
+	            }
+	        }
 	    }
 
 	    void doSyncClientChanges()
@@ -255,33 +338,42 @@ namespace rho.sync
 	        String strBody = "{\"source_name\":" + JSONEntry.quoteValue(getName()) + ",\"client_id\":" + JSONEntry.quoteValue(getSync().getClientID());
 	        boolean bSend = false;
 	        int i = 0;
-	        for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
-	        {
-	            String strBody1;
-	            strBody1 = makePushBody_Ver3(arUpdateTypes[i], true);
-	            if (strBody1.length() > 0)
+	        getDB().Lock();
+	        try{
+		        checkIgnorePushObjects();
+		    
+	            for( i = 0; i < 3; i++ )
 	            {
-	                strBody += "," + strBody1;
-
-	                String strBlobAttrs = "";
-	                for ( int j = 0; j < (int)m_arBlobAttrs.size(); j++)
+	                String strBody1;
+	                strBody1 = makePushBody_Ver3(arUpdateTypes[i], true);
+	                if (strBody1.length() > 0)
 	                {
-	                    if ( strBlobAttrs.length() > 0 )   
-	                        strBlobAttrs += ",";
+	                    strBody += "," + strBody1;
 
-	                    strBlobAttrs += JSONEntry.quoteValue((String)m_arBlobAttrs.elementAt(j));
-	                }
+	                    String strBlobAttrs = "";
+	                    for ( int j = 0; j < (int)m_arBlobAttrs.size(); j++)
+	                    {
+	                        if ( strBlobAttrs.length() > 0 )   
+	                            strBlobAttrs += ",";
+
+	                        strBlobAttrs += JSONEntry.quoteValue((String)m_arBlobAttrs.elementAt(j));
+	                    }
 
-	                if ( strBlobAttrs.length() > 0 )
-	                    strBody += ",\"blob_fields\":[" + strBlobAttrs + "]";
+	                    if ( strBlobAttrs.length() > 0 )
+	                        strBody += ",\"blob_fields\":[" + strBlobAttrs + "]";
 
-	                arUpdateSent[i] = true;
-	                bSend = true;
+	                    arUpdateSent[i] = true;
+	                    bSend = true;
+	                }
 	            }
-	        }
-	        strBody += "}";
+	            strBody += "}";
+            }
+            finally
+            {
+                getDB().Unlock();
+            }
 
-	        if ( bSend )
+            if (bSend && getSync().isContinueSync())
 	        {
 	            LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
 	            LOG.TRACE("Push body: " + strBody);		
@@ -298,7 +390,7 @@ namespace rho.sync
 		                NetResponse resp = getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, getSync(), null );
 		                if ( !resp.isOK() )
 		                {
-		                    getSync().setState(SyncEngine.esStop);
+                            //getSync().stopSync();
 		                    m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
 		                    m_strError = resp.getCharData();
 		                }
@@ -307,7 +399,7 @@ namespace rho.sync
 		                NetResponse resp = getNet().pushData( getProtocol().getClientChangesUrl(), strBody, getSync());
 		                if ( !resp.isOK() )
 		                {
-		                    getSync().setState(SyncEngine.esStop);
+                            //getSync().stopSync();
 		                    m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
 		                    m_strError = resp.getCharData();
 		                }
@@ -320,12 +412,12 @@ namespace rho.sync
 		        
 	        }
 
-	        for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+            for (i = 0; i < 3 && m_nErrCode == RhoAppAdapter.ERR_NONE; i++)
 	        {
 	            if ( arUpdateSent[i] )
 	            {
 	                //oo conflicts
-	                if ( i < 1 ) //create
+                    if (i < 1 && !SyncEngine.getSourceOptions().getBoolProperty(getID(), "pass_through") ) //create
 	                    getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
 	                else
 	                //
@@ -368,6 +460,9 @@ namespace rho.sync
 	            String value = res.getStringByIdx(2);
 	            String attribType = res.getStringByIdx(3);
 
+                if ( m_hashIgnorePushObjects.containsKey(strObject) )
+    	        	continue;
+
 	            if ( attribType.compareTo("blob.file") == 0 )
 	            {
 	                NetRequest.MultipartItem oItem = new NetRequest.MultipartItem();
@@ -457,8 +552,9 @@ namespace rho.sync
 	    void syncServerChanges()
 	    {
 		    LOG.INFO("Sync server changes source ID :" + getID() );
-		
-	        while( getSync().isContinueSync() )
+
+            while (getSync().isContinueSync() &&
+                    (m_nErrCode == RhoAppAdapter.ERR_NONE || m_nErrCode == RhoAppAdapter.ERR_CUSTOMSYNCSERVER))
 	        {
 	            setCurPageCount(0);
 	            String strUrl = getProtocol().getServerQueryUrl("");
@@ -477,7 +573,7 @@ namespace rho.sync
 	
 		            if ( !resp.isOK() )
 		            {
-		                getSync().stopSync();
+		                //getSync().stopSync();
 		                m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
 		                m_strError = resp.getCharData();
 		                continue;
@@ -711,7 +807,7 @@ namespace rho.sync
 		                processServerCmd_Ver3_Schema(strCmd,strObject,attrIter);
 		            else
 		            {
-		                for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+		                for( ; !attrIter.isEnd(); attrIter.next() )
 		                {
 		                    String strAttrib = attrIter.getCurKey();
 		                    String strValue = attrIter.getCurString();
@@ -775,13 +871,14 @@ namespace rho.sync
 	    {
 	        if ( strCmd.compareTo("insert") == 0 )
 	        {
-	            Vector<String> vecValues = new Vector<String>(), vecAttrs = new Vector<String>();
+	            Vector<Object> vecValues = new Vector<Object>();
+                Vector<String> vecAttrs = new Vector<String>();
 	            String strCols = "", strQuest = "", strSet = "";
-	            for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+	            for( ; !attrIter.isEnd(); attrIter.next() )
 	            {
 	                CAttrValue oAttrValue = new CAttrValue(attrIter.getCurKey(),attrIter.getCurString());
 	                if ( !processBlob(strCmd,strObject,oAttrValue) )
-	                    continue;
+	                    break;
 	        	
 	                if ( strCols.length() > 0 )
 	                    strCols += ",";
@@ -853,7 +950,7 @@ namespace rho.sync
 	            String strSqlUpdate = "UPDATE ";
 	            strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
 	        
-	            if ( strSet.length() == 0 || !getSync().isContinueSync() )
+	            if ( strSet.length() == 0 )
 	                return;
 	        
 	            getDB().executeSQL(strSqlUpdate, strObject);
@@ -1071,7 +1168,8 @@ namespace rho.sync
 			    NetResponse resp = getNet().pullFile(url, fName, getSync(), null);
 	            if ( !resp.isOK() )
 	            {
-	        	    getSync().stopSync();
+	        	    //getSync().stopSync();
+                    CRhoFile.deleteFile(fName);
 	        	    m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
 	        	    return false;
 	            }