rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/platform/shared/common/ExtManager.h

@@ -66,7 +66,10 @@ struct IRhoExtManager
 
     virtual void onUnhandledProperty( const wchar_t* pModuleName, const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData ) = 0;
     virtual void executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse) = 0;
+    virtual void executeRubyCallbackWithJsonBody( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse) = 0;
+
     virtual void requireRubyFile( const char* szFilePath ) = 0;
+    virtual unsigned long parseJsonToRubyHash(const char* szJson)=0;
 
     virtual void navigate(const wchar_t* szUrl) = 0;
     virtual bool existsJavascript(const wchar_t* szJSFunction) = 0;
@@ -118,8 +121,12 @@ public:
     //IRhoExtManager
     virtual void onUnhandledProperty( const wchar_t* pModuleName, const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData );
     virtual void executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse);
+    virtual void executeRubyCallbackWithJsonBody( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse);
+
     virtual void navigate(const wchar_t* szUrl);
     virtual void requireRubyFile( const char* szFilePath );
+    virtual unsigned long parseJsonToRubyHash(const char* szJson);
+
     virtual void executeJavascript(const wchar_t* szJSFunction);
     virtual bool existsJavascript(const wchar_t* szJSFunction);
     virtual void rhoLog(int nSeverity, const char* szModule, const char* szMsg, const char* szFile, int nLine);

data/platform/shared/common/RhoFile.cpp

@@ -28,9 +28,22 @@
 #include "common/StringConverter.h"
 #include "common/Tokenizer.h"
 #include "common/RhoFilePath.h"
+#include "logging/RhoLog.h"
+
+#if !defined(WINDOWS_PLATFORM)
+#include <dirent.h>
+#else
+#  ifndef S_ISDIR
+#    define S_ISDIR(m) ((_S_IFDIR & m) == _S_IFDIR)
+#  endif
+#endif
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoFile"
 
 #if defined(WINDOWS_PLATFORM)
     extern "C" int _mkdir(const char * dir);
+    extern "C" int _rmdir(const char * dir);
     extern "C" int  _unlink(const char *path);
 #endif
 
@@ -43,6 +56,125 @@
 namespace rho{
 namespace common{
 
+// Below is cross platform folder tree iteration algo implementation
+// but it tested for Android only and removed from other platforms unlil tested
+#ifdef OS_ANDROID
+
+template <typename FileFunctor>
+unsigned iterateFolderTree(const String& path, const FileFunctor& functor)
+{
+    unsigned res = 0;
+    struct dirent *dent;
+    DIR *dir;
+
+    if (!(dir = opendir(path.c_str())))
+    {
+        LOG(ERROR) + "Can't open dir: " + path;
+        return static_cast<unsigned>(errno);
+    }
+
+    while ((dent = readdir(dir))) {
+        if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
+            continue;
+
+        String child = CFilePath::join(path, dent->d_name);
+        if(child.length() > FILENAME_MAX)
+        {
+            LOG(ERROR) + "Path is too long: " + child;
+            res = ENAMETOOLONG;
+            continue;
+        }
+
+        unsigned res1 = functor(child.c_str() + strlen(functor.m_root));
+        if(res1 != 0) res = res1;
+    }
+
+    if (dir) closedir(dir);
+
+    return res;
+}
+
+struct RemoveFileFunctor {
+    const char* m_root;
+    RemoveFileFunctor(const char* root) : m_root(root) {}
+
+    unsigned operator()(const String& rel_path) const
+    {
+        unsigned res = 0;
+        String path = CFilePath::join(m_root, rel_path);
+        if(CRhoFile::isDirectory(path.c_str()))
+        {
+            res = iterateFolderTree(path, *this);
+            unsigned res1 = CRhoFile::deleteEmptyFolder(path.c_str());
+            if(res1 != 0) res = res1;
+        }
+        else
+        {
+            res = CRhoFile::deleteFile(path.c_str());
+        }
+        return res;
+    }
+};
+
+struct CopyFileFunctor {
+    const char* m_root;
+    const char* m_dst_root;
+    CopyFileFunctor(const char* src_root, const char* dst_root)
+        : m_root(src_root), m_dst_root(dst_root) {}
+
+    unsigned operator()(const String& rel_path) const
+    {
+        unsigned res = 0;
+        String path = CFilePath::join(m_root, rel_path);
+        String dst_path = CFilePath::join(m_dst_root, rel_path);
+
+        if(CRhoFile::isDirectory(path.c_str()))
+        {
+            if((res = CRhoFile::createFolder(dst_path.c_str())) == 0)
+            {
+                res = iterateFolderTree(path, *this);
+            }
+        }
+        else
+        {
+            res = CRhoFile::copyFile(path.c_str(), dst_path.c_str());
+        }
+        return res;
+    }
+};
+
+struct MoveFileFunctor {
+    const char* m_root;
+    const char* m_dst_root;
+    MoveFileFunctor(const char* src_root, const char* dst_root)
+        : m_root(src_root), m_dst_root(dst_root) {}
+
+    unsigned operator()(const String& rel_path) const
+    {
+        unsigned res = 0;
+        String path = CFilePath::join(m_root, rel_path);
+        String dst_path = CFilePath::join(m_dst_root, rel_path);
+
+        if(CRhoFile::isDirectory(path.c_str()))
+        {
+            if((res = CRhoFile::createFolder(dst_path.c_str())) == 0)
+            {
+                if((res = iterateFolderTree(path, *this)) == 0)
+                {
+                    CRhoFile::deleteEmptyFolder(path.c_str());
+                }
+            }
+        }
+        else
+        {
+            res = CRhoFile::renameFile(path.c_str(), dst_path.c_str());
+        }
+        return res;
+    }
+};
+
+#endif
+
 static wchar_t * translate_wchar(wchar_t *p, int from, int to)
 {
     for (; *p; p++) {
@@ -199,6 +331,17 @@ bool CRhoFile::isFileExist( const char* szFilePath ){
     return stat(szFilePath, &st) == 0;
 }
 
+bool CRhoFile::isDirectory( const char* szFilePath ){
+    bool res = false;
+    struct stat st;
+    memset(&st,0, sizeof(st));
+    if (stat(szFilePath, &st) == 0)
+    {
+        return S_ISDIR(st.st_mode);
+    }
+    return res;
+}
+
 unsigned int CRhoFile::getFileSize( const char* szFilePath ){
     struct stat st;
     memset(&st,0, sizeof(st));
@@ -224,6 +367,15 @@ unsigned int CRhoFile::deleteFile( const char* szFilePath ){
 #endif
 }
 
+unsigned int CRhoFile::deleteEmptyFolder( const char* szFilePath ){
+#if defined(OS_WINDOWS) || defined(OS_WINCE)
+    return (unsigned int)_rmdir(szFilePath);
+#else
+    return (unsigned int)rmdir(szFilePath);
+#endif
+}
+
+
 void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
 {
 #if defined(OS_WINDOWS) || defined(OS_WINCE)
@@ -318,13 +470,13 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
         return -1;
     }
     
-    int buf_size = 1 << 16;
+    unsigned int buf_size = 1 << 16;
     unsigned char* buf = new unsigned char[buf_size];
     
     unsigned int to_copy = src.size();
     
     while (to_copy > 0) {
-        int portion_size = buf_size;
+        unsigned int portion_size = buf_size;
         if (to_copy < portion_size) {
             portion_size = to_copy;
         }
@@ -369,6 +521,10 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
     delete name;
 
     return result == 0 ? 0 : (unsigned int)-1;
+#elif defined (OS_ANDROID)
+
+    return iterateFolderTree(String(szFolderPath), RemoveFileFunctor(szFolderPath));
+
 #else
     rho_file_impl_delete_folder(szFolderPath);
     return 0;
@@ -433,6 +589,10 @@ static unsigned int copyFolder(const StringW& strSrc, const StringW& strDst, boo
     String_replace(strDstW, L'/', L'\\' );
 
     return copyFolder(strSrcW, strDstW, false);
+#elif defined (OS_ANDROID)
+
+    return iterateFolderTree(String(szSrcFolderPath), CopyFileFunctor(szSrcFolderPath, szDstFolderPath));
+
 #else
     rho_file_impl_copy_folders_content_to_another_folder(szSrcFolderPath, szDstFolderPath);
     return 0;
@@ -450,6 +610,9 @@ static unsigned int copyFolder(const StringW& strSrc, const StringW& strDst, boo
     String_replace(strDstW, L'/', L'\\' );
 
     return copyFolder(strSrcW, strDstW, true);
+#elif defined (OS_ANDROID)
+
+    return iterateFolderTree(String(szSrcFolderPath), MoveFileFunctor(szSrcFolderPath, szDstFolderPath));
 
 #else
     rho_file_impl_move_folders_content_to_another_folder(szSrcFolderPath, szDstFolderPath);
@@ -460,6 +623,11 @@ static unsigned int copyFolder(const StringW& strSrc, const StringW& strDst, boo
 }
 }
 
+#ifndef OS_ANDROID
+extern "C" void rho_file_set_fs_mode(int mode) {
+}
+#endif
+
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
     void rho_file_impl_move_folders_content_to_another_folder(const char* szSrcFolderPath, const char* szDstFolderPath) {
         

data/platform/shared/common/RhoFile.h

@@ -63,7 +63,9 @@ public:
 
     static unsigned int getFileSize( const char* szFilePath );
     static bool         isFileExist( const char* szFilePath );
+    static bool         isDirectory( const char* szFilePath );
     static unsigned int deleteFile( const char* szFilePath );
+    static unsigned int deleteEmptyFolder( const char* szFilePath );
     static unsigned int renameFile( const char* szOldFilePath, const char* szNewFilePath );
     static void         deleteFilesInFolder(const char* szFolderPath);
     static void         loadTextFile(const char* szFilePath, String& strFile);
@@ -92,4 +94,6 @@ extern "C" void rho_file_impl_delete_folder(const char* szFolderPath);
 extern "C" void rho_file_impl_copy_folders_content_to_another_folder(const char* szSrcFolderPath, const char* szDstFolderPath);
 extern "C" void rho_file_impl_move_folders_content_to_another_folder(const char* szSrcFolderPath, const char* szDstFolderPath);
 
+extern "C" void rho_file_set_fs_mode(int mode);
+
 #endif //_RHOFILE_H_

data/platform/shared/common/RhodesApp.cpp

@@ -638,6 +638,36 @@ void CRhodesApp::callCallbackWithData(String strCallbackUrl, String strBody, con
         runCallbackInThread(strCallbackUrl, strBody);
 }
 
+extern "C" VALUE rjson_tokener_parse(const char *str, char** pszError );
+
+class CJsonResponse : public rho::ICallbackObject
+{
+    String m_strJson;
+public:
+    CJsonResponse(const char* szJson) : m_strJson(szJson) { }
+    virtual unsigned long getObjectValue()
+    {
+        char* szError = 0;
+        unsigned long valBody = rjson_tokener_parse(m_strJson.c_str(), &szError);
+        if ( valBody != 0 )
+            return valBody;
+
+        LOG(ERROR) + "Incorrect json body.Error:" + (szError ? szError : "");
+        if ( szError )
+            free(szError);
+
+        return rho_ruby_get_NIL();
+    }
+};
+
+void CRhodesApp::callCallbackWithJsonBody( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse)
+{
+    String strBody;
+    strBody = addCallbackObject( new CJsonResponse( szCallbackBody ), "__rho_inline" );
+
+    callCallbackWithData(szCallback, strBody, szCallbackData, bWaitForResponse );
+}
+
 void CRhodesApp::callCameraCallback(String strCallbackUrl, const String& strImagePath, 
     const String& strError, boolean bCancel ) 
 {

data/platform/shared/common/RhodesApp.h

@@ -127,6 +127,7 @@ public:
 
     void callBarcodeCallback(String strCallbackUrl, const String& strBarcode, bool isError);
     void callCallbackWithData(String strCallbackUrl, String strBody, const String& strCallbackData, bool bWaitForResponse);
+    void callCallbackWithJsonBody( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse);
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callSignatureCallback(String strCallbackUrl, const String& strSignaturePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );

data/platform/shared/common/map/OSMMapEngine.cpp

@@ -49,6 +49,14 @@ OSMMapView::OSMMapView(IDrawingDevice *device)
 {
     //MOHUS
     //preloadMapTiles(60.1, 30, 59.7, 30.6, 6, 12);
+    
+    String url = RHOCONF().getString("OSM_map_url_roadmap");
+    if (url.empty())
+        url = "http://tile.openstreetmap.org/";
+    if (url[url.size() - 1] != '/')
+        url.push_back('/');    
+    
+    map_url = url + "%d/%d/%d.png";
 }
 
 int OSMMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void** p_data, size_t* p_size)
@@ -61,16 +69,16 @@ int OSMMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void**
     char buf[1024];
 
     // Open Street Map
-    snprintf(buf, sizeof(buf), "http://a.tah.openstreetmap.org/Tiles/tile/%d/%d/%d.png", (int)p_zoom, (int)p_column, (int)p_row);
+    snprintf(buf, sizeof(buf), map_url.c_str(), (int)p_zoom, (int)p_column, (int)p_row);
 
     url += buf;
 
-    RAWLOG_ERROR("###########  getMapTime() BEFORE FETCH");
+    //RAWLOG_ERROR("###########  getMapTime() BEFORE FETCH");
 
     if (!fetchData(url, &data, &datasize))
         return 0;
 
-    RAWLOG_ERROR("###########  getMapTime() AFTER FETCH");
+    //RAWLOG_ERROR("###########  getMapTime() AFTER FETCH");
 
     *p_data = data;
     *p_size = datasize;

data/platform/shared/common/map/OSMMapEngine.h

@@ -48,6 +48,9 @@ public:
 
     virtual void setESRILogoImage(IDrawingImage *ESRILogoImg) {}
     virtual void setGoogleLogoImage(IDrawingImage *GoogleLogoImg) {}
+    
+private:
+    String map_url;
 };
 
 class OSMMapEngine : public IMapEngine

data/platform/shared/logging/RhoLogConf.cpp

@@ -52,7 +52,7 @@ LogSettings::LogSettings(){
     m_nMaxLogFileSize = 0; 
     m_bLogPrefix = true; 
 
-    //m_strLogHost = "PPP_PEER";
+    m_strLogURL = "";
 
     m_pFileSink = new CLogFileSink(*this);
     m_pOutputSink = new CLogOutputSink(*this);
@@ -87,10 +87,9 @@ void LogSettings::initRemoteLog()
 		return;
 #endif
 
-	m_strLogHost = RHOCONF().getString("rhologhost"); 
-	m_strLogPort = RHOCONF().getString("rhologport"); 
+	m_strLogURL = RHOCONF().getString("rhologurl"); 
 
-	if(!m_pSocketSink && m_strLogHost != "" && m_strLogPort != "")
+	if(!m_pSocketSink && m_strLogURL != "")
 		m_pSocketSink = new CLogSocketSink(*this);
 }
 
@@ -252,15 +251,15 @@ extern "C" {
 using namespace rho;
 using namespace rho::common;
 
-void rho_logconf_Init_with_separate_user_path(const char* szRootPath, const char* szLogPort, const char* szUserPath)
+void rho_logconf_Init_with_separate_user_path(const char* szLogPath, const char* szRootPath, const char* szLogPort, const char* szUserPath)
 {
     
 #ifdef RHODES_EMULATOR
-    String strRootPath = szRootPath;
+    String strRootPath = szLogPath;
     strRootPath += RHO_EMULATOR_DIR"/";
     rho::common::CFilePath oLogPath( strRootPath );
 #else
-    rho::common::CFilePath oLogPath( szRootPath );
+    rho::common::CFilePath oLogPath( szLogPath );
 #endif
     
     //Set defaults
@@ -287,8 +286,8 @@ void rho_logconf_Init_with_separate_user_path(const char* szRootPath, const char
     LOGCONF().loadFromConf(RHOCONF());
 }
     
-void rho_logconf_Init(const char* szRootPath, const char* szLogPort){
-    rho_logconf_Init_with_separate_user_path(szRootPath, szLogPort, szRootPath);
+void rho_logconf_Init(const char* szLogPath, const char* szRootPath, const char* szLogPort){
+    rho_logconf_Init_with_separate_user_path(szLogPath, szRootPath, szLogPort, szRootPath);
 }
 
 char* rho_logconf_getText() {

data/platform/shared/logging/RhoLogConf.h

@@ -55,8 +55,7 @@ class LogSettings{
 //    String      m_strLogConfFilePath;
     unsigned int m_nMaxLogFileSize;
 
-	String      m_strLogHost;
-    String      m_strLogPort;
+	String      m_strLogURL;
 
     bool        m_bLogPrefix;
 
@@ -99,10 +98,9 @@ public:
     bool isLogPrefix()const{ return m_bLogPrefix;}
 	void setLogPrefix(bool bLogPrefix){ m_bLogPrefix = bLogPrefix; }
 
-	const String& getLogHost() const { return m_strLogHost; }
-	void setLogHost(const char* szLogHost) { m_strLogHost = rho::String(szLogHost); }
+	const String& getLogURL() const { return m_strLogURL; }
+	void setLogURL(const char* szLogURL) { m_strLogURL = rho::String(szLogURL); }
 
-	const String& getLogPort() const { return m_strLogPort; }
 	void initRemoteLog();
 	void closeRemoteLog();
 
@@ -150,8 +148,8 @@ inline rho::LogSettings& LOGCONF(){ return rho::g_LogSettings; }
 extern "C"{
 #endif //__cplusplus
 
-void rho_logconf_Init(const char* szRootPath, const char* szLogPort);
-void rho_logconf_Init_with_separate_user_path(const char* szRootPath, const char* szLogPort, const char* szUserPath);
+void rho_logconf_Init(const char* szLogPath, const char* szRootPath, const char* szLogPort);
+void rho_logconf_Init_with_separate_user_path(const char* szLogPath, const char* szRootPath, const char* szLogPort, const char* szUserPath);
 
 char* rho_logconf_getText();
 int   rho_logconf_getTextPos();