fix ios

irov · Dec 3, 2024 · b90c6ab · b90c6ab
1 parent 6323871
commit b90c6ab
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 5 deletions.
diff --git a/src/Systems/AppleFileSystem/AppleFileSystem.mm b/src/Systems/AppleFileSystem/AppleFileSystem.mm
@@ -139,6 +139,8 @@ static bool isDirectoryFullpath( const Char * _fullpath )
         Path correctDirectory = {'\0'};
         Helper::pathCorrectBackslashToA( correctDirectory, _directory );
 
+        Helper::pathRemoveFileSpecA( correctDirectory, MENGINE_PATH_DELIM_BACKSLASH );
+
         size_t correctDirectoryLen = StdString::strlen( correctDirectory );
 
         if( correctDirectoryLen == 0 )

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequest.h b/src/Systems/AppleHttpSystem/AppleHttpRequest.h
@@ -11,21 +11,23 @@ namespace Mengine
         : public BaseHttpRequest
     {
     public:
-        AppleHttpRequest();
+        AppleHttpRequest( bool _isJSON );
         ~AppleHttpRequest() override;
 
     protected:
         void _onThreadTaskPreparation() override;
         bool _onThreadTaskRun() override;
         bool _onThreadTaskProcess() override;
-
+        
     protected:
         virtual MengineHttpResponseParam * _onHttp( MengineHttpRequestParam * request ) = 0;
 
     protected:
         void _onThreadTaskComplete( bool _successful ) override;
 
     protected:
+        bool m_isJSON;
+
         ThreadMutexInterfacePtr m_mutex;
     };
     //////////////////////////////////////////////////////////////////////////

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequest.mm b/src/Systems/AppleHttpSystem/AppleHttpRequest.mm
@@ -16,7 +16,8 @@
 namespace Mengine
 {
     //////////////////////////////////////////////////////////////////////////
-    AppleHttpRequest::AppleHttpRequest()
+    AppleHttpRequest::AppleHttpRequest( bool _isJSON )
+        : m_isJSON( _isJSON )
     {
     }
     //////////////////////////////////////////////////////////////////////////
@@ -81,9 +82,16 @@
 
             if( response.HTTP_CONTENT_DATA != nullptr )
             {
-                const Char * bytes = (const Char *)[response.HTTP_CONTENT_DATA bytes];
+                const void * bytes = [response.HTTP_CONTENT_DATA bytes];
 
-                m_response->appendData( bytes, response.HTTP_CONTENT_LENGTH );
+                if( m_isJSON == true )
+                {
+                    m_response->appendJSON( bytes, response.HTTP_CONTENT_LENGTH );
+                }
+                else
+                {
+                    m_response->appendData( bytes, response.HTTP_CONTENT_LENGTH );
+                }
             }
 
             if( response.HTTP_ERROR_MESSAGE != nullptr )

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequestDeleteMessage.mm b/src/Systems/AppleHttpSystem/AppleHttpRequestDeleteMessage.mm
@@ -4,6 +4,7 @@
 {
     //////////////////////////////////////////////////////////////////////////
     AppleHttpRequestDeleteMessage::AppleHttpRequestDeleteMessage()
+        : AppleHttpRequest( true )
     {
     }
     //////////////////////////////////////////////////////////////////////////

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequestGetAsset.mm b/src/Systems/AppleHttpSystem/AppleHttpRequestGetAsset.mm
@@ -16,6 +16,7 @@
 {
     //////////////////////////////////////////////////////////////////////////
     AppleHttpRequestGetAsset::AppleHttpRequestGetAsset()
+        : AppleHttpRequest( false )
     {
     }
     //////////////////////////////////////////////////////////////////////////

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequestGetMessage.mm b/src/Systems/AppleHttpSystem/AppleHttpRequestGetMessage.mm
@@ -4,6 +4,7 @@
 {
     //////////////////////////////////////////////////////////////////////////
     AppleHttpRequestGetMessage::AppleHttpRequestGetMessage()
+        : AppleHttpRequest( true )
     {
     }
     //////////////////////////////////////////////////////////////////////////

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequestHeaderData.mm b/src/Systems/AppleHttpSystem/AppleHttpRequestHeaderData.mm
@@ -6,6 +6,7 @@
 {
     //////////////////////////////////////////////////////////////////////////
     AppleHttpRequestHeaderData::AppleHttpRequestHeaderData()
+        : AppleHttpRequest( true )
     {
     }
     //////////////////////////////////////////////////////////////////////////

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequestPing.mm b/src/Systems/AppleHttpSystem/AppleHttpRequestPing.mm
@@ -4,6 +4,7 @@
 {
     //////////////////////////////////////////////////////////////////////////
     AppleHttpRequestPing::AppleHttpRequestPing()
+        : AppleHttpRequest( true )
     {
     }
     //////////////////////////////////////////////////////////////////////////

diff --git a/src/Systems/AppleHttpSystem/AppleHttpRequestPostMessage.mm b/src/Systems/AppleHttpSystem/AppleHttpRequestPostMessage.mm
@@ -6,6 +6,7 @@
 {
     //////////////////////////////////////////////////////////////////////////
     AppleHttpRequestPostMessage::AppleHttpRequestPostMessage()
+        : AppleHttpRequest( true )
     {
     }
     //////////////////////////////////////////////////////////////////////////