add support for realdebrid

CMakeLists.txt

@@ -42,6 +42,7 @@ add_executable(ezremote_client
   source/clients/sftpclient.cpp
   source/clients/rclone.cpp
   source/filehost/alldebrid.cpp
+  source/filehost/realdebrid.cpp
   source/filehost/directhost.cpp
   source/filehost/gdrive.cpp
   source/filehost/filehost.cpp
@@ -71,7 +72,7 @@ add_executable(ezremote_client
 
 add_self(ezremote_client)
 
-add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.14" 32 0)
+add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.16" 32 0)
 
 target_link_libraries(ezremote_client
   c

data/assets/langs/English.ini

@@ -157,4 +157,6 @@ STR_FAIL_INSTALL_FROM_URL_MSG=Failed to install from URL
 STR_INVALID_URL=InValid URL
 STR_ALLDEBRID_API_KEY_MISSING_MSG=To use this function, an API Key needs to be configured in the ezRemote Client settings
 STR_LANGUAGE=Language
-STR_TEMP_DIRECTORY=Temp Directory
+STR_TEMP_DIRECTORY=Temp Directory
+STR_REALDEBRID=Real-Debrid
+STR_BACKGROUND_INSTALL_INPROGRESS=Package install is running in the background. Don't close the app while install is in progress

source/actions.cpp

@@ -726,22 +726,29 @@ namespace Actions
                 else if (Util::EndsWith(path,".zip") || Util::EndsWith(path,".rar") ||
                         Util::EndsWith(path,".tar.xz") || Util::EndsWith(path,".tar.gz"))
                 {
-                    ArchiveEntry *entry = ZipUtil::GetPackageEntry(it->path, true);
+                    ArchiveEntry *entry = ZipUtil::GetPackageEntry(it->path, remoteclient);
                     if (entry != nullptr)
                     {
-                        ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) malloc(sizeof(ArchivePkgInstallData));
-                        memset(install_data, 0, sizeof(ArchivePkgInstallData));
+                        while (entry != nullptr)
+                        {
+                            ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) malloc(sizeof(ArchivePkgInstallData));
+                            memset(install_data, 0, sizeof(ArchivePkgInstallData));
 
-                        std::string install_pkg_path = std::string(temp_folder) + "/" + entry->filename;
-                        SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE);
-                        
-                        install_data->archive_entry = entry;
-                        install_data->split_file = sp;
-                        install_data->stop_write_thread = false;
+                            std::string install_pkg_path = std::string(temp_folder) + "/" + entry->filename;
+                            SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE);
+                            
+                            install_data->archive_entry = entry;
+                            install_data->split_file = sp;
+                            install_data->stop_write_thread = false;
 
-                        int res = pthread_create(&install_data->thread, NULL, ExtractArchivePkg, install_data);
+                            int res = pthread_create(&install_data->thread, NULL, ExtractArchivePkg, install_data);
 
-                        INSTALLER::InstallArchivePkg(entry->filename, install_data);
+                            INSTALLER::InstallArchivePkg(entry->filename, install_data);
+
+                            ArchiveEntry *previos = entry;
+                            entry = ZipUtil::GetNextPackageEntry(entry);
+                            free(previos);
+                        }
                         success++;
                     }
                     else
@@ -779,7 +786,7 @@ namespace Actions
     void *ExtractArchivePkg(void *argp)
     {
         ssize_t len;
-        char buffer[ARCHIVE_TRANSFER_SIZE];
+        char *buffer = (char*) malloc(ARCHIVE_TRANSFER_SIZE);
 
         ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) argp;
         SplitFile *sp = install_data->split_file;
@@ -788,7 +795,7 @@ namespace Actions
         sp->Open();
         while (!install_data->stop_write_thread)
         {
-            len = archive_read_data(install_data->archive_entry->archive, buffer, sizeof buffer);
+            len = archive_read_data(install_data->archive_entry->archive, buffer, ARCHIVE_TRANSFER_SIZE);
 
             if (len == 0)
                 break;
@@ -807,7 +814,7 @@ namespace Actions
         }
 
         sp->Close();
-
+        free(buffer);
         return NULL;
     }
 
@@ -871,19 +878,26 @@ namespace Actions
                     ArchiveEntry *entry = ZipUtil::GetPackageEntry(it->path);
                     if (entry != nullptr)
                     {
-                        ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) malloc(sizeof(ArchivePkgInstallData));
-                        memset(install_data, 0, sizeof(ArchivePkgInstallData));
+                        while (entry != nullptr)
+                        {
+                            ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) malloc(sizeof(ArchivePkgInstallData));
+                            memset(install_data, 0, sizeof(ArchivePkgInstallData));
 
-                        std::string install_pkg_path = std::string(temp_folder) + "/" + entry->filename;
-                        SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE);
-                        
-                        install_data->archive_entry = entry;
-                        install_data->split_file = sp;
-                        install_data->stop_write_thread = false;
+                            std::string install_pkg_path = std::string(temp_folder) + "/" + entry->filename;
+                            SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE);
+                            
+                            install_data->archive_entry = entry;
+                            install_data->split_file = sp;
+                            install_data->stop_write_thread = false;
 
-                        int res = pthread_create(&install_data->thread, NULL, ExtractArchivePkg, install_data);
+                            int res = pthread_create(&install_data->thread, NULL, ExtractArchivePkg, install_data);
 
-                        INSTALLER::InstallArchivePkg(entry->filename, install_data);
+                            INSTALLER::InstallArchivePkg(entry->filename, install_data);
+
+                            ArchiveEntry *previous = entry;
+                            entry = ZipUtil::GetNextPackageEntry(entry);
+                            free(previous);
+                        }
                         success++;
                     }
                     else
@@ -975,7 +989,7 @@ namespace Actions
                 break;
             if (!it->isDir)
             {
-                int ret = ZipUtil::Extract(*it, extract_zip_folder, true);
+                int ret = ZipUtil::Extract(*it, extract_zip_folder, remoteclient);
                 if (ret == 0)
                 {
                     sprintf(status_message, "%s %s", lang_strings[STR_FAILED_TO_EXTRACT], it->name);

source/clients/baseclient.cpp

@@ -42,6 +42,30 @@ int BaseClient::Connect(const std::string &url, const std::string &username, con
     return 1;
 }
 
+int BaseClient::Connect(const std::string &url, const std::string &api_key)
+{
+    std::string scheme_host_port = url;
+    size_t scheme_pos = url.find("://");
+    size_t root_pos = url.find("/", scheme_pos + 3);
+    if (root_pos != std::string::npos)
+    {
+        scheme_host_port = url.substr(0, root_pos);
+        this->base_path = url.substr(root_pos);
+    }
+
+    client = new httplib::Client(scheme_host_port);
+    if (api_key.length() > 0)
+        client->set_bearer_token_auth(api_key);
+    client->set_keep_alive(true);
+    client->set_follow_location(true);
+    client->set_connection_timeout(30);
+    client->set_read_timeout(30);
+    client->enable_server_certificate_verification(false);
+    if (Ping())
+        this->connected = true;
+    return 1;
+}
+
 int BaseClient::Mkdir(const std::string &path)
 {
     sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
@@ -280,7 +304,7 @@ ClientType BaseClient::clientType()
 
 uint32_t BaseClient::SupportedActions()
 {
-    return REMOTE_ACTION_DOWNLOAD | REMOTE_ACTION_INSTALL;
+    return REMOTE_ACTION_DOWNLOAD | REMOTE_ACTION_INSTALL | REMOTE_ACTION_EXTRACT;
 }
 
 std::string BaseClient::EncodeUrl(const std::string &url)

source/clients/baseclient.h

@@ -16,6 +16,7 @@ public:
     BaseClient();
     ~BaseClient();
     int Connect(const std::string &url, const std::string &username, const std::string &password);
+    int Connect(const std::string &url, const std::string &api_key);
     int Mkdir(const std::string &path);
     int Rmdir(const std::string &path, bool recursive);
     int Size(const std::string &path, int64_t *size);

source/clients/gdrive.cpp

@@ -226,7 +226,7 @@ int GDriveClient::Rename(const std::string &src, const std::string &dst)
     if (!src_drive_id.empty())
         url += "?supportsAllDrives=true";
     std::string filename = dst.substr(dst.find_last_of("/") + 1);
-    std::string body = "{'name' : '" + filename + "'}";
+    std::string body = "{\"name\" : \"" + filename + "\"}";
     if (auto res = client->Patch(url, body.c_str(), body.length(), "application/json; charset=UTF-8"))
     {
         sprintf(response, "%d", res->status);
@@ -492,9 +492,9 @@ int GDriveClient::Put(const std::string &inputfile, const std::string &path, uin
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
 
-    std::string post_data = std::string("{'name': '") + filename + "'," +
-                                        (drive_id.empty() ? "" : "'driveId' : '" + drive_id + "',") +
-                                        "'parents': ['" + parent_id + "']}";
+    std::string post_data = std::string("{\"name\": \"") + filename + "\"," +
+                                        (drive_id.empty() ? "" : "\"driveId\" : \"" + drive_id + "\",") +
+                                        "\"parents\": [\"" + parent_id + "\"]}";
     Headers headers;
     headers.insert(std::make_pair("X-Upload-Content-Type", "application/octet-stream"));
     headers.insert(std::make_pair("X-Upload-Content-Length", std::to_string(bytes_to_download)));
@@ -605,10 +605,10 @@ int GDriveClient::Mkdir(const std::string &path)
     std::string url = std::string("/drive/v3/files?fields=id");
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
-    std::string folder_metadata = "{'name' : '" + folder_name + "'," +
-                                  "'parents' : ['" + parent_id + "']," +
-                                  (drive_id.empty() ? "" : "'driveId' : '" + drive_id + "',") + 
-                                  "'mimeType' : 'application/vnd.google-apps.folder'}";
+    std::string folder_metadata = "{\"name\" : \"" + folder_name + "\"," +
+                                  "\"parents\" : [\"" + parent_id + "\"]," +
+                                  (drive_id.empty() ? "" : "\"driveId\" : \"" + drive_id + "\",") + 
+                                  "\"mimeType\" : \"application/vnd.google-apps.folder\"}";
 
     if (auto res = client->Post(url, folder_metadata.c_str(), folder_metadata.length(), "application/json; charset=UTF-8"))
     {

source/clients/rclone.cpp

@@ -8,7 +8,6 @@
 #include "util.h"
 #include "system.h"
 #include "windows.h"
-#include "dbglogger.h"
 
 using httplib::Client;
 using httplib::Headers;
@@ -161,7 +160,7 @@ std::vector<DirEntry> RCloneClient::ListDir(const std::string &path)
                 lxb_dom_node_t *size_node = NextChildElement(td_element);
                 value = lxb_dom_node_text_content(size_node->first_child, &value_len);
                 tmp_string = std::string((const char *)value, value_len);
-                entry.file_size = atoi(tmp_string.c_str());
+                entry.file_size = atol(tmp_string.c_str());
                 DirEntry::SetDisplaySize(&entry);
             }
 

source/config.cpp

@@ -38,7 +38,8 @@ bool auto_delete_tmp_pkg;
 int max_edit_file_size;
 GoogleAppInfo gg_app;
 bool show_hidden_files;
-char alldebrid_api_key[32];
+char alldebrid_api_key[64];
+char realdebrid_api_key[64];
 char temp_folder[256];
 
 unsigned char cipher_key[32] = {'s', '5', 'v', '8', 'y', '/', 'B', '?', 'E', '(', 'H', '+', 'M', 'b', 'Q', 'e', 'T', 'h', 'W', 'm', 'Z', 'q', '4', 't', '7', 'w', '9', 'z', '$', 'C', '&', 'F'};
@@ -202,16 +203,31 @@ namespace CONFIG
         std::string encrypted_api_key;
         if (strlen(tmp_api_key) > 0)
         {
-            std::string decrypted__api_key;
-            int ret = Decrypt(tmp_api_key, decrypted__api_key);
+            std::string decrypted_api_key;
+            int ret = Decrypt(tmp_api_key, decrypted_api_key);
             if (ret == 0)
                 sprintf(alldebrid_api_key, "%s", tmp_api_key);
             else
-                sprintf(alldebrid_api_key, "%s", decrypted__api_key.c_str());
+                sprintf(alldebrid_api_key, "%s", decrypted_api_key.c_str());
             Encrypt(alldebrid_api_key, encrypted_api_key);
         }
         WriteString(CONFIG_GLOBAL, CONFIG_ALLDEBRID_API_KEY, encrypted_api_key.c_str());
 
+        // realdebrid api key
+        sprintf(tmp_api_key, "%s", ReadString(CONFIG_GLOBAL, CONFIG_REALDEBRID_API_KEY, ""));
+        encrypted_api_key = "";
+        if (strlen(tmp_api_key) > 0)
+        {
+            std::string decrypted_api_key;
+            int ret = Decrypt(tmp_api_key, decrypted_api_key);
+            if (ret == 0)
+                sprintf(realdebrid_api_key, "%s", tmp_api_key);
+            else
+                sprintf(realdebrid_api_key, "%s", decrypted_api_key.c_str());
+            Encrypt(realdebrid_api_key, encrypted_api_key);
+        }
+        WriteString(CONFIG_GLOBAL, CONFIG_REALDEBRID_API_KEY, encrypted_api_key.c_str());
+
         // Load Google Account Info
         sprintf(gg_app.client_id, "%s", ReadString(CONFIG_GOOGLE, CONFIG_GOOGLE_CLIENT_ID, ""));
         WriteString(CONFIG_GOOGLE, CONFIG_GOOGLE_CLIENT_ID, gg_app.client_id);
@@ -392,11 +408,17 @@ namespace CONFIG
             Encrypt(alldebrid_api_key, encrypted_api_key);
         else
             encrypted_api_key = std::string(alldebrid_api_key);
+        WriteString(CONFIG_GLOBAL, CONFIG_ALLDEBRID_API_KEY, encrypted_api_key.c_str());
+
+        if (strlen(realdebrid_api_key) > 0)
+            Encrypt(realdebrid_api_key, encrypted_api_key);
+        else
+            encrypted_api_key = std::string(realdebrid_api_key);
+        WriteString(CONFIG_GLOBAL, CONFIG_REALDEBRID_API_KEY, encrypted_api_key.c_str());
 
         WriteString(CONFIG_GOOGLE, CONFIG_GOOGLE_CLIENT_SECRET, encrypted_secret.c_str());
         WriteString(CONFIG_GOOGLE, CONFIG_GOOGLE_CLIENT_ID, gg_app.client_id);
         WriteString(CONFIG_GOOGLE, CONFIG_GOOGLE_PERMISSIONS, gg_app.permissions);
-        WriteString(CONFIG_GLOBAL, CONFIG_ALLDEBRID_API_KEY, encrypted_api_key.c_str());
         WriteString(CONFIG_GLOBAL, CONFIG_TMP_FOLDER_PATH, temp_folder);
         WriteBool(CONFIG_GLOBAL, CONFIG_AUTO_DELETE_TMP_PKG, auto_delete_tmp_pkg);
         WriteBool(CONFIG_GLOBAL, CONFIG_SHOW_HIDDEN_FILES, show_hidden_files);

source/config.h

@@ -59,6 +59,7 @@
 #define CONFIG_REMOTE_DEFAULT_DIRECTORY "remote_server_default_directory"
 
 #define CONFIG_ALLDEBRID_API_KEY "alldebrid_api_key"
+#define CONFIG_REALDEBRID_API_KEY "realdebrid_api_key"
 
 #define CONFIG_VERSION "config_version"
 #define CONFIG_VERSION_NUM 1
@@ -140,7 +141,8 @@ extern unsigned char cipher_key[32];
 extern unsigned char cipher_iv[16];
 extern GoogleAppInfo gg_app;
 extern bool show_hidden_files;
-extern char alldebrid_api_key[32];
+extern char alldebrid_api_key[64];
+extern char realdebrid_api_key[64];
 extern char temp_folder[256];
 
 namespace CONFIG

source/filehost/filehost.cpp

@@ -6,6 +6,7 @@
 #include "filehost.h"
 #include "1fichier.h"
 #include "filehost/alldebrid.h"
+#include "filehost/realdebrid.h"
 #include "filehost/directhost.h"
 #include "filehost/gdrive.h"
 #include "filehost/mediafire.h"
@@ -25,7 +26,7 @@ std::string FileHost::GetUrl()
     return url;
 }
 
-FileHost *FileHost::getFileHost(const std::string &url, bool use_alldebrid)
+FileHost *FileHost::getFileHost(const std::string &url, bool use_alldebrid, bool use_realdebrid)
 {
     std::regex google_re(GDRIVE_REGEX);
     std::regex mediafire_re(MEDIAFIRE_REGEX);
@@ -34,6 +35,8 @@ FileHost *FileHost::getFileHost(const std::string &url, bool use_alldebrid)
 
     if (use_alldebrid)
         return new AllDebridHost(url);
+    else if (use_realdebrid)
+        return new RealDebridHost(url);
     else if (std::regex_match(url, google_re))
         return new GDriveHost(url);
     else if (std::regex_match(url, mediafire_re))

source/filehost/filehost.h

@@ -13,7 +13,7 @@ public:
     virtual std::string GetDownloadUrl() = 0;
     std::string GetUrl();
 
-    static FileHost *getFileHost(const std::string &url, bool use_alldebrid = false);
+    static FileHost *getFileHost(const std::string &url, bool use_alldebrid = false, bool use_realdebrid = false);
     static std::string GetCachedDownloadUrl(std::string &hash);
     static void AddCacheDownloadUrl(std::string &hash, std::string &url);
 

source/filehost/realdebrid.cpp

@@ -0,0 +1,68 @@
+#include <http/httplib.h>
+#include <json-c/json.h>
+
+#include "config.h"
+#include "common.h"
+#include "realdebrid.h"
+
+RealDebridHost::RealDebridHost(const std::string &url) : FileHost(url)
+{
+}
+
+bool RealDebridHost::IsValidUrl()
+{
+    httplib::Client tmp_client("https://api.real-debrid.com");
+    tmp_client.set_keep_alive(true);
+    tmp_client.set_follow_location(true);
+    tmp_client.set_connection_timeout(30);
+    tmp_client.set_read_timeout(30);
+    tmp_client.enable_server_certificate_verification(false);
+    tmp_client.set_bearer_token_auth(realdebrid_api_key);
+
+    std::string path = std::string("/rest/1.0/unrestrict/check");
+    std::string post_data = std::string("link=") + httplib::detail::encode_url(this->url) + "&password=";
+
+    auto res = tmp_client.Post(path, post_data.c_str(), post_data.length(), "application/x-www-form-urlencoded");
+    if (HTTP_SUCCESS(res->status))
+    {
+        json_object *jobj = json_tokener_parse(res->body.c_str());
+        uint64_t supported = json_object_get_uint64(json_object_object_get(jobj, "supported"));
+
+        if (supported == 1)
+            return true;
+    }
+    
+    return false;
+}
+
+std::string RealDebridHost::GetDownloadUrl()
+{
+    httplib::Client tmp_client("https://api.real-debrid.com");
+    tmp_client.set_keep_alive(true);
+    tmp_client.set_follow_location(true);
+    tmp_client.set_connection_timeout(30);
+    tmp_client.set_read_timeout(30);
+    tmp_client.enable_server_certificate_verification(false);
+    tmp_client.set_bearer_token_auth(realdebrid_api_key);
+
+    std::string path = std::string("/rest/1.0/unrestrict/link");
+    std::string post_data = std::string("link=") + httplib::detail::encode_url(this->url) + "&password=&remote=0";
+
+    auto res = tmp_client.Post(path, post_data.c_str(), post_data.length(), "application/x-www-form-urlencoded");
+    if (HTTP_SUCCESS(res->status))
+    {
+        json_object *jobj = json_tokener_parse(res->body.c_str());
+        const char *download = json_object_get_string(json_object_object_get(jobj, "download"));
+
+        if (download != nullptr)
+        {
+            return std::string(download);
+        }
+        else
+        {
+            return "";
+        }
+    }
+    
+    return "";
+}

source/filehost/realdebrid.h

@@ -0,0 +1,14 @@
+#ifndef REALDEBRID_HOST_H
+#define REALDEBRID_HOST_H
+
+#include "filehost.h"
+
+class RealDebridHost : public FileHost
+{
+public:
+    RealDebridHost(const std::string &url);
+    bool IsValidUrl();
+    std::string GetDownloadUrl();
+};
+
+#endif

source/imgui/imgui.cpp

@@ -10692,7 +10692,7 @@ void ImGui::NavUpdateCreateMoveRequest()
     // When using gamepad, we project the reference nav bounding box into window visible area.
     // This is to allow resuming navigation inside the visible area after doing a large amount of scrolling, since with gamepad all movements are relative
     // (can't focus a visible object like we can with the mouse).
-    if (g.NavMoveSubmitted && g.NavInputSource == ImGuiInputSource_Gamepad && g.NavLayer == ImGuiNavLayer_Main && window != NULL)// && (g.NavMoveFlags & ImGuiNavMoveFlags_Forwarded))
+    /*if (g.NavMoveSubmitted && g.NavInputSource == ImGuiInputSource_Gamepad && g.NavLayer == ImGuiNavLayer_Main && window != NULL)// && (g.NavMoveFlags & ImGuiNavMoveFlags_Forwarded))
     {
         bool clamp_x = (g.NavMoveFlags & (ImGuiNavMoveFlags_LoopX | ImGuiNavMoveFlags_WrapX)) == 0;
         bool clamp_y = (g.NavMoveFlags & (ImGuiNavMoveFlags_LoopY | ImGuiNavMoveFlags_WrapY)) == 0;
@@ -10709,7 +10709,7 @@ void ImGui::NavUpdateCreateMoveRequest()
             window->NavRectRel[g.NavLayer].ClipWithFull(inner_rect_rel);
             g.NavId = g.NavFocusScopeId = 0;
         }
-    }
+    }*/
 
     // For scoring we use a single segment on the left side our current item bounding box (not touching the edge to avoid box overlap with zero-spaced items)
     ImRect scoring_rect;

source/installer.cpp

@@ -27,6 +27,13 @@
 
 #define BGFT_HEAP_SIZE (1 * 1024 * 1024)
 
+struct BgProgressCheck
+{
+	ArchivePkgInstallData* pkg_data;
+	int task_id;
+	std::string hash;
+};
+
 static OrbisBgftInitParams s_bgft_init_params;
 
 static bool s_bgft_initialized = false;
@@ -325,7 +332,9 @@ namespace INSTALLER
 				{
 					ret = sceAppInstUtilAppUnInstall(cid.c_str());
 					if (ret != 0)
+					{
 						goto err;
+					}
 					goto retry;
 				}
 			}
@@ -338,8 +347,9 @@ namespace INSTALLER
 			}
 		}
 		else if (ret > 0)
+		{
 			goto err;
-
+		}
 		ret = sceBgftServiceDownloadStartTask(task_id);
 		if (ret)
 		{
@@ -719,7 +729,39 @@ namespace INSTALLER
 		archive_pkg_install_data_list.erase(hash);
 	}
 
-	bool InstallArchivePkg(const std::string &path, ArchivePkgInstallData* pkg_data)
+	void *CheckBgInstallTaskThread(void *argp)
+	{
+		bool completed = false;
+		OrbisBgftTaskProgress progress_info;
+		BgProgressCheck *bg_check_data = (BgProgressCheck*) argp;
+		int ret;
+
+		while (!completed)
+		{
+			memset(&progress_info, 0, sizeof(progress_info));
+			ret = sceBgftServiceDownloadGetProgress(bg_check_data->task_id, &progress_info);
+			if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
+			{
+				goto finish;
+			}
+			if (progress_info.length > 0)
+			{
+				completed = progress_info.transferred == progress_info.length;
+			}
+			sceSystemServicePowerTick();
+			sceKernelUsleep(500000);
+		}
+	finish:
+		bg_check_data->pkg_data->stop_write_thread = true;
+		pthread_join(bg_check_data->pkg_data->thread, NULL);
+		delete(bg_check_data->pkg_data->split_file);
+		free(bg_check_data->pkg_data);
+		RemoveArchivePkgInstallData(bg_check_data->hash);
+		free(bg_check_data);
+		return nullptr;
+	}
+
+	bool InstallArchivePkg(const std::string &path, ArchivePkgInstallData* pkg_data, bool bg)
 	{
 		pkg_header header;
 		pkg_data->split_file->Read((char*)&header, sizeof(pkg_header), 0);
@@ -793,18 +835,31 @@ namespace INSTALLER
 			ret = sceBgftServiceIntDebugDownloadRegisterPkg(&params, &task_id);
 		if (ret == 0x80990088 || ret == 0x80990015)
 		{
-			sprintf(confirm_message, "%s - %s?", display_title.c_str(), lang_strings[STR_REINSTALL_CONFIRM_MSG]);
-			confirm_state = CONFIRM_WAIT;
-			action_to_take = selected_action;
-			activity_inprogess = false;
-			while (confirm_state == CONFIRM_WAIT)
+			if (!bg)
 			{
-				sceKernelUsleep(100000);
-			}
-			activity_inprogess = true;
-			selected_action = action_to_take;
+				sprintf(confirm_message, "%s - %s?", display_title.c_str(), lang_strings[STR_REINSTALL_CONFIRM_MSG]);
+				confirm_state = CONFIRM_WAIT;
+				action_to_take = selected_action;
+				activity_inprogess = false;
+				while (confirm_state == CONFIRM_WAIT)
+				{
+					sceKernelUsleep(100000);
+				}
+				activity_inprogess = true;
+				selected_action = action_to_take;
 
-			if (confirm_state == CONFIRM_YES)
+				if (confirm_state == CONFIRM_YES)
+				{
+					ret = sceAppInstUtilAppUnInstall(cid.c_str());
+					if (ret != 0)
+					{
+						ret = 0;
+						goto finish;
+					}
+					goto retry;
+				}
+			}
+			else
 			{
 				ret = sceAppInstUtilAppUnInstall(cid.c_str());
 				if (ret != 0)
@@ -812,7 +867,6 @@ namespace INSTALLER
 					ret = 0;
 					goto finish;
 				}
-				goto retry;
 			}
 		}
 		else if (ret > 0)
@@ -830,35 +884,47 @@ namespace INSTALLER
 
 		Util::Notify("%s queued", display_title.c_str());
 
-		file_transfering = true;
-		bytes_to_download = 100;
-		bytes_transfered = 0;
-		while (!completed)
+		if (!bg)
 		{
-			memset(&progress_info, 0, sizeof(progress_info));
-			ret = sceBgftServiceDownloadGetProgress(task_id, &progress_info);
-			if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
+			file_transfering = true;
+			bytes_to_download = 100;
+			bytes_transfered = 0;
+			while (!completed)
 			{
-				ret = 0;
-				goto finish;
+				memset(&progress_info, 0, sizeof(progress_info));
+				ret = sceBgftServiceDownloadGetProgress(task_id, &progress_info);
+				if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
+				{
+					ret = 0;
+					goto finish;
+				}
+				bytes_transfered = (uint32_t)(((float)progress_info.transferred / progress_info.length) * 100.f);
+				if (progress_info.length > 0)
+				{
+					completed = progress_info.transferred == progress_info.length;
+				}
+				sceSystemServicePowerTick();
 			}
-			bytes_transfered = (uint32_t)(((float)progress_info.transferred / progress_info.length) * 100.f);
-			if (progress_info.length > 0)
-			{
-				completed = progress_info.transferred == progress_info.length;
-			}
-			sceSystemServicePowerTick();
 		}
-
+		else
+		{
+			BgProgressCheck *bg_check_data = (BgProgressCheck*) malloc(sizeof(BgProgressCheck));
+			memset(bg_check_data, 0, sizeof(BgProgressCheck));
+			bg_check_data->pkg_data = pkg_data;
+			bg_check_data->task_id = task_id;
+			bg_check_data->hash = hash;
+			ret = pthread_create(&bk_install_thid, NULL, CheckBgInstallTaskThread, bg_check_data);
+			return 1;
+		}
 		ret = 1;
 	finish:
 		pkg_data->stop_write_thread = true;
 		pthread_join(pkg_data->thread, NULL);
 		delete(pkg_data->split_file);
-		free(pkg_data->archive_entry);
 		free(pkg_data);
 		RemoveArchivePkgInstallData(hash);
 		return ret;
 
 	}
+
 }

source/installer.h

@@ -129,6 +129,8 @@ struct ArchivePkgInstallData
     bool stop_write_thread;
 };
 
+static pthread_t bk_install_thid;
+
 namespace INSTALLER
 {
     int Init(void);
@@ -146,5 +148,5 @@ namespace INSTALLER
     ArchivePkgInstallData *GetArchivePkgInstallData(const std::string &hash);
     void AddArchivePkgInstallData(const std::string &hash, ArchivePkgInstallData *pkg_data);
     void RemoveArchivePkgInstallData(const std::string &hash);
-    bool InstallArchivePkg(const std::string &path, ArchivePkgInstallData* pkg_data);
+    bool InstallArchivePkg(const std::string &path, ArchivePkgInstallData* pkg_data, bool bg = false);
 }

source/lang.cpp

@@ -10,166 +10,168 @@ char lang_identifiers[LANG_STRINGS_NUM][LANG_ID_SIZE] = {
 
 // This is properly populated so that emulator won't crash if an user launches it without language INI files.
 char lang_strings[LANG_STRINGS_NUM][LANG_STR_SIZE] = {
-	"Connection Settings",																		// STR_CONNECTION_SETTINGS
-	"Site",																						// STR_SITE
-	"Local",																					// STR_LOCAL
-	"Remote",																					// STR_REMOTE
-	"Messages",																					// STR_MESSAGES
-	"Update Software",																			// STR_UPDATE_SOFTWARE
-	"Connect",																					// STR_CONNECT
-	"Disconnect",																				// STR_DISCONNECT
-	"Search",																					// STR_SEARCH
-	"Refresh",																					// STR_REFRESH
-	"Server",																					// STR_SERVER
-	"Username",																					// STR_USERNAME
-	"Password",																					// STR_PASSWORD
-	"Port",																						// STR_PORT
-	"Pasv",																						// STR_PASV
-	"Directory",																				// STR_DIRECTORY
-	"Filter",																					// STR_FILTER
-	"Yes",																						// STR_YES
-	"No",																						// STR_NO
-	"Cancel",																					// STR_CANCEL
-	"Continue",																					// STR_CONTINUE
-	"Close",																					// STR_CLOSE
-	"Folder",																					// STR_FOLDER
-	"File",																						// STR_FILE
-	"Type",																						// STR_TYPE
-	"Name",																						// STR_NAME
-	"Size",																						// STR_SIZE
-	"Date",																						// STR_DATE
-	"New Folder",																				// STR_NEW_FOLDER
-	"Rename",																					// STR_RENAME
-	"Delete",																					// STR_DELETE
-	"Upload",																					// STR_UPLOAD
-	"Download",																					// STR_DOWNLOAD
-	"Select All",																				// STR_SELECT_ALL
-	"Clear All",																				// STR_CLEAR_ALL
-	"Uploading",																				// STR_UPLOADING
-	"Downloading",																				// STR_DOWNLOADING
-	"Overwrite",																				// STR_OVERWRITE
-	"Don't Overwrite",																			// STR_DONT_OVERWRITE
-	"Ask for Confirmation",																		// STR_ASK_FOR_CONFIRM
-	"Don't Ask for Confirmation",																// STR_DONT_ASK_CONFIRM
-	"Always use this option and don't ask again",												// STR_ALLWAYS_USE_OPTION
-	"Actions",																					// STR_ACTIONS
-	"Confirm",																					// STR_CONFIRM
-	"Overwrite Options",																		// STR_OVERWRITE_OPTIONS
-	"Properties",																				// STR_PROPERTIES
-	"Progress",																					// STR_PROGRESS
-	"Updates",																					// STR_UPDATES
-	"Are you sure you want to delete this file(s)/folder(s)?",									// STR_DEL_CONFIRM_MSG
-	"Canceling. Waiting for last action to complete",											// STR_CANCEL_ACTION_MSG
-	"Failed to upload file",																	// STR_FAIL_UPLOAD_MSG
-	"Failed to download file",																	// STR_FAIL_DOWNLOAD_MSG
-	"Failed to read contents of directory or folder does not exist.",							// STR_FAIL_READ_LOCAL_DIR_MSG
-	"426 Connection closed.",																	// STR_CONNECTION_CLOSE_ERR_MSG
-	"426 Remote Server has terminated the connection.",											// STR_REMOTE_TERM_CONN_MSG
-	"300 Failed Login. Please check your username or password.",								// STR_FAIL_LOGIN_MSG
-	"426 Failed. Connection timeout.",															// STR_FAIL_TIMEOUT_MSG
-	"Failed to delete directory",																// STR_FAIL_DEL_DIR_MSG
-	"Deleting",																					// STR_DELETING
-	"Failed to delete file",																	// STR_FAIL_DEL_FILE_MSG
-	"Deleted",																					// STR_DELETED
-	"Link",																						// STR_LINK
-	"Share",																					// STR_SHARE
-	"310 Failed",																				// STR_FAILED
-	"310 Failed to create file on local",														// STR_FAIL_CREATE_LOCAL_FILE_MSG
-	"Install",																					// STR_INSTALL
-	"Installing",																				// STR_INSTALLING
-	"Success",																					// STR_INSTALL_SUCCESS
-	"Failed",																					// STR_INSTALL_FAILED
-	"Skipped",																					// STR_INSTALL_SKIPPED
-	"Checking connection to remote HTTP Server",												// STR_CHECK_HTTP_MSG
-	"Failed connecting to HTTP Server",															// STR_FAILED_HTTP_CHECK
-	"Remote is not a HTTP Server",																// STR_REMOTE_NOT_HTTP
-	"Package not in the /data or /mnt/usbX folder",												// STR_INSTALL_FROM_DATA_MSG
-	"Package is already installed",																// STR_ALREADY_INSTALLED_MSG
-	"Install from URL",																			// STR_INSTALL_FROM_URL
-	"Could not read package header info",														// STR_CANNOT_READ_PKG_HDR_MSG
-	"Favorite URLs",																			// STR_FAVORITE_URLS
-	"Slot",																						// STR_SLOT
-	"Edit",																						// STR_EDIT
-	"One Time Url",																				// STR_ONETIME_URL
-	"Not a valid Package",																		// STR_NOT_A_VALID_PACKAGE
-	"Waiting for Package to finish installing",													// STR_WAIT_FOR_INSTALL_MSG
-	"Failed to install pkg file. Please delete the tmp pkg manually",							// STR_FAIL_INSTALL_TMP_PKG_MSG
-	"Failed to obtain download URL",															// STR_FAIL_TO_OBTAIN_GG_DL_MSG
-	"Auto delete temporary downloaded pkg file after install",									// STR_AUTO_DELETE_TMP_PKG
-	"Protocol not supported",																	// STR_PROTOCOL_NOT_SUPPORTED
-	"Could not resolve hostname",																// STR_COULD_NOT_RESOLVE_HOST
-	"Extract",																					// STR_EXTRACT
-	"Extracting",																				// STR_EXTRACTING
-	"Failed to extract",																		// STR_FAILED_TO_EXTRACT
-	"Extract Location",																			// STR_EXTRACT_LOCATION
-	"Compress",																					// STR_COMPRESS
-	"Zip Filename",																				// STR_ZIP_FILE_PATH
-	"Compressing",																				// STR_COMPRESSING
-	"Error occured while creating zip",															// STR_ERROR_CREATE_ZIP
-	"Unsupported compressed file format",														// STR_UNSUPPORTED_FILE_FORMAT
-	"Cut",																						// STR_CUT
-	"Copy",																						// STR_COPY
-	"Paste",																					// STR_PASTE
-	"Moving",																					// STR_MOVING
-	"Copying",																					// STR_COPYING
-	"Failed to move file",																		// STR_FAIL_MOVE_MSG
-	"Failed to copy file",																		// STR_FAIL_COPY_MSG
-	"Cannot move parent directory to sub subdirectory",											// STR_CANT_MOVE_TO_SUBDIR_MSG
-	"Cannot copy parent directory to sub subdirectory",											// STR_CANT_COPY_TO_SUBDIR_MSG
-	"Operation not supported",																	// STR_UNSUPPORTED_OPERATION_MSG
-	"Http Port",																				// STR_HTTP_PORT
-	"The content has already been installed. Do you want to continue installing",				// STR_REINSTALL_CONFIRM_MSG
-	"Remote package installation is not supported for protected servers.",						// STR_REMOTE_NOT_SUPPORT_MSG
-	"Remote HTTP Server not reachable.",														// STR_CANNOT_CONNECT_REMOTE_MSG
-	"Remote Package Install not possible. Would you like to download package and install?",		// STR_DOWNLOAD_INSTALL_MSG
-	"Checking remote server for Remote Package Install.",										// STR_CHECKING_REMOTE_SERVER_MSG
-	"RPI",																						// STR_ENABLE_RPI
-	"This option enables Remote Package Installation.",											// STR_ENABLE_RPI_FTP_SMB_MSG
-	"This option enables Remote Package Installation.",											// STR_ENABLE_RPI_WEBDAV_MSG
-	"Files",																					// STR_FILES
-	"Editor",																					// STR_EDITOR
-	"Save",																						// STR_SAVE
-	"Cannot edit files bigger than",															// STR_MAX_EDIT_FILE_SIZE_MSG
-	"Delete Selected Line",																		// STR_DELETE_LINE
-	"Insert Below Selected Line",																// STR_INSERT_LINE
-	"Modified",																					// STR_MODIFIED
-	"Failed to obtain an access token from",													// STR_FAIL_GET_TOKEN_MSG
-	"Login Success. You may close the browser and return to the application",					// STR_GET_TOKEN_SUCCESS_MSG
-	"See, edit, create, and delete all of your Google Drive files",								// STR_PERM_DRIVE
-	"See, create, and delete its own configuration data in your Google Drive",					// STR_PERM_DRIVE_APPDATA
-	"See, edit, create, and delete only the specific Google Drive files you use with this app", // STR_PERM_DRIVE_FILE
-	"View and manage metadata of files in your Google Drive",									// STR_PERM_DRIVE_METADATA
-	"See information about your Google Drive files",											// STR_PERM_DRIVE_METADATA_RO
-	"Google login failed",																		// STR_GOOGLE_LOGIN_FAIL_MSG
-	"Google login timed out",																	// STR_GOOGLE_LOGIN_TIMEOUT_MSG
-	"New File",																					// STR_NEW_FILE
-	"Settings",																					// STR_SETTINGS
-	"Client ID",																				// STR_CLIENT_ID
-	"Client Secret",																			// STR_CLIENT_SECRET
-	"Global",																					// STR_GLOBAL
-	"Google",																					// STR_GOOGLE
-	"Copy selected line",																		// STR_COPY_LINE
-	"Paste into selected line",																	// STR_PASTE_LINE
-	"Show hidden files",																		// STR_SHOW_HIDDEN_FILES
-	"Set Default Folder",																		// STR_SET_DEFAULT_DIRECTORY
-	"has being set as default direcotry",														// STR_SET_DEFAULT_DIRECTORY_MSG
-	"View Image",																				// STR_VIEW_IMAGE
-	"Package Information",																		// STR_VIEW_PKG_INFO
-	"NFS export path missing in URL",															// STR_NFS_EXP_PATH_MISSING_MSG
-	"Failed to init NFS context",																// STR_FAIL_INIT_NFS_CONTEXT
-	"Failed to mount NFS share",																// STR_FAIL_MOUNT_NFS_MSG
-	"Web Server",																				// STR_WEB_SERVER
-	"Enable",																					// STR_ENABLE
-	"Compressed Files Location",																// STR_COMPRESSED_FILE_PATH
-	"Location of where compressed files are stored on the web server",							// STR_COMPRESSED_FILE_PATH_MSG
-	"AllDebrid",																				// STR_ALLDEBRID
-	"API Key",																					// STR_API_KEY
-	"Couldn't extract download url",															// STR_CANT_EXTRACT_URL_MSG
-	"Failed to install from URL",																// STR_FAIL_INSTALL_FROM_URL_MSG
-	"InValid URL",																				// STR_INVALID_URL
-	"To use this function, an API Key needs to be configured in the ezRemote Client settings",	// STR_ALLDEBRID_API_KEY_MISSING_MSG
-	"Language",																					// STR_LANGUAGE
-	"Temp Directory",                                                                           // STR_TEMP_DIRECTORY
+	"Connection Settings",																			  // STR_CONNECTION_SETTINGS
+	"Site",																							  // STR_SITE
+	"Local",																						  // STR_LOCAL
+	"Remote",																						  // STR_REMOTE
+	"Messages",																						  // STR_MESSAGES
+	"Update Software",																				  // STR_UPDATE_SOFTWARE
+	"Connect",																						  // STR_CONNECT
+	"Disconnect",																					  // STR_DISCONNECT
+	"Search",																						  // STR_SEARCH
+	"Refresh",																						  // STR_REFRESH
+	"Server",																						  // STR_SERVER
+	"Username",																						  // STR_USERNAME
+	"Password",																						  // STR_PASSWORD
+	"Port",																							  // STR_PORT
+	"Pasv",																							  // STR_PASV
+	"Directory",																					  // STR_DIRECTORY
+	"Filter",																						  // STR_FILTER
+	"Yes",																							  // STR_YES
+	"No",																							  // STR_NO
+	"Cancel",																						  // STR_CANCEL
+	"Continue",																						  // STR_CONTINUE
+	"Close",																						  // STR_CLOSE
+	"Folder",																						  // STR_FOLDER
+	"File",																							  // STR_FILE
+	"Type",																							  // STR_TYPE
+	"Name",																							  // STR_NAME
+	"Size",																							  // STR_SIZE
+	"Date",																							  // STR_DATE
+	"New Folder",																					  // STR_NEW_FOLDER
+	"Rename",																						  // STR_RENAME
+	"Delete",																						  // STR_DELETE
+	"Upload",																						  // STR_UPLOAD
+	"Download",																						  // STR_DOWNLOAD
+	"Select All",																					  // STR_SELECT_ALL
+	"Clear All",																					  // STR_CLEAR_ALL
+	"Uploading",																					  // STR_UPLOADING
+	"Downloading",																					  // STR_DOWNLOADING
+	"Overwrite",																					  // STR_OVERWRITE
+	"Don't Overwrite",																				  // STR_DONT_OVERWRITE
+	"Ask for Confirmation",																			  // STR_ASK_FOR_CONFIRM
+	"Don't Ask for Confirmation",																	  // STR_DONT_ASK_CONFIRM
+	"Always use this option and don't ask again",													  // STR_ALLWAYS_USE_OPTION
+	"Actions",																						  // STR_ACTIONS
+	"Confirm",																						  // STR_CONFIRM
+	"Overwrite Options",																			  // STR_OVERWRITE_OPTIONS
+	"Properties",																					  // STR_PROPERTIES
+	"Progress",																						  // STR_PROGRESS
+	"Updates",																						  // STR_UPDATES
+	"Are you sure you want to delete this file(s)/folder(s)?",										  // STR_DEL_CONFIRM_MSG
+	"Canceling. Waiting for last action to complete",												  // STR_CANCEL_ACTION_MSG
+	"Failed to upload file",																		  // STR_FAIL_UPLOAD_MSG
+	"Failed to download file",																		  // STR_FAIL_DOWNLOAD_MSG
+	"Failed to read contents of directory or folder does not exist.",								  // STR_FAIL_READ_LOCAL_DIR_MSG
+	"426 Connection closed.",																		  // STR_CONNECTION_CLOSE_ERR_MSG
+	"426 Remote Server has terminated the connection.",												  // STR_REMOTE_TERM_CONN_MSG
+	"300 Failed Login. Please check your username or password.",									  // STR_FAIL_LOGIN_MSG
+	"426 Failed. Connection timeout.",																  // STR_FAIL_TIMEOUT_MSG
+	"Failed to delete directory",																	  // STR_FAIL_DEL_DIR_MSG
+	"Deleting",																						  // STR_DELETING
+	"Failed to delete file",																		  // STR_FAIL_DEL_FILE_MSG
+	"Deleted",																						  // STR_DELETED
+	"Link",																							  // STR_LINK
+	"Share",																						  // STR_SHARE
+	"310 Failed",																					  // STR_FAILED
+	"310 Failed to create file on local",															  // STR_FAIL_CREATE_LOCAL_FILE_MSG
+	"Install",																						  // STR_INSTALL
+	"Installing",																					  // STR_INSTALLING
+	"Success",																						  // STR_INSTALL_SUCCESS
+	"Failed",																						  // STR_INSTALL_FAILED
+	"Skipped",																						  // STR_INSTALL_SKIPPED
+	"Checking connection to remote HTTP Server",													  // STR_CHECK_HTTP_MSG
+	"Failed connecting to HTTP Server",																  // STR_FAILED_HTTP_CHECK
+	"Remote is not a HTTP Server",																	  // STR_REMOTE_NOT_HTTP
+	"Package not in the /data or /mnt/usbX folder",													  // STR_INSTALL_FROM_DATA_MSG
+	"Package is already installed",																	  // STR_ALREADY_INSTALLED_MSG
+	"Install from URL",																				  // STR_INSTALL_FROM_URL
+	"Could not read package header info",															  // STR_CANNOT_READ_PKG_HDR_MSG
+	"Favorite URLs",																				  // STR_FAVORITE_URLS
+	"Slot",																							  // STR_SLOT
+	"Edit",																							  // STR_EDIT
+	"One Time Url",																					  // STR_ONETIME_URL
+	"Not a valid Package",																			  // STR_NOT_A_VALID_PACKAGE
+	"Waiting for Package to finish installing",														  // STR_WAIT_FOR_INSTALL_MSG
+	"Failed to install pkg file. Please delete the tmp pkg manually",								  // STR_FAIL_INSTALL_TMP_PKG_MSG
+	"Failed to obtain download URL",																  // STR_FAIL_TO_OBTAIN_GG_DL_MSG
+	"Auto delete temporary downloaded pkg file after install",										  // STR_AUTO_DELETE_TMP_PKG
+	"Protocol not supported",																		  // STR_PROTOCOL_NOT_SUPPORTED
+	"Could not resolve hostname",																	  // STR_COULD_NOT_RESOLVE_HOST
+	"Extract",																						  // STR_EXTRACT
+	"Extracting",																					  // STR_EXTRACTING
+	"Failed to extract",																			  // STR_FAILED_TO_EXTRACT
+	"Extract Location",																				  // STR_EXTRACT_LOCATION
+	"Compress",																						  // STR_COMPRESS
+	"Zip Filename",																					  // STR_ZIP_FILE_PATH
+	"Compressing",																					  // STR_COMPRESSING
+	"Error occured while creating zip",																  // STR_ERROR_CREATE_ZIP
+	"Unsupported compressed file format",															  // STR_UNSUPPORTED_FILE_FORMAT
+	"Cut",																							  // STR_CUT
+	"Copy",																							  // STR_COPY
+	"Paste",																						  // STR_PASTE
+	"Moving",																						  // STR_MOVING
+	"Copying",																						  // STR_COPYING
+	"Failed to move file",																			  // STR_FAIL_MOVE_MSG
+	"Failed to copy file",																			  // STR_FAIL_COPY_MSG
+	"Cannot move parent directory to sub subdirectory",												  // STR_CANT_MOVE_TO_SUBDIR_MSG
+	"Cannot copy parent directory to sub subdirectory",												  // STR_CANT_COPY_TO_SUBDIR_MSG
+	"Operation not supported",																		  // STR_UNSUPPORTED_OPERATION_MSG
+	"Http Port",																					  // STR_HTTP_PORT
+	"The content has already been installed. Do you want to continue installing",					  // STR_REINSTALL_CONFIRM_MSG
+	"Remote package installation is not supported for protected servers.",							  // STR_REMOTE_NOT_SUPPORT_MSG
+	"Remote HTTP Server not reachable.",															  // STR_CANNOT_CONNECT_REMOTE_MSG
+	"Remote Package Install not possible. Would you like to download package and install?",			  // STR_DOWNLOAD_INSTALL_MSG
+	"Checking remote server for Remote Package Install.",											  // STR_CHECKING_REMOTE_SERVER_MSG
+	"RPI",																							  // STR_ENABLE_RPI
+	"This option enables Remote Package Installation.",												  // STR_ENABLE_RPI_FTP_SMB_MSG
+	"This option enables Remote Package Installation.",												  // STR_ENABLE_RPI_WEBDAV_MSG
+	"Files",																						  // STR_FILES
+	"Editor",																						  // STR_EDITOR
+	"Save",																							  // STR_SAVE
+	"Cannot edit files bigger than",																  // STR_MAX_EDIT_FILE_SIZE_MSG
+	"Delete Selected Line",																			  // STR_DELETE_LINE
+	"Insert Below Selected Line",																	  // STR_INSERT_LINE
+	"Modified",																						  // STR_MODIFIED
+	"Failed to obtain an access token from",														  // STR_FAIL_GET_TOKEN_MSG
+	"Login Success. You may close the browser and return to the application",						  // STR_GET_TOKEN_SUCCESS_MSG
+	"See, edit, create, and delete all of your Google Drive files",									  // STR_PERM_DRIVE
+	"See, create, and delete its own configuration data in your Google Drive",						  // STR_PERM_DRIVE_APPDATA
+	"See, edit, create, and delete only the specific Google Drive files you use with this app",		  // STR_PERM_DRIVE_FILE
+	"View and manage metadata of files in your Google Drive",										  // STR_PERM_DRIVE_METADATA
+	"See information about your Google Drive files",												  // STR_PERM_DRIVE_METADATA_RO
+	"Google login failed",																			  // STR_GOOGLE_LOGIN_FAIL_MSG
+	"Google login timed out",																		  // STR_GOOGLE_LOGIN_TIMEOUT_MSG
+	"New File",																						  // STR_NEW_FILE
+	"Settings",																						  // STR_SETTINGS
+	"Client ID",																					  // STR_CLIENT_ID
+	"Client Secret",																				  // STR_CLIENT_SECRET
+	"Global",																						  // STR_GLOBAL
+	"Google",																						  // STR_GOOGLE
+	"Copy selected line",																			  // STR_COPY_LINE
+	"Paste into selected line",																		  // STR_PASTE_LINE
+	"Show hidden files",																			  // STR_SHOW_HIDDEN_FILES
+	"Set Default Folder",																			  // STR_SET_DEFAULT_DIRECTORY
+	"has being set as default direcotry",															  // STR_SET_DEFAULT_DIRECTORY_MSG
+	"View Image",																					  // STR_VIEW_IMAGE
+	"Package Information",																			  // STR_VIEW_PKG_INFO
+	"NFS export path missing in URL",																  // STR_NFS_EXP_PATH_MISSING_MSG
+	"Failed to init NFS context",																	  // STR_FAIL_INIT_NFS_CONTEXT
+	"Failed to mount NFS share",																	  // STR_FAIL_MOUNT_NFS_MSG
+	"Web Server",																					  // STR_WEB_SERVER
+	"Enable",																						  // STR_ENABLE
+	"Compressed Files Location",																	  // STR_COMPRESSED_FILE_PATH
+	"Location of where compressed files are stored on the web server",								  // STR_COMPRESSED_FILE_PATH_MSG
+	"AllDebrid",																					  // STR_ALLDEBRID
+	"API Key",																						  // STR_API_KEY
+	"Couldn't extract download url",																  // STR_CANT_EXTRACT_URL_MSG
+	"Failed to install from URL",																	  // STR_FAIL_INSTALL_FROM_URL_MSG
+	"InValid URL",																					  // STR_INVALID_URL
+	"To use this function, an API Key needs to be configured in the ezRemote Client settings",		  // STR_ALLDEBRID_API_KEY_MISSING_MSG
+	"Language",																						  // STR_LANGUAGE
+	"Temp Directory",																				  // STR_TEMP_DIRECTORY
+	"Real-Debrid",																					  // STR_REALDEBRID
+	"Package install is running in the background. Don't close the app while install is in progress", // STR_BACKGROUND_INSTALL_INPROGRESS
 };
 
 bool needs_extended_font = false;

source/lang.h

@@ -163,7 +163,9 @@
 	FUNC(STR_INVALID_URL)                   \
 	FUNC(STR_ALLDEBRID_API_KEY_MISSING_MSG) \
 	FUNC(STR_LANGUAGE)                      \
-	FUNC(STR_TEMP_DIRECTORY)
+	FUNC(STR_TEMP_DIRECTORY)                \
+	FUNC(STR_REALDEBRID)                    \
+	FUNC(STR_BACKGROUND_INSTALL_INPROGRESS)
 
 #define GET_VALUE(x) x,
 #define GET_STRING(x) #x,
@@ -173,7 +175,7 @@ enum
 	FOREACH_STR(GET_VALUE)
 };
 
-#define LANG_STRINGS_NUM 160
+#define LANG_STRINGS_NUM 162
 #define LANG_ID_SIZE 64
 #define LANG_STR_SIZE 384
 extern char lang_identifiers[LANG_STRINGS_NUM][LANG_ID_SIZE];

source/main.cpp

@@ -11,6 +11,7 @@
 #include <orbis/Pad.h>
 #include <orbis/AudioOut.h>
 #include <orbis/Net.h>
+// #include <dbglogger.h>
 
 #include "imgui.h"
 #include "SDL2/SDL.h"

source/server/http_server.cpp

@@ -1111,15 +1111,18 @@ namespace HttpServer
         {
             std::string url;
             const char *url_param;
-            bool use_alldebrid;
+            bool use_alldebrid = false;
+            bool use_realdebrid = false;
+
             json_object *jobj = json_tokener_parse(req.body.c_str());
             if (jobj != nullptr)
             {
                 url_param = json_object_get_string(json_object_object_get(jobj, "url"));
                 use_alldebrid  = json_object_get_boolean(json_object_object_get(jobj, "use_alldebrid"));
+                use_realdebrid = json_object_get_boolean(json_object_object_get(jobj, "use_realdebrid"));
                 if (url_param == nullptr)
                 {
-                    bad_request(res, "Required url_param, use_alldebrid parameter missing");
+                    bad_request(res, "Required url_param parameter missing");
                     return;
                 }
             }
@@ -1129,14 +1132,14 @@ namespace HttpServer
                 return;
             }
 
-            if (use_alldebrid && strlen(alldebrid_api_key) == 0)
+            if ((use_alldebrid && strlen(alldebrid_api_key) == 0) || (use_realdebrid && strlen(realdebrid_api_key) == 0))
             {
                 failed(res, 200, lang_strings[STR_ALLDEBRID_API_KEY_MISSING_MSG]);
                 return;
             }
 
             url = std::string(url_param);
-            FileHost *filehost = FileHost::getFileHost(url, use_alldebrid);
+            FileHost *filehost = FileHost::getFileHost(url, use_alldebrid, use_realdebrid);
 
             if (!filehost->IsValidUrl())
             {
@@ -1152,7 +1155,6 @@ namespace HttpServer
                 return;
             }
 
-            FileHost::AddCacheDownloadUrl(hash, download_url);
             delete(filehost);
 
 			size_t scheme_pos = download_url.find("://");
@@ -1164,17 +1166,52 @@ namespace HttpServer
             BaseClient *baseclient = new BaseClient();
             baseclient->Connect(host, "", "");
             baseclient->Head(path, &header, sizeof(pkg_header));
-            std::string title = INSTALLER::GetRemotePkgTitle(baseclient, path, &header);
-            delete(baseclient);
 
-            std::string remote_install_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/rmt_inst/Site%2099/" + hash;
-            int rc = INSTALLER::InstallRemotePkg(remote_install_url, &header, title);
-            if (rc == 0)
-            {
-                failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
-                return;
+            if (BE32(header.pkg_magic) == 0x7F434E54)
+            {            
+                FileHost::AddCacheDownloadUrl(hash, download_url);
+                std::string title = INSTALLER::GetRemotePkgTitle(baseclient, path, &header);
+                delete(baseclient);
+
+                std::string remote_install_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/rmt_inst/Site%2099/" + hash;
+                int rc = INSTALLER::InstallRemotePkg(remote_install_url, &header, title);
+                if (rc == 0)
+                {
+                    failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                    return;
+                }
+            }
+            else
+            {
+                ArchiveEntry *entry = ZipUtil::GetPackageEntry(path, baseclient);
+                if (entry != nullptr)
+                {
+                    ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) malloc(sizeof(ArchivePkgInstallData));
+                    memset(install_data, 0, sizeof(ArchivePkgInstallData));
+
+                    std::string install_pkg_path = std::string(temp_folder) + "/" + entry->filename;
+                    SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE);
+                    
+                    install_data->archive_entry = entry;
+                    install_data->split_file = sp;
+                    install_data->stop_write_thread = false;
+
+                    int ret = pthread_create(&install_data->thread, NULL, Actions::ExtractArchivePkg, install_data);
+
+                    ret = INSTALLER::InstallArchivePkg(entry->filename, install_data, true);
+
+                    if (ret == 0)
+                    {
+                        failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                        return;
+                    }
+                }
+                else
+                {
+                    failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                    return;
+                }
             }
-            
             success(res);
         });
 

source/windows.cpp

@@ -1735,7 +1735,6 @@ namespace Windows
                 ImGui::PopStyleVar();
                 ImGui::Separator();
 
-                // Google settings
                 ImGui::TextColored(colors[ImGuiCol_ButtonHovered], "%s", lang_strings[STR_ALLDEBRID]);
                 ImGui::Separator();
 
@@ -1750,14 +1749,41 @@ namespace Windows
                 if (strlen(alldebrid_api_key) > 0)
                     sprintf(id, "%s", "*********************************************##alldebrid_api_key");
                 else
-                    sprintf(id, "%s", "##client_secret_input");
+                    sprintf(id, "%s", "##alldebrid_api_key");
                 if (ImGui::Button(id, ImVec2(835-width, 0)))
                 {
                     ResetImeCallbacks();
                     ime_single_field = alldebrid_api_key;
-                    ime_field_size = 31;
+                    ime_field_size = 63;
                     ime_callback = SingleValueImeCallback;
-                    Dialog::initImeDialog(lang_strings[STR_API_KEY], alldebrid_api_key, 31, ORBIS_TYPE_BASIC_LATIN, 1050, 80);
+                    Dialog::initImeDialog(lang_strings[STR_API_KEY], alldebrid_api_key, 63, ORBIS_TYPE_BASIC_LATIN, 1050, 80);
+                    gui_mode = GUI_MODE_IME;
+                }
+                ImGui::PopStyleVar();
+                ImGui::Separator();
+
+                ImGui::TextColored(colors[ImGuiCol_ButtonHovered], "%s", lang_strings[STR_REALDEBRID]);
+                ImGui::Separator();
+
+                field_size = ImGui::CalcTextSize(lang_strings[STR_API_KEY]);
+                width = field_size.x + 45;
+                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
+                ImGui::Text("%s", lang_strings[STR_API_KEY]);
+                ImGui::SameLine();
+                ImGui::SetCursorPosX(width);
+                ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 1.0f));
+
+                if (strlen(realdebrid_api_key) > 0)
+                    sprintf(id, "%s", "*********************************************##realdebrid_api_key");
+                else
+                    sprintf(id, "%s", "##realdebrid_api_key");
+                if (ImGui::Button(id, ImVec2(835-width, 0)))
+                {
+                    ResetImeCallbacks();
+                    ime_single_field = realdebrid_api_key;
+                    ime_field_size = 63;
+                    ime_callback = SingleValueImeCallback;
+                    Dialog::initImeDialog(lang_strings[STR_API_KEY], realdebrid_api_key, 63, ORBIS_TYPE_BASIC_LATIN, 1050, 80);
                     gui_mode = GUI_MODE_IME;
                 }
                 ImGui::PopStyleVar();

source/zip_util.cpp

@@ -288,29 +288,35 @@ namespace ZipUtil
     static int extract2fd(struct archive *a, const std::string &pathname, int fd)
     {
         ssize_t len;
-        unsigned char buffer[ARCHIVE_TRANSFER_SIZE];
+        unsigned char *buffer = (unsigned char *) malloc(ARCHIVE_TRANSFER_SIZE);
 
         /* loop over file contents and write to fd */
         for (int n = 0;; n++)
         {
-            len = archive_read_data(a, buffer, sizeof buffer);
+            len = archive_read_data(a, buffer, ARCHIVE_TRANSFER_SIZE);
 
             if (len == 0)
+            {
+                free(buffer);
                 return 1;
+            }
 
             if (len < 0)
             {
                 sprintf(status_message, "error archive_read_data('%s')", pathname.c_str());
+                free(buffer);
                 return 0;
             }
 
             if (write(fd, buffer, len) != len)
             {
                 sprintf(status_message, "error write('%s')", pathname.c_str());
+                free(buffer);
                 return 0;
             }
         }
 
+        free(buffer);
         return 1;
     }
 
@@ -431,7 +437,7 @@ namespace ZipUtil
         return password;
     }
 
-    static RemoteArchiveData *OpenRemoteArchive(const std::string &file)
+    static RemoteArchiveData *OpenRemoteArchive(const std::string &file, RemoteClient *client)
     {
         RemoteArchiveData *data;
 
@@ -439,8 +445,8 @@ namespace ZipUtil
         memset(data, 0, sizeof(RemoteArchiveData));
 
         data->offset = 0;
-        remoteclient->Size(file, &data->size);
-        data->client = remoteclient;
+        client->Size(file, &data->size);
+        data->client = client;
         data->path = file;
         return data;
     }
@@ -478,7 +484,7 @@ namespace ZipUtil
      * Main loop: open the zipfile, iterate over its contents and decide what
      * to do with each entry.
      */
-    int Extract(const DirEntry &file, const std::string &basepath, bool is_remote)
+    int Extract(const DirEntry &file, const std::string &basepath, RemoteClient *client)
     {
         struct archive *a;
         struct archive_entry *e;
@@ -493,7 +499,7 @@ namespace ZipUtil
         archive_read_support_filter_all(a);
         archive_read_set_passphrase_callback(a, NULL, &passphrase_callback);
 
-        if (!is_remote)
+        if (client == nullptr)
         {
             ret = archive_read_open_filename(a, file.path, ARCHIVE_TRANSFER_SIZE);
             if (ret < ARCHIVE_OK)
@@ -504,7 +510,7 @@ namespace ZipUtil
         }
         else
         {
-            client_data = OpenRemoteArchive(file.path);
+            client_data = OpenRemoteArchive(file.path, client);
             if (client_data == nullptr)
             {
                 sprintf(status_message, "%s", "archive_read_open_filename failed");
@@ -548,7 +554,7 @@ namespace ZipUtil
         return 1;
     }
 
-    ArchiveEntry *GetPackageEntry(const std::string &zip_file, bool is_remote)
+    ArchiveEntry *GetPackageEntry(const std::string &zip_file, RemoteClient *client)
     {
         struct archive *a;
         struct archive_entry *e;
@@ -565,7 +571,7 @@ namespace ZipUtil
         archive_read_support_filter_all(a);
         archive_read_set_passphrase_callback(a, NULL, &passphrase_callback);
 
-        if (!is_remote)
+        if (client == nullptr)
         {
             ret = archive_read_open_filename(a, zip_file.c_str(), ARCHIVE_TRANSFER_SIZE);
             if (ret < ARCHIVE_OK)
@@ -576,7 +582,7 @@ namespace ZipUtil
         }
         else
         {
-            client_data = OpenRemoteArchive(zip_file);
+            client_data = OpenRemoteArchive(zip_file, client);
             if (client_data == nullptr)
             {
                 sprintf(status_message, "%s", "archive_read_open_filename failed");
@@ -613,7 +619,83 @@ namespace ZipUtil
             if (ret == ARCHIVE_EOF)
                 break;
 
-            char *p, *q;
+            if ((pathname = pathdup(archive_entry_pathname(e))) == NULL)
+            {
+                archive_read_data_skip(a);
+                continue;
+            }
+
+            filetype = archive_entry_filetype(e);
+
+            /* sanity checks */
+            if (pathname[0] == '/' ||
+                strncmp(pathname, "../", 3) == 0 ||
+                strstr(pathname, "/../") != NULL)
+            {
+                archive_read_data_skip(a);
+                free(pathname);
+                continue;
+                ;
+            }
+
+            /* I don't think this can happen in a zipfile.. */
+            if (!S_ISREG(filetype))
+            {
+                archive_read_data_skip(a);
+                free(pathname);
+                continue;
+            }
+
+            if (Util::EndsWith(Util::ToLower(pathname), ".pkg"))
+            {
+                pkg_entry = (ArchiveEntry *)malloc(sizeof(ArchiveEntry));
+                memset(pkg_entry, 0, sizeof(ArchiveEntry));
+
+                pkg_entry->archive = a;
+                pkg_entry->entry = e;
+                pkg_entry->client_data = client_data;
+                pkg_entry->filename = pathname;
+                pkg_entry->filesize = archive_entry_size(e);
+
+                free(pathname);
+                return pkg_entry;
+            }
+
+            free(pathname);
+        }
+
+        archive_read_free(a);
+
+        return nullptr;
+    }
+
+    ArchiveEntry *GetNextPackageEntry(ArchiveEntry *archive_entry)
+    {
+        struct archive *a = archive_entry->archive;
+        struct archive_entry *e = nullptr;
+        RemoteArchiveData *client_data = archive_entry->client_data;
+        char *pathname;
+        mode_t filetype;
+        ArchiveEntry *pkg_entry = nullptr;
+        int ret;
+
+        for (;;)
+        {
+            ret = archive_read_next_header(a, &e);
+
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "%s", "archive_read_next_header failed");
+                if (client_data != nullptr)
+                {
+                    free(client_data);
+                }
+                archive_read_free(a);
+                return nullptr;
+            }
+
+            if (ret == ARCHIVE_EOF)
+                break;
 
             if ((pathname = pathdup(archive_entry_pathname(e))) == NULL)
             {

source/zip_util.h

@@ -10,7 +10,7 @@
 #include "common.h"
 #include "fs.h"
 
-#define ARCHIVE_TRANSFER_SIZE (512 * 1024)
+#define ARCHIVE_TRANSFER_SIZE 5242880
 
 static uint8_t MAGIC_ZIP_1[4] = {0x50, 0x4B, 0x03, 0x04};
 static uint8_t MAGIC_ZIP_2[4] = {0x50, 0x4B, 0x05, 0x06};
@@ -49,7 +49,8 @@ struct ArchiveEntry
 namespace ZipUtil
 {
     int ZipAddPath(zipFile zf, const std::string &path, int filename_start, int level);
-    int Extract(const DirEntry &file, const std::string &dir, bool is_remote = false);
-    ArchiveEntry *GetPackageEntry(const std::string &zip_file, bool is_remote = false);
+    int Extract(const DirEntry &file, const std::string &dir, RemoteClient *client = nullptr);
+    ArchiveEntry *GetPackageEntry(const std::string &zip_file, RemoteClient *client = nullptr);
+    ArchiveEntry *GetNextPackageEntry(ArchiveEntry *archive_entry);
 }
 #endif