enable disk caching for all remote types

CMakeLists.txt

@@ -22,12 +22,6 @@ add_executable(ezremote_client
   source/imgui/imgui_widgets.cpp
   source/imgui/imgui.cpp
   source/pugixml/pugixml.cpp
-  source/web/callback.cpp
-  source/web/fsinfo.cpp
-  source/web/header.cpp
-  source/web/request.cpp
-  source/web/urn.cpp
-  source/webdav/client.cpp
   source/http/httplib.cpp
   source/clients/baseclient.cpp
   source/clients/apache.cpp
@@ -38,10 +32,11 @@ add_executable(ezremote_client
   source/clients/npxserve.cpp
   source/clients/nfsclient.cpp
   source/clients/smbclient.cpp
-  source/clients/webdavclient.cpp
   source/clients/sftpclient.cpp
   source/clients/rclone.cpp
+  source/clients/webdav.cpp
   source/filehost/alldebrid.cpp
+  source/filehost/realdebrid.cpp
   source/filehost/directhost.cpp
   source/filehost/gdrive.cpp
   source/filehost/filehost.cpp
@@ -66,11 +61,13 @@ add_executable(ezremote_client
   source/textures.cpp
   source/windows.cpp
   source/zip_util.cpp
+  source/split_file.cpp
+  source/mem_file.cpp
 )
 
 add_self(ezremote_client)
 
-add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.11" 32 0)
+add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.27" 32 0)
 
 target_link_libraries(ezremote_client
   c

README.md

@@ -1,6 +1,10 @@
 # ezRemote Client
 
-ezRemote Client is an application that allows you to connect the PS4 to remote FTP/SFTP, SMB, NFS, WebDAV, HTTP servers and Google Drive to transfer files. The interface is inspired by Filezilla client which provides a commander like GUI.
+ezRemote Client is an application that allows you to connect the PS4 to remote FTP/SFTP, SMB(Windows Share), NFS, WebDAV, HTTP servers and Google Drive to transfer files. The interface is inspired by Filezilla client which provides a commander like GUI.
+
+**New: As of version 1.19** 
+- Install PKG inside Zip files from both local hdd and remote servers.
+- Extact zip files directly from remote servers.
 
 **New:** As of version 1.0.8, ezRemote Client has a Web Interface that can be access from any modern browser to manage the PS4 files.
 
@@ -27,7 +31,7 @@ To distinguish between FTP, SMB, NFS, WebDAV or HTTP, the URL must be prefix wit
    then in the password field enter file:///data/ezremote-client
    ```
 
- - The url format for SMB is
+ - The url format for SMB(Windows Share) is
    ```
    smb://hostname[:port]/sharename
 
@@ -114,7 +118,7 @@ Remote Package Installation with all Remote Server, even if they are password pr
  - Upload files to the PS4
  - Download files from the PS4
  - Install packages on the PS4
- - Install packages from shared links from mediafire, google and pixeldrain. For other filehost, they can installed via AllDebrid (See AllDebrid website for supported filehost).
+ - Install packages from shared links from mediafire, google and pixeldrain. For other filehost, they can installed via AllDebrid/RealDebrid (See respective websites for supported filehost).
 
 ## How to access the Web Interface ##
 You need to launch the "ezRemote Client" app on the PS4. Then on any device(laptop, tablet, phone etc..) with web browser goto to http://<ip_address_of_ps4>:8080 . That's all.
@@ -172,6 +176,7 @@ Romanian
 Ryukyuan
 Thai
 Turkish
+Ukrainian
 ```
 User must modify the file **/data/ezremote-client/config.ini** located in the ps4 hard drive and update the **language** setting to with the **exact** values from the list above.
 

data/assets/langs/English.ini

@@ -156,3 +156,8 @@ STR_CANT_EXTRACT_URL_MSG=Couldn't extract download url
 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_REALDEBRID=Real-Debrid
+STR_BACKGROUND_INSTALL_INPROGRESS=Package install is running in the background. Don't close the app while install is in progress
+STR_ENABLE_DISC_CACHE_MSG=Enable disk caching. Can improve package install speed in cases where connection to remote is slow

data/assets/langs/Simplified Chinese.ini

@@ -1,8 +1,8 @@
 STR_CONNECTION_SETTINGS=连接设置
-STR_SITE=地点
-STR_LOCAL=当地的
-STR_REMOTE=偏僻的
-STR_MESSAGES=留言
+STR_SITE=站点
+STR_LOCAL=本地
+STR_REMOTE=远程路径
+STR_MESSAGES=信息
 STR_UPDATE_SOFTWARE=更新软件
 STR_CONNECT=连接
 STR_DISCONNECT=断开
@@ -11,51 +11,123 @@ STR_REFRESH=刷新
 STR_SERVER=服务器
 STR_USERNAME=用户名
 STR_PASSWORD=密码
-STR_PORT=港口
-STR_PASV=帕夫
+STR_PORT=端口
+STR_PASV=被动模式
 STR_DIRECTORY=目录
-STR_FILTER=筛选
-STR_YES=是的
-STR_NO=不
+STR_FILTER=过滤器
+STR_YES=是
+STR_NO=否
 STR_CANCEL=取消
 STR_CONTINUE=继续
 STR_CLOSE=关闭
 STR_FOLDER=文件夹
 STR_FILE=文件
 STR_TYPE=类型
-STR_NAME=姓名
-STR_SIZE=尺寸
+STR_NAME=名称
+STR_SIZE=大小
 STR_DATE=日期
 STR_NEW_FOLDER=新建文件夹
-STR_RENAME=改名
+STR_RENAME=重命名
 STR_DELETE=删除
 STR_UPLOAD=上传
 STR_DOWNLOAD=下载
 STR_SELECT_ALL=全选
-STR_CLEAR_ALL=全部清除
-STR_UPLOADING=上传
-STR_DOWNLOADING=下载
+STR_CLEAR_ALL=取消全选
+STR_UPLOADING=上传中
+STR_DOWNLOADING=下载中
 STR_OVERWRITE=覆盖
-STR_DONT_OVERWRITE=不要覆盖
-STR_ASK_FOR_CONFIRM=要求确认
-STR_DONT_ASK_CONFIRM=不要要求确认
+STR_DONT_OVERWRITE=不覆盖
+STR_ASK_FOR_CONFIRM=确认请求
+STR_DONT_ASK_CONFIRM=不确认请求
 STR_ALLWAYS_USE_OPTION=始终使用此选项，不再询问
 STR_ACTIONS=行动
 STR_CONFIRM=确认
 STR_OVERWRITE_OPTIONS=覆盖选项
-STR_PROPERTIES=特性
-STR_PROGRESS=进步
+STR_PROPERTIES=属性
+STR_PROGRESS=进度
 STR_UPDATES=更新
-STR_DEL_CONFIRM_MSG=您确定要删除此文件/文件夹吗？
-STR_CANCEL_ACTION_MSG=取消。 等待最后一个动作完成
+STR_DEL_CONFIRM_MSG=您确定要删除此文件/文件夹？
+STR_CANCEL_ACTION_MSG=取消中。请等待最后一个操作结束
 STR_FAIL_UPLOAD_MSG=上传文件失败
 STR_FAIL_DOWNLOAD_MSG=下载文件失败
 STR_FAIL_READ_LOCAL_DIR_MSG=读取目录内容失败或文件夹不存在。
 STR_CONNECTION_CLOSE_ERR_MSG=426 连接已关闭。
 STR_REMOTE_TERM_CONN_MSG=426 远程服务器已终止连接。
-STR_FAIL_LOGIN_MSG=300 登录失败。 请检查您的用户名或密码。
-STR_FAIL_TIMEOUT_MSG=426 失败。 连接超时。
+STR_FAIL_LOGIN_MSG=300 登录失败。请检查您的用户名或密码。
+STR_FAIL_TIMEOUT_MSG=426 失败。连接超时。
 STR_FAIL_DEL_DIR_MSG=删除目录失败
-STR_DELETING=删除
+STR_DELETING=删除中
 STR_FAIL_DEL_FILE_MSG=删除文件失败
-STR_DELETED=已删除
+STR_DELETED=删除完毕
+STR_LINK=链接
+STR_SHARE=分享
+STR_FAILED=310 失败
+STR_FAIL_CREATE_LOCAL_FILE_MSG=310 无法本地创建文件
+STR_INSTALL=安装
+STR_INSTALLING=正在安装中
+STR_INSTALL_SUCCESS=成功
+STR_INSTALL_FAILED=失败
+STR_INSTALL_SKIPPED=已忽略
+STR_CHECK_HTTP_MSG=正在检查与远程HTTP服务器的连接
+STR_FAILED_HTTP_CHECK=连接到HTTP服务器失败
+STR_REMOTE_NOT_HTTP=远程不是HTTP服务器
+STR_INSTALL_FROM_DATA_MSG=文件包不在/data或/mnt/usbX文件夹中
+STR_ALREADY_INSTALLED_MSG=文件包已经安装
+STR_INSTALL_FROM_URL=从网址安装
+STR_CANNOT_READ_PKG_HDR_MSG=无法读取包文件头信息
+STR_FAVORITE_URLS=收藏网址
+STR_SLOT=槽位
+STR_EDIT=编辑
+STR_ONETIME_URL=一次性网址
+STR_NOT_A_VALID_PACKAGE=不是有效的程序包
+STR_WAIT_FOR_INSTALL_MSG=正在等待包完成安装
+STR_FAIL_INSTALL_TMP_PKG_MSG=未能安装pkg文件。请手动删除tmp pkg
+STR_AUTO_DELETE_TMP_PKG=安装后自动删除临时下载的pkg文件
+STR_PROTOCOL_NOT_SUPPORTED=不支持该协议
+STR_COULD_NOT_RESOLVE_HOST=无法解析主机名
+STR_EXTRACT=提取
+STR_EXTRACTING=提取中
+STR_FAILED_TO_EXTRACT=提取失败
+STR_EXTRACT_LOCATION=提取位置
+STR_COMPRESS=压缩
+STR_ZIP_FILE_PATH=Zip 文件名
+STR_COMPRESSING=压缩中
+STR_ERROR_CREATE_ZIP=正在创建zip文件时出现错误
+STR_UNSUPPORTED_FILE_FORMAT=不支持的压缩文件格式
+STR_CUT=剪切
+STR_COPY=复制
+STR_PASTE=粘贴
+STR_MOVING=移动中
+STR_COPYING=复制中
+STR_FAIL_MOVE_MSG=移动文件失败
+STR_FAIL_COPY_MSG=复制文件事变
+STR_CANT_MOVE_TO_SUBDIR_MSG=无法将父目录移动到子目录
+STR_CANT_COPY_TO_SUBDIR_MSG=无法将父目录复制到子目录
+STR_UNSUPPORTED_OPERATION_MSG=不支持操作
+STR_HTTP_PORT=Http 端口
+STR_REINSTALL_CONFIRM_MSG=内容已安装。是否要继续安装
+STR_REMOTE_NOT_SUPPORT_MSG=受保护的服务器不支持远程程序包安装。
+STR_CANNOT_CONNECT_REMOTE_MSG=无法访问远程HTTP服务器。
+STR_DOWNLOAD_INSTALL_MSG=无法安装远程程序包。是否下载软件包并进行安装？
+STR_CHECKING_REMOTE_SERVER_MSG=正在检查远程服务器的远程包安装。
+STR_FILES=文件
+STR_EDITOR=编辑器
+STR_SAVE=保存
+STR_MAX_EDIT_FILE_SIZE_MSG=无法编辑大于全部的文件。
+STR_DELETE_LINE=删除所选行
+STR_INSERT_LINE=在所选行下方插入
+STR_MODIFIED=已修改
+STR_FAIL_GET_TOKEN_MSG=无法从获取访问令牌
+STR_GET_TOKEN_SUCCESS_MSG=登录成功。您可以关闭浏览器并返回应用程序
+STR_NEW_FILE=新文件
+STR_SETTINGS=设置
+STR_GLOBAL=全局
+STR_COPY_LINE=复制所选行
+STR_PASTE_LINE=粘贴到所选行
+STR_SHOW_HIDDEN_FILES=显示隐藏文件
+STR_SET_DEFAULT_DIRECTORY=设置默认文件夹
+STR_SET_DEFAULT_DIRECTORY_MSG=已设置为默认目录
+STR_NFS_EXP_PATH_MISSING_MSG=URL中缺少NFS导出路径
+STR_FAIL_INIT_NFS_CONTEXT=无法初始化NFS上下文
+STR_FAIL_MOUNT_NFS_MSG=挂在 NFS 共享失败
+STR_VIEW_IMAGE=查看图片

data/assets/langs/Ukrainian.ini

@@ -0,0 +1,132 @@
+STR_CONNECTION_SETTINGS=Налаштування підключення
+STR_SITE=Сайт
+STR_LOCAL=Локальний
+STR_REMOTE=Дистанційний
+STR_MESSAGES=Повідомлення
+STR_UPDATE_SOFTWARE=Оновлення ПО
+STR_CONNECT=Підключитися
+STR_DISCONNECT=Від'єднатися
+STR_SEARCH=Пошук
+STR_REFRESH=Оновити
+STR_SERVER=Сервер
+STR_USERNAME=Ім'я користувача
+STR_PASSWORD=Пароль
+STR_PORT=Порт
+STR_PASV=Пасв
+STR_DIRECTORY=Каталог
+STR_FILTER=Фільтир
+STR_YES=Так
+STR_NO=Ні
+STR_CANCEL=Відмінити
+STR_CONTINUE=Продовжити
+STR_CLOSE=Закрити
+STR_FOLDER=Тека
+STR_FILE=Файл
+STR_TYPE=Тип
+STR_NAME=Ім'я
+STR_SIZE=Розмір
+STR_DATE=Дата
+STR_NEW_FOLDER=Нова тека
+STR_RENAME=Перейменувати
+STR_DELETE=Видалити
+STR_UPLOAD=Викласти
+STR_DOWNLOAD=Завантажити
+STR_SELECT_ALL=Вибрати Все
+STR_CLEAR_ALL=Очистити Все
+STR_UPLOADING=Викладання
+STR_DOWNLOADING=Завантаження
+STR_OVERWRITE=Перезапис
+STR_DONT_OVERWRITE=Не Перезаписувати
+STR_ASK_FOR_CONFIRM=Запросити Підтвердження
+STR_DONT_ASK_CONFIRM=Не Запрошувати Підтвердження
+STR_ALLWAYS_USE_OPTION=Завжди використовувати цю опцію і не перепитувати
+STR_ACTIONS=Дії
+STR_CONFIRM=Підтвердити
+STR_OVERWRITE_OPTIONS=Налаштування Перезапису
+STR_PROPERTIES=Властивості
+STR_PROGRESS=Прогрес
+STR_UPDATES=Оновлення
+STR_DEL_CONFIRM_MSG=Ви впевнені що хочете видалити цей файл(и)/теку(и)?
+STR_CANCEL_ACTION_MSG=Скасування. Очікування завершення останньої дії
+STR_FAIL_UPLOAD_MSG=Помилка при викладанні файлу
+STR_FAIL_DOWNLOAD_MSG=Помилка при завантаженні файлу
+STR_FAIL_READ_LOCAL_DIR_MSG=Не вдалося прочитати вміст/каталог або тека не існує.
+STR_CONNECTION_CLOSE_ERR_MSG=426 З'єднання закрито.
+STR_REMOTE_TERM_CONN_MSG=426 Віддалений сервер розірвав з'єднання.
+STR_FAIL_LOGIN_MSG=300 Помилка входу. Будь ласка перевірте ім'я користувача або пароль.
+STR_FAIL_TIMEOUT_MSG=426 Не вдалося. Тайм-аут з'єднання.
+STR_FAIL_DEL_DIR_MSG=Не вдалося видалити каталог.
+STR_DELETING=Видалення
+STR_FAIL_DEL_FILE_MSG=Не вдалося видалити файл
+STR_DELETED=Видалено
+STR_LINK=Посилання
+STR_SHARE=Поділитися
+STR_FAILED=310 Не вдалося
+STR_FAIL_CREATE_LOCAL_FILE_MSG=310 Не вдалося створити файл локально
+STR_INSTALL=Встановити
+STR_INSTALLING=Встановлення
+STR_INSTALL_SUCCESS=Успішно
+STR_INSTALL_FAILED=Не вдалося
+STR_INSTALL_SKIPPED=Пропушено
+STR_CHECK_HTTP_MSG=Перевірка з'єднання с віддаленим HTTP-сервером
+STR_FAILED_HTTP_CHECK=Не вдалося встановити з'єднання з HTTP-сервером
+STR_REMOTE_NOT_HTTP=Спроба підключитися не до HTTP-сервера
+STR_INSTALL_FROM_DATA_MSG=Пакет не у теці /data або /mnt/usbX
+STR_ALREADY_INSTALLED_MSG=Пакет уже встановлено
+STR_INSTALL_FROM_URL=Встановити з посилання
+STR_CANNOT_READ_PKG_HDR_MSG=Не вдалося прочитати інформацію про заголовок пакета
+STR_FAVORITE_URLS=Улюблені посилання
+STR_SLOT=Слот
+STR_EDIT=Редагувати
+STR_ONETIME_URL=Одноразове посилання
+STR_NOT_A_VALID_PACKAGE=Недійсний пакет
+STR_WAIT_FOR_INSTALL_MSG=Зачекайте на заваршення встановлення пакету
+STR_FAIL_INSTALL_TMP_PKG_MSG=Не вдалося встановити файловий пакет. Будь ласка видаліть тимчасовий пакет вручну
+STR_AUTO_DELETE_TMP_PKG=Автоматичне видлення тимчасових завантажених пакетів після встановлення
+STR_PROTOCOL_NOT_SUPPORTED=Протакол не підтримується
+STR_COULD_NOT_RESOLVE_HOST=Не вдалося розпізнати ім'я хоста
+STR_EXTRACT=Витяг
+STR_EXTRACTING=Витягування
+STR_FAILED_TO_EXTRACT=Не вдалося витягнути
+STR_EXTRACT_LOCATION=Розташування витягу
+STR_COMPRESS=Стиснути
+STR_ZIP_FILE_PATH=Ім'я zip-файлу
+STR_COMPRESSING=Стискання
+STR_ERROR_CREATE_ZIP=Виникла помилка під час створення zip-файлу
+STR_UNSUPPORTED_FILE_FORMAT=Непідтримуваний формат стисненого файлу
+STR_CUT=Вирізати
+STR_COPY=Копіювати
+STR_PASTE=Вставит
+STR_MOVING=Перемістити
+STR_COPYING=Копіювання
+STR_FAIL_MOVE_MSG=Не вдалося перемістити файл
+STR_FAIL_COPY_MSG=Не вдалося копіювати файл
+STR_CANT_MOVE_TO_SUBDIR_MSG=Неможливо перемістити головний каталогдо підкаталогу
+STR_CANT_COPY_TO_SUBDIR_MSG=Неможливо копіювати головний каталогдо підкаталогу
+STR_UNSUPPORTED_OPERATION_MSG=Операція не підтримується
+STR_HTTP_PORT=HTTP Порт
+STR_REINSTALL_CONFIRM_MSG=Вміст вже встановлено. Ви хочете продовжити встановлення
+STR_REMOTE_NOT_SUPPORT_MSG=Віддалене встановлення пакетів не підтримується захищенимисерверами.
+STR_CANNOT_CONNECT_REMOTE_MSG=Віддалений HTTP-сервер недоступний.
+STR_DOWNLOAD_INSTALL_MSG=Віддалене встановлення пакета неможливе. Бажаєте замість цього завантажити пакунок і встановити?
+STR_CHECKING_REMOTE_SERVER_MSG=Перевірка віддаленого сервера на можливість віддаленого встановлення пакетів.
+STR_FILES=Файли
+STR_EDITOR=Редактор
+STR_SAVE=Зберегти
+STR_MAX_EDIT_FILE_SIZE_MSG=Неможливо редагувати файли, розмір яких перевищує
+STR_DELETE_LINE=Видалити Виділений Рядок
+STR_INSERT_LINE=Вставити нижче виділеного рядка
+STR_MODIFIED=Модифіковано
+STR_FAIL_GET_TOKEN_MSG=Не вдалося отримати токен доступу від
+STR_GET_TOKEN_SUCCESS_MSG=Успішний вхід. Ви можете закрити браузер і повернутися до програми
+STR_NEW_FILE=Новий Файл
+STR_SETTINGS=Налаштування
+STR_GLOBAL=Глобальні
+STR_COPY_LINE=Копіювати виділений рядок
+STR_PASTE_LINE=Вставити в виділений рядок
+STR_SHOW_HIDDEN_FILES=Показати приховані файли
+STR_SET_DEFAULT_DIRECTORY=Встановити теку за замовчуванням
+STR_SET_DEFAULT_DIRECTORY_MSG=встановлено директорією за замовчуванням
+STR_NFS_EXP_PATH_MISSING_MSG=В URL-адресі відсутній шлях до експорту NFS
+STR_FAIL_INIT_NFS_CONTEXT=Не вдалося ініціювати контекст NFS
+STR_FAIL_MOUNT_NFS_MSG=Не вдалося змонтувати NFS ресурс

source/actions.cpp

@@ -8,7 +8,7 @@
 #include "clients/gdrive.h"
 #include "clients/ftpclient.h"
 #include "clients/smbclient.h"
-#include "clients/webdavclient.h"
+#include "clients/webdav.h"
 #include "clients/apache.h"
 #include "clients/nginx.h"
 #include "clients/npxserve.h"
@@ -25,8 +25,6 @@
 #include "lang.h"
 #include "actions.h"
 #include "installer.h"
-#include "web/request.hpp"
-#include "web/urn.hpp"
 #include "system.h"
 #include "sfo.h"
 #include "zip_util.h"
@@ -366,6 +364,7 @@ namespace Actions
 
         if (confirm_state == CONFIRM_YES)
         {
+            sceRtcGetCurrentTick(&prev_tick);
             return remoteclient->Put(src, dest);
         }
 
@@ -411,6 +410,7 @@ namespace Actions
                     snprintf(activity_message, 1024, "%s %s", lang_strings[STR_UPLOADING], entries[i].path);
                     bytes_to_download = entries[i].file_size;
                     bytes_transfered = 0;
+                    sceRtcGetCurrentTick(&prev_tick);
                     ret = UploadFile(entries[i].path, new_path);
                     if (ret <= 0)
                     {
@@ -465,6 +465,7 @@ namespace Actions
         }
         activity_inprogess = false;
         file_transfering = false;
+        multi_selected_local_files.clear();
         Windows::SetModalMode(false);
         selected_action = ACTION_REFRESH_REMOTE_FILES;
         return NULL;
@@ -487,6 +488,7 @@ namespace Actions
     int DownloadFile(const char *src, const char *dest)
     {
         bytes_transfered = 0;
+        sceRtcGetCurrentTick(&prev_tick);
         if (!remoteclient->Size(src, &bytes_to_download))
         {
             remoteclient->Quit();
@@ -518,6 +520,7 @@ namespace Actions
 
         if (confirm_state == CONFIRM_YES)
         {
+            sceRtcGetCurrentTick(&prev_tick);
             return remoteclient->Get(dest, src);
         }
 
@@ -709,19 +712,76 @@ namespace Actions
                             }
                             else
                             {
-                                std::string url = INSTALLER::getRemoteUrl(it->path, true);
-                                std::string title = INSTALLER::GetRemotePkgTitle(remoteclient, it->path, &header);
+                                if (remote_settings->enable_disk_cache)
+                                {
+                                    SplitPkgInstallData *install_data = (SplitPkgInstallData*) malloc(sizeof(SplitPkgInstallData));
+                                    memset(install_data, 0, sizeof(SplitPkgInstallData));
 
-                                if (INSTALLER::InstallRemotePkg(url, &header, title, true) == 0)
-                                    failed++;
+                                    OrbisTick tick;
+                                    sceRtcGetCurrentTick(&tick);
+                                    std::string install_pkg_path = std::string(temp_folder) + "/" + std::to_string(tick.mytick) + ".pkg";
+                                    SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE/2);
+
+                                    install_data->split_file = sp;
+                                    install_data->remote_client = remoteclient;
+                                    install_data->path = it->path;
+                                    remoteclient->Size(it->path, &install_data->size);
+                                    install_data->stop_write_thread = false;
+                                    install_data->delete_client = false;
+
+                                    int ret = pthread_create(&install_data->thread, NULL, DownloadSplitPkg, install_data);
+
+                                    if (INSTALLER::InstallSplitPkg(it->path, install_data, false) == 0)
+                                        failed++;
+                                    else
+                                        success++;
+                                }
                                 else
-                                    success++;
+                                {
+                                    std::string url = INSTALLER::getRemoteUrl(it->path, true);
+                                    std::string title = INSTALLER::GetRemotePkgTitle(remoteclient, it->path, &header);
+                                    if (INSTALLER::InstallRemotePkg(url, &header, title, true) == 0)
+                                        failed++;
+                                    else
+                                        success++;
+                                }
                             }
                         }
                         else
                             skipped++;
                     }
                 }
+                else if (Util::EndsWith(path,".zip") || Util::EndsWith(path,".rar") || Util::EndsWith(path,".7z") ||
+                        Util::EndsWith(path,".tar.xz") || Util::EndsWith(path,".tar.gz"))
+                {
+                    ArchiveEntry *entry = ZipUtil::GetPackageEntry(it->path, remoteclient);
+                    if (entry != nullptr)
+                    {
+                        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;
+
+                            int res = pthread_create(&install_data->thread, NULL, ExtractArchivePkg, install_data);
+
+                            INSTALLER::InstallArchivePkg(entry->filename, install_data);
+
+                            ArchiveEntry *previos = entry;
+                            entry = ZipUtil::GetNextPackageEntry(entry);
+                            free(previos);
+                        }
+                        success++;
+                    }
+                    else
+                        skipped++;
+                }
                 else
                     skipped++;
             }
@@ -746,11 +806,59 @@ namespace Actions
         if (res != 0)
         {
             activity_inprogess = false;
+            file_transfering = false;
             multi_selected_remote_files.clear();
             Windows::SetModalMode(false);
         }
     }
 
+    void *ExtractArchivePkg(void *argp)
+    {
+        ssize_t len;
+        char *buffer = (char*) malloc(ARCHIVE_TRANSFER_SIZE);
+
+        ArchivePkgInstallData *install_data = (ArchivePkgInstallData*) argp;
+        SplitFile *sp = install_data->split_file;
+
+        /* loop over file contents and write to fd */
+        sp->Open();
+        while (!install_data->stop_write_thread)
+        {
+            len = archive_read_data(install_data->archive_entry->archive, buffer, ARCHIVE_TRANSFER_SIZE);
+
+            if (len == 0)
+                break;
+
+            if (len < 0)
+            {
+                sprintf(status_message, "error archive_read_data('%s')", install_data->archive_entry->filename.c_str());
+                break;
+            }
+
+            if (sp->Write(buffer, len) != len)
+            {
+                sprintf(status_message, "error write('%s')", install_data->archive_entry->filename.c_str());
+                break;;
+            }
+        }
+
+        sp->Close();
+        free(buffer);
+        return NULL;
+    }
+
+    void *DownloadSplitPkg(void *argp)
+    {
+        SplitPkgInstallData *install_data = (SplitPkgInstallData*) argp;
+        SplitFile *sp = install_data->split_file;
+
+        /* loop over file contents and write to fd */
+        sp->Open();
+        install_data->remote_client->Get(sp, install_data->path);
+        sp->Close();
+        return NULL;
+    }
+
     void *InstallLocalPkgsThread(void *argp)
     {
         int failed = 0;
@@ -774,7 +882,7 @@ namespace Actions
             {
                 std::string path = std::string(it->path);
                 path = Util::ToLower(path);
-                if (path.size() > 4 && path.substr(path.size() - 4) == ".pkg")
+                if (Util::EndsWith(path,".pkg"))
                 {
                     pkg_header header;
                     memset(&header, 0, sizeof(header));
@@ -805,6 +913,37 @@ namespace Actions
                             skipped++;
                     }
                 }
+                else if (Util::EndsWith(path,".zip") || Util::EndsWith(path,".rar") || Util::EndsWith(path,".7z") ||
+                         Util::EndsWith(path,".tar.xz") || Util::EndsWith(path,".tar.gz") || Util::EndsWith(path,".tar.bz2") )
+                {
+                    ArchiveEntry *entry = ZipUtil::GetPackageEntry(it->path);
+                    if (entry != nullptr)
+                    {
+                        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;
+
+                            int res = pthread_create(&install_data->thread, NULL, ExtractArchivePkg, install_data);
+
+                            INSTALLER::InstallArchivePkg(entry->filename, install_data);
+
+                            ArchiveEntry *previous = entry;
+                            entry = ZipUtil::GetNextPackageEntry(entry);
+                            free(previous);
+                        }
+                        success++;
+                    }
+                    else
+                        skipped++;
+                }
                 else
                     skipped++;
             }
@@ -876,6 +1015,49 @@ namespace Actions
         }
     }
 
+    void *ExtractRemoteZipThread(void *argp)
+    {
+        FS::MkDirs(extract_zip_folder);
+        std::vector<DirEntry> files;
+        if (multi_selected_remote_files.size() > 0)
+            std::copy(multi_selected_remote_files.begin(), multi_selected_remote_files.end(), std::back_inserter(files));
+        else
+            files.push_back(selected_remote_file);
+
+        for (std::vector<DirEntry>::iterator it = files.begin(); it != files.end(); ++it)
+        {
+            if (stop_activity)
+                break;
+            if (!it->isDir)
+            {
+                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);
+                    sceKernelUsleep(100000);
+                }
+            }
+        }
+        activity_inprogess = false;
+        multi_selected_remote_files.clear();
+        Windows::SetModalMode(false);
+        selected_action = ACTION_REFRESH_LOCAL_FILES;
+        return NULL;
+    }
+
+    void ExtractRemoteZips()
+    {
+        sprintf(status_message, "%s", "");
+        int res = pthread_create(&bk_activity_thid, NULL, ExtractRemoteZipThread, NULL);
+        if (res != 0)
+        {
+            file_transfering = false;
+            activity_inprogess = false;
+            multi_selected_remote_files.clear();
+            Windows::SetModalMode(false);
+        }
+    }
+
     void *MakeZipThread(void *argp)
     {
         zipFile zf = zipOpen64(zip_file_path, APPEND_STATUS_CREATE);
@@ -927,6 +1109,7 @@ namespace Actions
     void *InstallUrlPkgThread(void *argp)
     {
         bytes_transfered = 0;
+        sceRtcGetCurrentTick(&prev_tick);
         sprintf(status_message, "%s", "");
         pkg_header header;
         char filename[2000];
@@ -960,14 +1143,14 @@ namespace Actions
         std::string host = full_url.substr(0, path_pos);
         std::string path = full_url.substr(path_pos);
 
-        WebDAV::WebDavClient tmp_client;
-        tmp_client.Connect(host.c_str(), install_pkg_url.username, install_pkg_url.password, false);
+        WebDAVClient tmp_client;
+        tmp_client.Connect(host.c_str(), install_pkg_url.username, install_pkg_url.password);
 
         sprintf(activity_message, "%s URL to %s", lang_strings[STR_DOWNLOADING], filename);
         int s = sizeof(pkg_header);
         memset(&header, 0, s);
-        WebDAV::dict_t response_headers{};
-        int ret = tmp_client.GetHeaders(path.c_str(), &response_headers);
+
+        int ret = tmp_client.Size(path, &bytes_to_download);
         if (!ret)
         {
             sprintf(status_message, "%s - %s", lang_strings[STR_FAILED], lang_strings[STR_CANNOT_READ_PKG_HDR_MSG]);
@@ -977,13 +1160,8 @@ namespace Actions
             return NULL;
         }
 
-        auto content_length = WebDAV::get(response_headers, "content-length");
-        if (content_length.length() > 0)
-            bytes_to_download = std::stol(content_length);
-        else
-            bytes_to_download = 1;
         file_transfering = 1;
-        int is_performed = tmp_client.Get(filename, path.c_str());
+        int is_performed = tmp_client.Get(path, filename);
 
         if (is_performed == 0)
         {
@@ -1071,7 +1249,7 @@ namespace Actions
         }
         else if (strncmp(remote_settings->server, "webdavs://", 10) == 0 || strncmp(remote_settings->server, "webdav://", 9) == 0)
         {
-            remoteclient = new WebDAV::WebDavClient();
+            remoteclient = new WebDAVClient();
         }
         else if (strncmp(remote_settings->server, "smb://", 6) == 0)
         {
@@ -1202,6 +1380,7 @@ namespace Actions
 
         if (confirm_state == CONFIRM_YES)
         {
+            sceRtcGetCurrentTick(&prev_tick);
             if (isCopy)
                 return FS::Copy(src, dest);
             else
@@ -1249,6 +1428,7 @@ namespace Actions
                     snprintf(activity_message, 1024, "%s %s", isCopy ? lang_strings[STR_COPYING] : lang_strings[STR_MOVING], entries[i].path);
                     bytes_to_download = entries[i].file_size;
                     bytes_transfered = 0;
+                    sceRtcGetCurrentTick(&prev_tick);
                     ret = CopyOrMoveLocalFile(entries[i].path, new_path, isCopy);
                     if (ret <= 0)
                     {
@@ -1403,6 +1583,7 @@ namespace Actions
 
         if (confirm_state == CONFIRM_YES)
         {
+            sceRtcGetCurrentTick(&prev_tick);
             if (isCopy)
                 return remoteclient->Copy(src, dest);
             else
@@ -1498,6 +1679,7 @@ namespace Actions
                     snprintf(activity_message, 1024, "%s %s", lang_strings[STR_COPYING], entries[i].path);
                     bytes_to_download = entries[i].file_size;
                     bytes_transfered = 0;
+                    sceRtcGetCurrentTick(&prev_tick);
                     ret = CopyOrMoveRemoteFile(entries[i].path, new_path, true);
                     if (ret <= 0)
                     {
@@ -1586,11 +1768,12 @@ namespace Actions
         OrbisTick tick;
         sceRtcGetCurrentClockLocalTime(&now);
         sceRtcGetTick(&now, &tick);
-        sprintf(local_file, "%s/%lu.pkg", DATA_PATH, tick.mytick);
+        sprintf(local_file, "%s/%lu.pkg", temp_folder, tick.mytick);
 
         sprintf(activity_message, "%s %s to %s", lang_strings[STR_DOWNLOADING], filename.c_str(), local_file);
         remoteclient->Size(filename, &bytes_to_download);
         bytes_transfered = 0;
+        sceRtcGetCurrentTick(&prev_tick);
         file_transfering = true;
         int ret = remoteclient->Get(local_file, filename);
         if (ret == 0)

source/actions.h

@@ -1,5 +1,5 @@
-#ifndef ACTIONS_H
-#define ACTIONS_H
+#ifndef EZ_ACTIONS_H
+#define EZ_ACTIONS_H
 
 #include <pthread.h>
 #include "installer.h"
@@ -56,7 +56,8 @@ enum ACTIONS
     ACTION_VIEW_LOCAL_IMAGE,
     ACTION_VIEW_REMOTE_IMAGE,
     ACTION_VIEW_LOCAL_PKG,
-    ACTION_VIEW_REMOTE_PKG
+    ACTION_VIEW_REMOTE_PKG,
+    ACTION_EXTRACT_REMOTE_ZIP,
 };
 
 enum OverWriteType
@@ -103,6 +104,8 @@ namespace Actions
     void *KeepAliveThread(void *argp);
     void *ExtractZipThread(void *argp);
     void ExtractLocalZips();
+    void *ExtractRemoteZipThread(void *argp);
+    void ExtractRemoteZips();
     void *MakeZipThread(void *argp);
     void MakeLocalZip();
     void *MoveLocalFilesThread(void *argp);
@@ -116,6 +119,8 @@ namespace Actions
     int DownloadAndInstallPkg(const std::string &filename, pkg_header *header);
     void CreateLocalFile(char *filename);
     void CreateRemoteFile(char *filename);
+    void *ExtractArchivePkg(void *argp);
+    void *DownloadSplitPkg(void *argp);
 }
 
 #endif

source/base64.h

@@ -1,5 +1,5 @@
-#ifndef BASE64_H_
-#define BASE64_H_
+#ifndef EZ_BASE64_H_
+#define EZ_BASE64_H_
 
 #include <string>
 

source/clients/apache.h

@@ -1,5 +1,5 @@
-#ifndef APACHE_H
-#define APACHE_H
+#ifndef EZ_APACHE_H
+#define EZ_APACHE_H
 
 #include <string>
 #include <vector>

source/clients/baseclient.cpp

@@ -8,6 +8,7 @@
 #include "windows.h"
 
 using httplib::Client;
+using httplib::DataSink;
 using httplib::Headers;
 using httplib::Result;
 
@@ -20,6 +21,29 @@ BaseClient::~BaseClient()
 };
 
 int BaseClient::Connect(const std::string &url, const std::string &username, const std::string &password)
+{
+    this->host_url = url;
+    size_t scheme_pos = url.find("://");
+    size_t root_pos = url.find("/", scheme_pos + 3);
+    if (root_pos != std::string::npos)
+    {
+        this->host_url = url.substr(0, root_pos);
+        this->base_path = url.substr(root_pos);
+    }
+    client = new httplib::Client(this->host_url);
+    if (username.length() > 0)
+        client->set_basic_auth(username, password);
+    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::Connect(const std::string &url, const std::string &api_key)
 {
     std::string scheme_host_port = url;
     size_t scheme_pos = url.find("://");
@@ -29,9 +53,10 @@ int BaseClient::Connect(const std::string &url, const std::string &username, con
         scheme_host_port = url.substr(0, root_pos);
         this->base_path = url.substr(root_pos);
     }
+
     client = new httplib::Client(scheme_host_port);
-    if (username.length() > 0)
-        client->set_basic_auth(username, password);
+    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);
@@ -58,10 +83,13 @@ int BaseClient::Size(const std::string &path, int64_t *size)
 {
     if (auto res = client->Head(GetFullPath(path)))
     {
-        std::string content_length = res->get_header_value("Content-Length");
-        if (content_length.length() > 0)
-            *size = atoll(content_length.c_str());
-        return 1;
+        if (HTTP_SUCCESS(res->status))
+        {
+            std::string content_length = res->get_header_value("Content-Length");
+            if (content_length.length() > 0)
+                *size = atoll(content_length.c_str());
+            return 1;
+        }
     }
     else
     {
@@ -74,6 +102,8 @@ int BaseClient::Get(const std::string &outputfile, const std::string &path, uint
 {
     std::ofstream file_stream(outputfile, std::ios::binary);
     bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
+
     if (auto res = client->Get(GetFullPath(path),
                                [&](const char *data, size_t data_length)
                                {
@@ -92,10 +122,33 @@ int BaseClient::Get(const std::string &outputfile, const std::string &path, uint
     return 0;
 }
 
+int BaseClient::Get(SplitFile *split_file, const std::string &path, uint64_t offset)
+{
+    if (auto res = client->Get(GetFullPath(path),
+                               [&](const char *data, size_t data_length)
+                               {
+                                   if (!split_file->IsClosed())
+                                   {
+                                        split_file->Write((char*)data, data_length);
+                                        return true;
+                                   }
+                                   else
+                                        return false;
+                               }))
+    {
+        return 1;
+    }
+    else
+    {
+        sprintf(this->response, "%s", httplib::to_string(res.error()).c_str());
+    }
+    return 0;
+}
+
 int BaseClient::GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset)
 {
     char range_header[64];
-    sprintf(range_header, "bytes=%lu-%lu", offset, offset+size-1);
+    sprintf(range_header, "bytes=%lu-%lu", offset, offset + size - 1);
     Headers headers = {{"Range", range_header}};
     size_t bytes_read = 0;
     if (auto res = client->Get(GetFullPath(path), headers,
@@ -118,7 +171,7 @@ int BaseClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
 int BaseClient::GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset)
 {
     char range_header[64];
-    sprintf(range_header, "bytes=%lu-%lu", offset, offset+size-1);
+    sprintf(range_header, "bytes=%lu-%lu", offset, offset + size - 1);
     Headers headers = {{"Range", range_header}};
     size_t bytes_read = 0;
     std::vector<char> body;
@@ -280,10 +333,10 @@ 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)
+std::string BaseClient::Escape(const std::string &url)
 {
     CURL *curl = curl_easy_init();
     if (curl)
@@ -300,7 +353,7 @@ std::string BaseClient::EncodeUrl(const std::string &url)
     return "";
 }
 
-std::string BaseClient::DecodeUrl(const std::string &url)
+std::string BaseClient::UnEscape(const std::string &url)
 {
     CURL *curl = curl_easy_init();
     if (curl)
@@ -317,3 +370,26 @@ std::string BaseClient::DecodeUrl(const std::string &url)
     }
     return "";
 }
+
+void *BaseClient::Open(const std::string &path, int flags)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+    return nullptr;
+}
+
+void BaseClient::Close(void *fp)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+}
+
+int BaseClient::GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+    return -1;
+}
+
+int BaseClient::GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+    return -1;
+}

source/clients/baseclient.h

@@ -1,5 +1,5 @@
-#ifndef BASESERVER_H
-#define BASESERVER_H
+#ifndef EZ_BASESERVER_H
+#define EZ_BASESERVER_H
 
 #include <string>
 #include <vector>
@@ -8,6 +8,7 @@
 #include "http/httplib.h"
 #include "clients/remote_client.h"
 #include "http/httplib.h"
+#include "split_file.h"
 #include "common.h"
 
 class BaseClient : public RemoteClient
@@ -16,12 +17,16 @@ 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);
     int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0);
+    int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0);
     int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
     int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
+    int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset);
+    int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset);
     int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0);
     int Rename(const std::string &src, const std::string &dst);
     int Delete(const std::string &path);
@@ -32,18 +37,21 @@ public:
     std::vector<DirEntry> ListDir(const std::string &path);
     std::string GetPath(std::string path1, std::string path2);
     std::string GetFullPath(std::string path1);
+    void *Open(const std::string &path, int flags);
+    void Close(void *fp);
     bool IsConnected();
     bool Ping();
     const char *LastResponse();
     int Quit();
     ClientType clientType();
     uint32_t SupportedActions();
-    static std::string EncodeUrl(const std::string &url);
-    static std::string DecodeUrl(const std::string &url);
+    static std::string Escape(const std::string &url);
+    static std::string UnEscape(const std::string &url);
 
 protected:
     httplib::Client *client;
     std::string base_path;
+    std::string host_url;
     char response[512];
     bool connected = false;
 };

source/clients/ftpclient.cpp

@@ -132,14 +132,31 @@ int FtpClient::Connect(const std::string &url, const std::string &user, const st
 		return 0;
 	}
 
-	std::string cmd = "USER " + user;
+	std::string cmd;
+	if (user.length() > 0)
+	{
+		cmd = "USER " + user;
+	}
+	else
+	{
+		cmd = "USER anonymous";
+	}
+
 	if (!FtpSendCmd(cmd, '3', mp_ftphandle))
 	{
 		if (mp_ftphandle->ctrl != NULL)
 			return 1;
 		if (*LastResponse() == '2')
+		{
+			mp_ftphandle->is_connected = true;
 			return 1;
-		return 0;
+		}
+		else
+		{
+			Quit();
+			sprintf(mp_ftphandle->response, "%s", lang_strings[STR_FAIL_LOGIN_MSG]);
+			return 0;
+		}
 	}
 
 	cmd = "PASS " + pass;
@@ -863,6 +880,32 @@ int FtpClient::FtpXfer(const std::string &localfile, const std::string &path, ft
 	return FtpClose(nData);
 }
 
+/*
+ * FtpXfer - issue a command and transfer data
+ *
+ * return 1 if successful, 0 otherwise
+ */
+int FtpClient::FtpXfer(SplitFile *split_file, const std::string &path, ftphandle *nControl, accesstype type, transfermode mode)
+{
+	int l, c;
+	char *dbuf;
+	ftphandle *nData;
+
+	if (!FtpAccess(path, type, mode, nControl, &nData))
+	{
+		return 0;
+	}
+
+	dbuf = static_cast<char *>(malloc(FTP_CLIENT_BUFSIZ));
+	while ((l = FtpRead(dbuf, FTP_CLIENT_BUFSIZ, nData)) > 0)
+	{
+		split_file->Write(dbuf, l);
+	}
+
+	free(dbuf);
+	return FtpClose(nData);
+}
+
 /*
  * FtpWrite - write to a data connection
  */
@@ -1266,6 +1309,15 @@ int FtpClient::Get(const std::string &outputfile, const std::string &path, uint6
 		return FtpXfer(outputfile, path, mp_ftphandle, FtpClient::filereadappend, FtpClient::transfermode::image);
 }
 
+int FtpClient::Get(SplitFile *split_file, const std::string &path, uint64_t offset)
+{
+	mp_ftphandle->offset = offset;
+	if (offset == 0)
+		return FtpXfer(split_file, path, mp_ftphandle, FtpClient::fileread, FtpClient::transfermode::image);
+	else
+		return FtpXfer(split_file, path, mp_ftphandle, FtpClient::filereadappend, FtpClient::transfermode::image);
+}
+
 int FtpClient::GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset)
 {
 	ftphandle *nData;
@@ -1276,29 +1328,29 @@ int FtpClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
 	}
 
 	char buf[FTP_CLIENT_BUFSIZ];
-    int count = 0;
-    size_t bytes_remaining = size;
+	int count = 0;
+	size_t bytes_remaining = size;
 
-    do
-    {
-        size_t bytes_to_read = std::min<size_t>(FTP_CLIENT_BUFSIZ, bytes_remaining);
-        count = FtpRead(buf, bytes_to_read, nData);
-        if (count > 0)
-        {
-            bytes_remaining -= count;
-            bool ok = sink.write((char*)buf, count);
+	do
+	{
+		size_t bytes_to_read = std::min<size_t>(FTP_CLIENT_BUFSIZ, bytes_remaining);
+		count = FtpRead(buf, bytes_to_read, nData);
+		if (count > 0)
+		{
+			bytes_remaining -= count;
+			bool ok = sink.write((char *)buf, count);
 			if (!ok)
 			{
 				FtpClose(nData);
 				mp_ftphandle->offset = 0;
 				return 0;
 			}
-        }
-        else
-        {
-            break;
-        }
-    } while (1);
+		}
+		else
+		{
+			break;
+		}
+	} while (1);
 	FtpClose(nData);
 	mp_ftphandle->offset = 0;
 
@@ -1317,7 +1369,7 @@ int FtpClient::GetRange(const std::string &path, void *buffer, uint64_t size, ui
 	char buf[8192];
 	int l = 0;
 	uint64_t remaining = size;
-	char *p = (char*) buffer;
+	char *p = (char *)buffer;
 	while ((l = FtpRead(buf, 8192, nData)) > 0)
 	{
 		if (l <= remaining)
@@ -1336,7 +1388,6 @@ int FtpClient::GetRange(const std::string &path, void *buffer, uint64_t size, ui
 	mp_ftphandle->offset = 0;
 
 	return 1;
-
 }
 
 /*
@@ -1728,7 +1779,7 @@ ClientType FtpClient::clientType()
 
 uint32_t FtpClient::SupportedActions()
 {
-	return REMOTE_ACTION_ALL ^ REMOTE_ACTION_CUT ^ REMOTE_ACTION_COPY ^ REMOTE_ACTION_PASTE;
+	return REMOTE_ACTION_ALL ^ REMOTE_ACTION_CUT ^ REMOTE_ACTION_COPY ^ REMOTE_ACTION_PASTE ^ REMOTE_ACTION_RAW_READ;
 }
 
 std::string FtpClient::GetPath(std::string ppath1, std::string ppath2)
@@ -1767,4 +1818,23 @@ int FtpClient::Head(const std::string &path, void *buffer, uint64_t len)
 	if (l != len)
 		return 0;
 	return 1;
-}
+}
+
+void *FtpClient::Open(const std::string &path, int flags)
+{
+	return nullptr;
+}
+
+void FtpClient::Close(void *fp)
+{
+}
+
+int FtpClient::GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset)
+{
+	return -1;
+}
+
+int FtpClient::GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset)
+{
+	return -1;
+}

source/clients/ftpclient.h

@@ -1,5 +1,5 @@
-#ifndef FTPCLIENT_H
-#define FTPCLIENT_H
+#ifndef EZ_FTPCLIENT_H
+#define EZ_FTPCLIENT_H
 
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -9,7 +9,7 @@
 #include "clients/remote_client.h"
 #include "http/httplib.h"
 
-#define FTP_CLIENT_MAX_FILENAME_LEN 128
+#define FTP_CLIENT_MAX_FILENAME_LEN 255
 
 typedef int (*FtpCallbackXfer)(int64_t xfered, void *arg);
 
@@ -79,14 +79,19 @@ public:
 	int Rmdir(const std::string &path, bool recursive);
 	int Size(const std::string &path, int64_t *size);
 	int Get(const std::string &outputfile, const std::string &path, uint64_t offset = 0);
+	int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0);
 	int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
 	int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
+	int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset);
+	int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset);
 	int Put(const std::string &inputfile, const std::string &path, uint64_t offset = 0);
 	int Rename(const std::string &src, const std::string &dst);
 	int Delete(const std::string &path);
     int Copy(const std::string &from, const std::string &to);
     int Move(const std::string &from, const std::string &to);
 	int Head(const std::string &path, void *buffer, uint64_t len);
+    void *Open(const std::string &path, int flags);
+    void Close(void *fp);
 	std::vector<DirEntry> ListDir(const std::string &path);
 	void SetCallbackXferFunction(FtpCallbackXfer pointer);
 	void SetCallbackArg(void *arg);
@@ -124,6 +129,7 @@ private:
 	int CorrectPasvResponse(int *v);
 	int FtpAccess(const std::string &path, accesstype type, transfermode mode, ftphandle *nControl, ftphandle **nData);
 	int FtpXfer(const std::string &localfile, const std::string &path, ftphandle *nControl, accesstype type, transfermode mode);
+	int FtpXfer(SplitFile *split_file, const std::string &path, ftphandle *nControl, accesstype type, transfermode mode);
 	int FtpWrite(void *buf, int len, ftphandle *nData);
 	int FtpRead(void *buf, int max, ftphandle *nData);
 	int FtpClose(ftphandle *nData);

source/clients/gdrive.cpp

@@ -111,7 +111,7 @@ int GDriveClient::RequestAuthorization()
 
     std::string auth_url = std::string(GOOGLE_AUTH_URL "?client_id=") + gg_app.client_id + "&redirect_uri=" + GetRedirectUrl() +
                            "&response_type=code&access_type=offline&scope=" + GetScopes() + "&include_granted_scopes=true";
-    auth_url = EncodeUrl(auth_url);
+    auth_url = Escape(auth_url);
     std::string launch_uri = std::string("pswebbrowser:search?url=") + auth_url;
     int ret = sceShellUIUtilLaunchByUri(launch_uri.c_str(), &param);
 
@@ -222,11 +222,11 @@ int GDriveClient::Rename(const std::string &src, const std::string &dst)
     if (src_id.compare("root") == 0 || dst_id.compare("root") == 0 || src_id.compare(src_drive_id) == 0 || dst_id.compare(dst_drive_id) == 0)
         return 0;
 
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(src_id);
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(src_id);
     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);
@@ -276,7 +276,7 @@ int GDriveClient::Head(const std::string &path, void *buffer, uint64_t len)
     std::string id = GetValue(path_id_map, path);
     std::string drive_id = GetDriveId(path);
 
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(id) + "?alt=media";
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id) + "?alt=media";
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
     Headers headers;
@@ -307,10 +307,11 @@ int GDriveClient::Get(const std::string &outputfile, const std::string &path, ui
 {
     std::ofstream file_stream(outputfile, std::ios::binary);
     bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
 
     std::string id = GetValue(path_id_map, path);
     std::string drive_id = GetDriveId(path);
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(id) + "?alt=media";
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id) + "?alt=media";
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
     if (auto res = client->Get(url,
@@ -331,13 +332,41 @@ int GDriveClient::Get(const std::string &outputfile, const std::string &path, ui
     return 0;
 }
 
+int GDriveClient::Get(SplitFile *split_file, const std::string &path, uint64_t offset)
+{
+    std::string id = GetValue(path_id_map, path);
+    std::string drive_id = GetDriveId(path);
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id) + "?alt=media";
+    if (!drive_id.empty())
+        url += "&supportsAllDrives=true";
+    if (auto res = client->Get(url,
+                               [&](const char *data, size_t data_length)
+                               {
+                                   if (!split_file->IsClosed())
+                                   {
+                                        split_file->Write((char*)data, data_length);
+                                        return true;
+                                   }
+                                   else
+                                        return false;
+                               }))
+    {
+        return 1;
+    }
+    else
+    {
+        sprintf(this->response, "%s", httplib::to_string(res.error()).c_str());
+    }
+    return 0;
+}
+
 int GDriveClient::GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset)
 {
     size_t bytes_read = 0;
     std::string id = GetValue(path_id_map, path);
     std::string drive_id = GetDriveId(path);
 
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(id) + "?alt=media";
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id) + "?alt=media";
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
     Headers headers;
@@ -367,7 +396,7 @@ int GDriveClient::GetRange(const std::string &path, void *buffer, uint64_t size,
     std::string id = GetValue(path_id_map, path);
     std::string drive_id = GetDriveId(path);
 
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(id) + "?alt=media";
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id) + "?alt=media";
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
     Headers headers;
@@ -399,14 +428,14 @@ int GDriveClient::Update(const std::string &inputfile, const std::string &path)
 {
     bytes_to_download = FS::GetSize(inputfile);
     bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
 
     std::ifstream file_stream(inputfile, std::ios::binary);
-    bytes_transfered = 0;
 
     std::string id = GetValue(path_id_map, path);
     std::string drive_id = GetDriveId(path);
 
-    std::string url = "/upload/drive/v3/files/" + BaseClient::EncodeUrl(id) + "?uploadType=resumable";
+    std::string url = "/upload/drive/v3/files/" + BaseClient::Escape(id) + "?uploadType=resumable";
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
     Headers headers;
@@ -473,9 +502,9 @@ int GDriveClient::Put(const std::string &inputfile, const std::string &path, uin
 
     bytes_to_download = FS::GetSize(inputfile);
     bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
 
     std::ifstream file_stream(inputfile, std::ios::binary);
-    bytes_transfered = 0;
 
     size_t path_pos = path.find_last_of("/");
     std::string parent_dir;
@@ -492,9 +521,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)));
@@ -553,7 +582,7 @@ int GDriveClient::Size(const std::string &path, int64_t *size)
 {
     std::string id = GetValue(path_id_map, path);
     std::string drive_id = GetDriveId(path);
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(id) + "?fields=size";
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id) + "?fields=size";
     if (!drive_id.empty())
         url += "&supportsAllDrives=true";
     if (auto res = client->Get(url))
@@ -605,10 +634,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"))
     {
@@ -669,7 +698,7 @@ int GDriveClient::Delete(const std::string &path)
     if (strcmp(id.c_str(), "root") == 0)
         return 0;
 
-    std::string url = std::string("/drive/v3/files/") + BaseClient::EncodeUrl(id);
+    std::string url = std::string("/drive/v3/files/") + BaseClient::Escape(id);
     if (!drive_id.empty())
         url += "?supportsAllDrives=true";
     if (auto res = client->Delete(url))
@@ -779,8 +808,8 @@ std::vector<DirEntry> GDriveClient::ListDir(const std::string &path)
     }
 
     std::string drive_id = GetDriveId(path);
-    std::string base_url = std::string("/drive/v3/files?q=") + BaseClient::EncodeUrl("\"" + id + "\" in parents") +
-                           "&pageSize=1000&fields=" + BaseClient::EncodeUrl("files(id,mimeType,name,modifiedTime,size),nextPageToken");
+    std::string base_url = std::string("/drive/v3/files?q=") + BaseClient::Escape("\"" + id + "\" in parents") +
+                           "&pageSize=1000&fields=" + BaseClient::Escape("files(id,mimeType,name,modifiedTime,size),nextPageToken");
     if (!drive_id.empty())
     {
         base_url += "&driveId=" + drive_id + "&corpora=drive&includeItemsFromAllDrives=true&supportsAllDrives=true";
@@ -789,7 +818,7 @@ std::vector<DirEntry> GDriveClient::ListDir(const std::string &path)
     bool find_no_parent = false;
     if (id.compare(shared_with_me) == 0)
     {
-        base_url = std::string("/drive/v3/files?q=sharedWithMe&pageSize=1000&fields=") + BaseClient::EncodeUrl("files(id,mimeType,name,modifiedTime,size),nextPageToken");
+        base_url = std::string("/drive/v3/files?q=sharedWithMe&pageSize=1000&fields=") + BaseClient::Escape("files(id,mimeType,name,modifiedTime,size),nextPageToken");
     }
 
     std::string next_page_url = base_url;
@@ -867,7 +896,7 @@ std::vector<DirEntry> GDriveClient::ListDir(const std::string &path)
                     }
                 }
                 if (next_page_token != nullptr)
-                    next_page_url = base_url + "&pageToken=" + BaseClient::EncodeUrl(json_object_get_string(next_page_token));
+                    next_page_url = base_url + "&pageToken=" + BaseClient::Escape(json_object_get_string(next_page_token));
                 else
                     break;
             }
@@ -887,7 +916,7 @@ ClientType GDriveClient::clientType()
 
 uint32_t GDriveClient::SupportedActions()
 {
-    return REMOTE_ACTION_ALL ^ REMOTE_ACTION_CUT ^ REMOTE_ACTION_COPY ^ REMOTE_ACTION_PASTE;
+    return REMOTE_ACTION_ALL ^ REMOTE_ACTION_CUT ^ REMOTE_ACTION_COPY ^ REMOTE_ACTION_PASTE ^ REMOTE_ACTION_RAW_READ;
 }
 
 void *GDriveClient::RefreshTokenThread(void *argp)
@@ -941,4 +970,27 @@ void GDriveClient::SetAccessToken(const std::string &token)
 {
     if (this->client != nullptr)
         this->client->set_bearer_token_auth(token);
-}
+}
+
+void *GDriveClient::Open(const std::string &path, int flags)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+    return nullptr;
+}
+
+void GDriveClient::Close(void *fp)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+}
+
+int GDriveClient::GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+    return -1;
+}
+
+int GDriveClient::GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset)
+{
+    sprintf(this->response, "%s", lang_strings[STR_UNSUPPORTED_OPERATION_MSG]);
+    return -1;
+}

source/clients/gdrive.h

@@ -1,5 +1,5 @@
-#ifndef GDRIVE_H
-#define GDRIVE_H
+#ifndef EZ_GDRIVE_H
+#define EZ_GDRIVE_H
 
 #include <string>
 #include <vector>
@@ -20,8 +20,11 @@ public:
     int Connect(const std::string &url, const std::string &user, const std::string &pass);
     int Rename(const std::string &src, const std::string &dst);
     int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0);
+    int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0);
     int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
     int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
+    int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset);
+    int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset);
     int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0);
     int Head(const std::string &path, void *buffer, uint64_t len);
     int Update(const std::string &inputfile, const std::string &path);
@@ -32,6 +35,8 @@ public:
     bool FileExists(const std::string &path);
     void SetAccessToken(const std::string &token);
     std::vector<DirEntry> ListDir(const std::string &path);
+    void *Open(const std::string &path, int flags);
+    void Close(void *fp);
     static void *RefreshTokenThread(void *argp);
     static void StartRefreshToken();
     static void StopRefreshToken();

source/clients/iis.h

@@ -1,5 +1,5 @@
-#ifndef IIS_H
-#define IIS_H
+#ifndef EZ_IIS_H
+#define EZ_IIS_H
 
 #include <string>
 #include <vector>

source/clients/nfsclient.cpp

@@ -17,7 +17,7 @@
 #include "util.h"
 #include "system.h"
 
-#define BUF_SIZE 256*1024
+#define BUF_SIZE 256 * 1024
 
 NfsClient::NfsClient()
 {
@@ -37,7 +37,8 @@ int NfsClient::Connect(const std::string &url, const std::string &user, const st
 	}
 
 	struct nfs_url *nfsurl = nfs_parse_url_full(nfs, url.c_str());
-	if (nfsurl == nullptr) {
+	if (nfsurl == nullptr)
+	{
 		sprintf(response, "%s", nfs_get_error(nfs));
 		nfs_destroy_context(nfs);
 		return 0;
@@ -203,7 +204,7 @@ int NfsClient::Get(const std::string &outputfile, const std::string &ppath, uint
 		return 0;
 	}
 
-	FILE* out = FS::Create(outputfile);
+	FILE *out = FS::Create(outputfile);
 	if (out == NULL)
 	{
 		sprintf(response, "%s", lang_strings[STR_FAILED]);
@@ -213,6 +214,7 @@ int NfsClient::Get(const std::string &outputfile, const std::string &ppath, uint
 	void *buff = malloc(BUF_SIZE);
 	int count = 0;
 	bytes_transfered = 0;
+	sceRtcGetCurrentTick(&prev_tick);
 	while ((count = nfs_read(nfs, nfsfh, BUF_SIZE, buff)) > 0)
 	{
 		if (count < 0)
@@ -220,7 +222,7 @@ int NfsClient::Get(const std::string &outputfile, const std::string &ppath, uint
 			sprintf(response, "%s", nfs_get_error(nfs));
 			FS::Close(out);
 			nfs_close(nfs, nfsfh);
-			free((void*)buff);
+			free((void *)buff);
 			return 0;
 		}
 		FS::Write(out, buff, count);
@@ -228,7 +230,36 @@ int NfsClient::Get(const std::string &outputfile, const std::string &ppath, uint
 	}
 	FS::Close(out);
 	nfs_close(nfs, nfsfh);
-	free((void*)buff);
+	free((void *)buff);
+
+	return 1;
+}
+
+int NfsClient::Get(SplitFile *split_file, const std::string &ppath, uint64_t offset)
+{
+	struct nfsfh *nfsfh = nullptr;
+	int ret = nfs_open(nfs, ppath.c_str(), 0400, &nfsfh);
+	if (ret != 0)
+	{
+		sprintf(response, "%s", nfs_get_error(nfs));
+		return 0;
+	}
+
+	void *buff = malloc(BUF_SIZE);
+	int count = 0;
+	while ((count = nfs_read(nfs, nfsfh, BUF_SIZE, buff)) > 0)
+	{
+		if (count < 0)
+		{
+			sprintf(response, "%s", nfs_get_error(nfs));
+			nfs_close(nfs, nfsfh);
+			free((void *)buff);
+			return 0;
+		}
+		split_file->Write((char *)buff, count);
+	}
+	nfs_close(nfs, nfsfh);
+	free((void *)buff);
 
 	return 1;
 }
@@ -242,49 +273,51 @@ int NfsClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
 		return 0;
 	}
 
-	ret = nfs_lseek(nfs, nfsfh, offset, SEEK_SET, NULL);
+	ret = this->GetRange((void *)nfsfh, sink, size, offset);
+	nfs_close(nfs, nfsfh);
+
+	return ret;
+}
+
+int NfsClient::GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset)
+{
+	struct nfsfh *nfsfh = (struct nfsfh *)fp;
+
+	int ret = nfs_lseek(nfs, nfsfh, offset, SEEK_SET, NULL);
 	if (ret != 0)
 	{
 		return 0;
 	}
 
 	void *buff = malloc(BUF_SIZE);
-    int count = 0;
-    size_t bytes_remaining = size;
-    do
-    {
-        size_t bytes_to_read = std::min<size_t>(BUF_SIZE, bytes_remaining);
-        count = nfs_read(nfs, nfsfh, bytes_to_read, buff);
-        if (count > 0)
-        {
-            bytes_remaining -= count;
-            bool ok = sink.write((char*)buff, count);
+	int count = 0;
+	size_t bytes_remaining = size;
+	do
+	{
+		size_t bytes_to_read = std::min<size_t>(BUF_SIZE, bytes_remaining);
+		count = nfs_read(nfs, nfsfh, bytes_to_read, buff);
+		if (count > 0)
+		{
+			bytes_remaining -= count;
+			bool ok = sink.write((char *)buff, count);
 			if (!ok)
 			{
 				free((void *)buff);
-				nfs_close(nfs, nfsfh);
 				return 0;
 			}
-        }
-        else
-        {
-            break;
-        }
-    } while (1);
-
-    free((void *)buff);
-    nfs_close(nfs, nfsfh);
+		}
+		else
+		{
+			break;
+		}
+	} while (1);
 
+	free((void *)buff);
 	return 1;
 }
 
 int NfsClient::GetRange(const std::string &ppath, void *buffer, uint64_t size, uint64_t offset)
 {
-	if (!FileExists(ppath))
-	{
-		return 0;
-	}
-
 	struct nfsfh *nfsfh = nullptr;
 	int ret = nfs_open(nfs, ppath.c_str(), 0400, &nfsfh);
 	if (ret != 0)
@@ -293,7 +326,17 @@ int NfsClient::GetRange(const std::string &ppath, void *buffer, uint64_t size, u
 		return 0;
 	}
 
-	ret = nfs_lseek(nfs, nfsfh, offset, SEEK_SET, NULL);
+	ret = this->GetRange(nfsfh, buffer, size, offset);
+	nfs_close(nfs, nfsfh);
+
+	return ret;
+}
+
+int NfsClient::GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset)
+{
+	struct nfsfh *nfsfh = (struct nfsfh *)fp;
+
+	int ret = nfs_lseek(nfs, nfsfh, offset, SEEK_SET, NULL);
 	if (ret != 0)
 	{
 		sprintf(response, "%s", nfs_get_error(nfs));
@@ -301,7 +344,6 @@ int NfsClient::GetRange(const std::string &ppath, void *buffer, uint64_t size, u
 	}
 
 	int count = nfs_read(nfs, nfsfh, size, buffer);
-	nfs_close(nfs, nfsfh);
 	if (count != size)
 		return 0;
 
@@ -346,13 +388,13 @@ int NfsClient::Put(const std::string &inputfile, const std::string &ppath, uint6
 		return 0;
 	}
 
-	FILE* in = FS::OpenRead(inputfile);
+	FILE *in = FS::OpenRead(inputfile);
 	if (in == NULL)
 	{
 		sprintf(response, "%s", lang_strings[STR_FAILED]);
 		return 0;
 	}
-	
+
 	struct nfsfh *nfsfh = nullptr;
 	int ret;
 	if (!FileExists(ppath))
@@ -368,9 +410,10 @@ int NfsClient::Put(const std::string &inputfile, const std::string &ppath, uint6
 		return 0;
 	}
 
-	void* buff = malloc(BUF_SIZE);
+	void *buff = malloc(BUF_SIZE);
 	uint64_t count = 0;
 	bytes_transfered = 0;
+	sceRtcGetCurrentTick(&prev_tick);
 	while ((count = FS::Read(in, buff, BUF_SIZE)) > 0)
 	{
 		if (count < 0)
@@ -446,7 +489,8 @@ std::vector<DirEntry> NfsClient::ListDir(const std::string &path)
 	struct nfsdirent *nfsdirent;
 
 	int ret = nfs_opendir(nfs, path.c_str(), &nfsdir);
-	if (ret != 0) {
+	if (ret != 0)
+	{
 		sprintf(response, "%s", nfs_get_error(nfs));
 		return out;
 	}
@@ -513,7 +557,6 @@ std::vector<DirEntry> NfsClient::ListDir(const std::string &path)
 		}
 		if (strcmp(entry.name, "..") != 0 && strcmp(entry.name, ".") != 0)
 			out.push_back(entry);
-
 	}
 	nfs_closedir(nfs, nfsdir);
 
@@ -553,6 +596,19 @@ int NfsClient::Head(const std::string &ppath, void *buffer, uint64_t len)
 	return 1;
 }
 
+void *NfsClient::Open(const std::string &path, int flags)
+{
+	struct nfsfh *nfsfh = nullptr;
+	nfs_open(nfs, path.c_str(), 0400, &nfsfh);
+	;
+	return nfsfh;
+}
+
+void NfsClient::Close(void *fp)
+{
+	nfs_close(nfs, (struct nfsfh *)fp);
+}
+
 ClientType NfsClient::clientType()
 {
 	return CLIENT_TYPE_NFS;

source/clients/nfsclient.h

@@ -1,5 +1,5 @@
-#ifndef NFSCLIENT_H
-#define NFSCLIENT_H
+#ifndef EZ_NFSCLIENT_H
+#define EZ_NFSCLIENT_H
 
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -23,8 +23,11 @@ public:
 	int Rmdir(const std::string &path, bool recursive);
 	int Size(const std::string &path, int64_t *size);
 	int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0);
+	int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0);
 	int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
 	int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
+	int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset);
+	int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset);
 	int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0);
 	int Rename(const std::string &src, const std::string &dst);
 	int Delete(const std::string &path);
@@ -32,6 +35,8 @@ public:
     int Copy(const std::string &from, const std::string &to);
     int Move(const std::string &from, const std::string &to);
 	std::vector<DirEntry> ListDir(const std::string &path);
+    void *Open(const std::string &path, int flags);
+    void Close(void *fp);
 	bool IsConnected();
 	bool Ping();
 	const char *LastResponse();

source/clients/nginx.cpp

@@ -84,7 +84,7 @@ std::vector<DirEntry> NginxClient::ListDir(const std::string &path)
                     value = lxb_dom_element_get_attribute(lxb_dom_interface_element(node), (const lxb_char_t *)"href", 4, &value_len);
                     tmp = std::string((const char *)value, value_len);
                     tmp = Util::Rtrim(tmp, "/");
-                    tmp = BaseClient::DecodeUrl(tmp);
+                    tmp = BaseClient::UnEscape(tmp);
                     if (tmp.compare("..") != 0)
                     {
                         sprintf(entry.directory, "%s", path.c_str());

source/clients/nginx.h

@@ -1,5 +1,5 @@
-#ifndef NGINX_H
-#define NGINX_H
+#ifndef EZ_NGINX_H
+#define EZ_NGINX_H
 
 #include <string>
 #include <vector>

source/clients/npxserve.h

@@ -1,5 +1,5 @@
-#ifndef NPXSERVE_H
-#define NPXSERVE_H
+#ifndef EZ_NPXSERVE_H
+#define EZ_NPXSERVE_H
 
 #include <string>
 #include <vector>

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;
@@ -142,7 +141,7 @@ std::vector<DirEntry> RCloneClient::ListDir(const std::string &path)
             tmp_string = std::string((const char *)value, value_len);
             if (tmp_string[tmp_string.length()-1] == '/')
                 tmp_string = tmp_string.substr(0, tmp_string.length()-1);
-            tmp_string = BaseClient::DecodeUrl(tmp_string);
+            tmp_string = BaseClient::UnEscape(tmp_string);
             sprintf(entry.name, "%s", tmp_string.c_str());
             sprintf(entry.directory, "%s", path.c_str());
             if (path.length() > 0 && path[path.length() - 1] == '/')
@@ -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/clients/rclone.h

@@ -1,5 +1,5 @@
-#ifndef RCLONE_H
-#define RCLONE_H
+#ifndef EZ_RCLONE_H
+#define EZ_RCLONE_H
 
 #include <string>
 #include <vector>

source/clients/remote_client.h

@@ -1,10 +1,11 @@
-#ifndef REMOTECLIENT_H
-#define REMOTECLIENT_H
+#ifndef EZ_REMOTECLIENT_H
+#define EZ_REMOTECLIENT_H
 
 #include <string>
 #include <vector>
 #include "common.h"
 #include "http/httplib.h"
+#include "split_file.h"
 
 enum RemoteActions
 {
@@ -20,7 +21,9 @@ enum RemoteActions
     REMOTE_ACTION_INSTALL = 256,
     REMOTE_ACTION_EDIT = 512,
     REMOTE_ACTION_NEW_FILE = 1024,
-    REMOTE_ACTION_ALL = 2047
+    REMOTE_ACTION_EXTRACT = 2048,
+    REMOTE_ACTION_RAW_READ = 4096,
+    REMOTE_ACTION_ALL = 8191
 };
 
 enum ClientType
@@ -47,6 +50,7 @@ public:
     virtual int Rmdir(const std::string &path, bool recursive) = 0;
     virtual int Size(const std::string &path, int64_t *size) = 0;
     virtual int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0) = 0;
+    virtual int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0) = 0;
     virtual int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0) = 0;
     virtual int Rename(const std::string &src, const std::string &dst) = 0;
     virtual int Delete(const std::string &path) = 0;
@@ -55,8 +59,12 @@ public:
     virtual int Head(const std::string &path, void *buffer, uint64_t len) = 0;
     virtual int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset) = 0;
     virtual int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset) = 0;
+    virtual int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset) = 0;
+    virtual int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset) = 0;
     virtual bool FileExists(const std::string &path) = 0;
     virtual std::vector<DirEntry> ListDir(const std::string &path) = 0;
+    virtual void *Open(const std::string &path, int flags) = 0;
+    virtual void Close(void *fp) = 0;
     virtual std::string GetPath(std::string path1, std::string path2) = 0;
     virtual bool IsConnected() = 0;
     virtual bool Ping() = 0;

source/clients/sftpclient.cpp

@@ -284,6 +284,8 @@ int SFTPClient::Get(const std::string &outputfile, const std::string &path, uint
     char *buff = (char *)malloc(FTP_CLIENT_BUFSIZ);
     int rc, count = 0;
     bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
+
     do
     {
         rc = libssh2_sftp_read(sftp_handle, buff, FTP_CLIENT_BUFSIZ);
@@ -304,6 +306,36 @@ int SFTPClient::Get(const std::string &outputfile, const std::string &path, uint
     return 1;
 }
 
+int SFTPClient::Get(SplitFile *split_file, const std::string &path, uint64_t offset)
+{
+    LIBSSH2_SFTP_HANDLE *sftp_handle = libssh2_sftp_open(sftp_session, path.c_str(), LIBSSH2_FXF_READ, 0);
+    if (!sftp_handle)
+    {
+        sprintf(response, "Unable to open file with SFTP: %ld", libssh2_sftp_last_error(sftp_session));
+        return 0;
+    }
+
+    char *buff = (char *)malloc(FTP_CLIENT_BUFSIZ);
+    int rc, count = 0;
+
+    do
+    {
+        rc = libssh2_sftp_read(sftp_handle, buff, FTP_CLIENT_BUFSIZ);
+        if (rc > 0)
+        {
+            split_file->Write(buff, rc);
+        }
+        else
+        {
+            break;
+        }
+    } while (1);
+    free((char *)buff);
+    libssh2_sftp_close(sftp_handle);
+
+    return 1;
+}
+
 int SFTPClient::GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset)
 {
     LIBSSH2_SFTP_HANDLE *sftp_handle = libssh2_sftp_open(sftp_session, path.c_str(), LIBSSH2_FXF_READ, 0);
@@ -313,6 +345,16 @@ int SFTPClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
         return 0;
     }
 
+    int ret = this->GetRange((void *)sftp_handle, sink, size, offset);
+    libssh2_sftp_close(sftp_handle);
+
+    return ret;
+}
+
+int SFTPClient::GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset)
+{
+    LIBSSH2_SFTP_HANDLE *sftp_handle = (LIBSSH2_SFTP_HANDLE *)fp;
+
     libssh2_sftp_seek64(sftp_handle, offset);
 
     char *buff = (char *)malloc(FTP_CLIENT_BUFSIZ);
@@ -329,7 +371,6 @@ int SFTPClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
             if (!ok)
             {
                 free((char *)buff);
-                libssh2_sftp_close(sftp_handle);
                 return 0;
             }
         }
@@ -340,9 +381,8 @@ int SFTPClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
     } while (1);
 
     free((char *)buff);
-    libssh2_sftp_close(sftp_handle);
 
-	return 1;
+    return 1;
 }
 
 int SFTPClient::GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset)
@@ -359,9 +399,18 @@ int SFTPClient::GetRange(const std::string &path, void *buffer, uint64_t size, u
         return 0;
     }
 
+    int ret = this->GetRange(sftp_handle, buffer, size, offset);
+    libssh2_sftp_close(sftp_handle);
+
+    return ret;
+}
+
+int SFTPClient::GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset)
+{
+    LIBSSH2_SFTP_HANDLE *sftp_handle = (LIBSSH2_SFTP_HANDLE *)fp;
+
     libssh2_sftp_seek64(sftp_handle, offset);
     int count = libssh2_sftp_read(sftp_handle, (char *)buffer, size);
-    libssh2_sftp_close(sftp_handle);
     if (count != size)
         return 0;
 
@@ -401,6 +450,8 @@ int SFTPClient::Put(const std::string &inputfile, const std::string &path, uint6
     buff = (char *)malloc(FTP_CLIENT_BUFSIZ);
     int nread, count = 0;
     bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
+
     do
     {
         nread = FS::Read(in, buff, FTP_CLIENT_BUFSIZ);
@@ -642,6 +693,16 @@ int SFTPClient::Quit()
     return 1;
 }
 
+void *SFTPClient::Open(const std::string &path, int flags)
+{
+    return libssh2_sftp_open(sftp_session, path.c_str(), LIBSSH2_FXF_READ, 0);
+}
+
+void SFTPClient::Close(void *fp)
+{
+    libssh2_sftp_close((LIBSSH2_SFTP_HANDLE *)fp);
+}
+
 ClientType SFTPClient::clientType()
 {
     return CLIENT_TYPE_SFTP;

source/clients/sftpclient.h

@@ -1,5 +1,5 @@
-#ifndef SFTPCLIENT_H
-#define SFTPCLIENT_H
+#ifndef EZ_SFTPCLIENT_H
+#define EZ_SFTPCLIENT_H
 
 #include <libssh2.h>
 #include <libssh2_sftp.h>
@@ -20,8 +20,11 @@ public:
     int Rmdir(const std::string &path);
     int Size(const std::string &path, int64_t *size);
     int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0);
+    int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0);
     int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
     int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
+    int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset);
+    int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset);
     int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0);
     int Rename(const std::string &src, const std::string &dst);
     int Delete(const std::string &path);
@@ -30,6 +33,8 @@ public:
     int Head(const std::string &path, void *buffer, uint64_t len);
     bool FileExists(const std::string &path);
     std::vector<DirEntry> ListDir(const std::string &path);
+    void *Open(const std::string &path, int flags);
+    void Close(void *fp);
     std::string GetPath(std::string path1, std::string path2);
     bool IsConnected();
     bool Ping();

source/clients/smbclient.cpp

@@ -197,23 +197,25 @@ int SmbClient::Get(const std::string &outputfile, const std::string &ppath, uint
 		return 0;
 	}
 
-	struct smb2fh* in = smb2_open(smb2, path.c_str(), O_RDONLY);
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), O_RDONLY);
 	if (in == NULL)
 	{
 		sprintf(response, "%s", smb2_get_error(smb2));
 		return 0;
 	}
 
-	FILE* out = FS::Create(outputfile);
+	FILE *out = FS::Create(outputfile);
 	if (out == NULL)
 	{
 		sprintf(response, "%s", lang_strings[STR_FAILED]);
 		return 0;
 	}
 
-	uint8_t *buff = (uint8_t*)malloc(max_read_size);
+	uint8_t *buff = (uint8_t *)malloc(max_read_size);
 	int count = 0;
 	bytes_transfered = 0;
+	sceRtcGetCurrentTick(&prev_tick);
+
 	while ((count = smb2_read(smb2, in, buff, max_read_size)) > 0)
 	{
 		if (count < 0)
@@ -221,7 +223,7 @@ int SmbClient::Get(const std::string &outputfile, const std::string &ppath, uint
 			sprintf(response, "%s", smb2_get_error(smb2));
 			FS::Close(out);
 			smb2_close(smb2, in);
-			free((void*)buff);
+			free((void *)buff);
 			return 0;
 		}
 		FS::Write(out, buff, count);
@@ -229,7 +231,39 @@ int SmbClient::Get(const std::string &outputfile, const std::string &ppath, uint
 	}
 	FS::Close(out);
 	smb2_close(smb2, in);
-	free((void*)buff);
+	free((void *)buff);
+	return 1;
+}
+
+int SmbClient::Get(SplitFile *split_file, const std::string &ppath, uint64_t offset)
+{
+	std::string path = std::string(ppath);
+	path = Util::Trim(path, "/");
+
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), O_RDONLY);
+	if (in == NULL)
+	{
+		sprintf(response, "%s", smb2_get_error(smb2));
+		return 0;
+	}
+
+	uint8_t *buff = (uint8_t *)malloc(max_read_size);
+	int count = 0;
+
+	while ((count = smb2_read(smb2, in, buff, max_read_size)) > 0)
+	{
+		if (count < 0)
+		{
+			sprintf(response, "%s", smb2_get_error(smb2));
+			smb2_close(smb2, in);
+			free((void *)buff);
+			return 0;
+		}
+		split_file->Write((char*)buff, count);
+	}
+
+	smb2_close(smb2, in);
+	free((void *)buff);
 	return 1;
 }
 
@@ -237,40 +271,48 @@ int SmbClient::GetRange(const std::string &ppath, DataSink &sink, uint64_t size,
 {
 	std::string path = std::string(ppath);
 	path = Util::Trim(path, "/");
-	struct smb2fh* in = smb2_open(smb2, path.c_str(), O_RDONLY);
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), O_RDONLY);
 	if (in == NULL)
 	{
 		return 0;
 	}
 
-    smb2_lseek(smb2, in, offset, SEEK_SET, NULL);
+	int ret = this->GetRange((void *)in, sink, size, offset);
+	smb2_close(smb2, in);
 
-	uint8_t *buff = (uint8_t*)malloc(max_read_size);
-    int count = 0;
-    size_t bytes_remaining = size;
-    do
-    {
-        size_t bytes_to_read = std::min<size_t>(max_read_size, bytes_remaining);
-        count = smb2_read(smb2, in, buff, bytes_to_read);
-        if (count > 0)
-        {
-            bytes_remaining -= count;
-            bool ok = sink.write((char*)buff, count);
+	return ret;
+}
+
+int SmbClient::GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset)
+{
+	struct smb2fh *in = (struct smb2fh *)fp;
+
+	smb2_lseek(smb2, in, offset, SEEK_SET, NULL);
+
+	uint8_t *buff = (uint8_t *)malloc(max_read_size);
+	int count = 0;
+	size_t bytes_remaining = size;
+	do
+	{
+		size_t bytes_to_read = std::min<size_t>(max_read_size, bytes_remaining);
+		count = smb2_read(smb2, in, buff, bytes_to_read);
+		if (count > 0)
+		{
+			bytes_remaining -= count;
+			bool ok = sink.write((char *)buff, count);
 			if (!ok)
 			{
 				free((uint8_t *)buff);
-				smb2_close(smb2, in);
 				return 0;
 			}
-        }
-        else
-        {
-            break;
-        }
-    } while (1);
+		}
+		else
+		{
+			break;
+		}
+	} while (1);
 
-    free((char *)buff);
-    smb2_close(smb2, in);
+	free((char *)buff);
 
 	return 1;
 }
@@ -285,18 +327,41 @@ int SmbClient::GetRange(const std::string &ppath, void *buffer, uint64_t size, u
 		return 0;
 	}
 
-	struct smb2fh* in = smb2_open(smb2, path.c_str(), O_RDONLY);
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), O_RDONLY);
 	if (in == NULL)
 	{
 		return 0;
 	}
 
+	int ret = this->GetRange(in, buffer, size, offset);
+	smb2_close(smb2, in);
+
+	return ret;
+}
+
+int SmbClient::GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset)
+{
+	struct smb2fh *in = (struct smb2fh *)fp;
+
 	smb2_lseek(smb2, in, offset, SEEK_SET, NULL);
 
-	int count = smb2_read(smb2, in, (uint8_t*)buffer, size);
-	smb2_close(smb2, in);
-	if (count != size)
-		return 0;
+	uint8_t *buff = (uint8_t *)buffer;
+	int count = 0;
+	size_t bytes_remaining = size;
+	do
+	{
+		size_t bytes_to_read = std::min<size_t>(max_read_size, bytes_remaining);
+		count = smb2_read(smb2, in, buff, bytes_to_read);
+		if (count > 0)
+		{
+			bytes_remaining -= count;
+			buff += count;
+		}
+		else
+		{
+			break;
+		}
+	} while (1);
 
 	return 1;
 }
@@ -323,14 +388,14 @@ int SmbClient::CopyToSocket(const std::string &ppath, int socket_fd)
 		return 0;
 	}
 
-	struct smb2fh* in = smb2_open(smb2, path.c_str(), O_RDONLY);
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), O_RDONLY);
 	if (in == NULL)
 	{
 		sprintf(response, "%s", smb2_get_error(smb2));
 		return 0;
 	}
 
-	uint8_t *buff = (uint8_t*)malloc(max_read_size);
+	uint8_t *buff = (uint8_t *)malloc(max_read_size);
 	int count = 0;
 	while ((count = smb2_read(smb2, in, buff, max_read_size)) > 0)
 	{
@@ -338,7 +403,7 @@ int SmbClient::CopyToSocket(const std::string &ppath, int socket_fd)
 		{
 			sprintf(response, "%s", smb2_get_error(smb2));
 			smb2_close(smb2, in);
-			free((void*)buff);
+			free((void *)buff);
 			return 0;
 		}
 		int ret = sceNetSend(socket_fd, buff, count, 0);
@@ -348,7 +413,7 @@ int SmbClient::CopyToSocket(const std::string &ppath, int socket_fd)
 		}
 	}
 	smb2_close(smb2, in);
-	free((void*)buff);
+	free((void *)buff);
 	return 1;
 }
 
@@ -384,23 +449,25 @@ int SmbClient::Put(const std::string &inputfile, const std::string &ppath, uint6
 		return 0;
 	}
 
-	FILE* in = FS::OpenRead(inputfile);
+	FILE *in = FS::OpenRead(inputfile);
 	if (in == NULL)
 	{
 		sprintf(response, "%s", lang_strings[STR_FAILED]);
 		return 0;
 	}
-	
-	struct smb2fh* out = smb2_open(smb2, path.c_str(), O_WRONLY | O_CREAT | O_TRUNC);
+
+	struct smb2fh *out = smb2_open(smb2, path.c_str(), O_WRONLY | O_CREAT | O_TRUNC);
 	if (out == NULL)
 	{
 		sprintf(response, "%s", smb2_get_error(smb2));
 		return 0;
 	}
 
-	uint8_t* buff = (uint8_t*)malloc(max_write_size);
+	uint8_t *buff = (uint8_t *)malloc(max_write_size);
 	int count = 0;
 	bytes_transfered = 0;
+	sceRtcGetCurrentTick(&prev_tick);
+
 	while ((count = FS::Read(in, buff, max_write_size)) > 0)
 	{
 		if (count < 0)
@@ -419,7 +486,6 @@ int SmbClient::Put(const std::string &inputfile, const std::string &ppath, uint6
 	free(buff);
 
 	return 1;
-
 }
 
 int SmbClient::Rename(const std::string &src, const std::string &dst)
@@ -553,13 +619,13 @@ int SmbClient::Head(const std::string &ppath, void *buffer, uint64_t len)
 		return 0;
 	}
 
-	struct smb2fh* in = smb2_open(smb2, path.c_str(), O_RDONLY);
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), O_RDONLY);
 	if (in == NULL)
 	{
 		return 0;
 	}
 
-	int count = smb2_read(smb2, in, (uint8_t*)buffer, len);
+	int count = smb2_read(smb2, in, (uint8_t *)buffer, len);
 	smb2_close(smb2, in);
 	if (count != len)
 		return 0;
@@ -567,6 +633,20 @@ int SmbClient::Head(const std::string &ppath, void *buffer, uint64_t len)
 	return 1;
 }
 
+void *SmbClient::Open(const std::string &ppath, int flags)
+{
+	std::string path = std::string(ppath);
+	path = Util::Trim(path, "/");
+
+	struct smb2fh *in = smb2_open(smb2, path.c_str(), flags);
+	return in;
+}
+
+void SmbClient::Close(void *fp)
+{
+	smb2_close(smb2, (struct smb2fh *)fp);
+}
+
 ClientType SmbClient::clientType()
 {
 	return CLIENT_TYPE_SMB;

source/clients/smbclient.h

@@ -1,5 +1,5 @@
-#ifndef SMBCLIENT_H
-#define SMBCLIENT_H
+#ifndef EZ_SMBCLIENT_H
+#define EZ_SMBCLIENT_H
 
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -24,8 +24,11 @@ public:
 	int Rmdir(const std::string &path, bool recursive);
 	int Size(const std::string &path, int64_t *size);
 	int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0);
+	int Get(SplitFile *split_file, const std::string &path, uint64_t offset=0);
 	int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
 	int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
+	int GetRange(void *fp, void *buffer, uint64_t size, uint64_t offset);
+	int GetRange(void *fp, DataSink &sink, uint64_t size, uint64_t offset);
 	int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0);
 	int Rename(const std::string &src, const std::string &dst);
 	int Delete(const std::string &path);
@@ -34,6 +37,8 @@ public:
     int Move(const std::string &from, const std::string &to);
 	int CopyToSocket(const std::string &path, int socket_fd);
 	std::vector<DirEntry> ListDir(const std::string &path);
+    void *Open(const std::string &path, int flags);
+    void Close(void *fp);
 	bool IsConnected();
 	bool Ping();
 	const char *LastResponse();

source/clients/webdav.cpp

@@ -0,0 +1,324 @@
+#include <fstream>
+#include "common.h"
+#include "clients/remote_client.h"
+#include "clients/webdav.h"
+#include "pugixml/pugiext.hpp"
+#include "fs.h"
+#include "lang.h"
+#include "util.h"
+#include "system.h"
+#include "windows.h"
+
+using httplib::Client;
+using httplib::ContentProvider;
+using httplib::Headers;
+using httplib::Progress;
+using httplib::Result;
+
+static const char *months[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+std::string WebDAVClient::GetHttpUrl(std::string url)
+{
+    std::string http_url = std::regex_replace(url, std::regex("webdav://"), "http://");
+    http_url = std::regex_replace(http_url, std::regex("webdavs://"), "https://");
+    return http_url;
+}
+
+int WebDAVClient::Connect(const std::string &host, const std::string &user, const std::string &pass)
+{
+    std::string url = GetHttpUrl(host);
+    return BaseClient::Connect(url, user, pass);
+}
+
+Result WebDAVClient::PropFind(const std::string &path, int depth)
+{
+    Request req;
+    Headers header = {{"Accept", "*/*"}, {"Depth", std::to_string(depth)}};
+
+    req.method = "PROPFIND";
+    req.path = path;
+    req.headers = header;
+    req.progress = Progress();
+
+    return client->send(req);
+}
+
+int WebDAVClient::Size(const std::string &path, int64_t *size)
+{
+    std::string encoded_path = httplib::detail::encode_url(GetFullPath(path));
+    if (auto res = PropFind(encoded_path, 0))
+    {
+        if (HTTP_SUCCESS(res->status))
+        {
+            pugi::xml_document document;
+            document.load_buffer(res->body.c_str(), res->body.length());
+            auto multistatus = document.select_node("*[local-name()='multistatus']").node();
+            auto responses = multistatus.select_nodes("*[local-name()='response']");
+            for (auto response : responses)
+            {
+                pugi::xml_node href = response.node().select_node("*[local-name()='href']").node();
+                std::string resource_path = httplib::detail::decode_url(href.first_child().value(), true);
+
+                auto target_path_without_sep = GetFullPath(path);
+                if (!target_path_without_sep.empty() && target_path_without_sep.back() == '/')
+                    target_path_without_sep.resize(target_path_without_sep.length() - 1);
+                auto resource_path_without_sep = resource_path.erase(resource_path.find_last_not_of('/') + 1);
+                size_t pos = resource_path_without_sep.find(this->host_url);
+                if (pos != std::string::npos)
+                    resource_path_without_sep.erase(pos, this->host_url.length());
+
+                if (resource_path_without_sep != target_path_without_sep)
+                    continue;
+
+                auto propstat = response.node().select_node("*[local-name()='propstat']").node();
+                auto prop = propstat.select_node("*[local-name()='prop']").node();
+                std::string content_length = prop.select_node("*[local-name()='getcontentlength']").node().first_child().value();
+
+                *size = std::strtoll(content_length.c_str(), nullptr, 10);
+                return 1;
+            }
+        }
+    }
+    else
+    {
+        sprintf(this->response, "%s", httplib::to_string(res.error()).c_str());
+    }
+
+    return 0;
+}
+
+std::vector<DirEntry> WebDAVClient::ListDir(const std::string &path)
+{
+    std::vector<DirEntry> out;
+    DirEntry entry;
+    Util::SetupPreviousFolder(path, &entry);
+    out.push_back(entry);
+
+    std::string encoded_path = httplib::detail::encode_url(GetFullPath(path));
+    if (auto res = PropFind(encoded_path, 1))
+    {
+        pugi::xml_document document;
+        document.load_buffer(res->body.c_str(), res->body.length());
+        auto multistatus = document.select_node("*[local-name()='multistatus']").node();
+        auto responses = multistatus.select_nodes("*[local-name()='response']");
+        for (auto response : responses)
+        {
+            pugi::xml_node href = response.node().select_node("*[local-name()='href']").node();
+            std::string resource_path = httplib::detail::decode_url(href.first_child().value(), true);
+
+            auto target_path_without_sep = GetFullPath(path);
+            if (!target_path_without_sep.empty() && target_path_without_sep.back() == '/')
+                target_path_without_sep.resize(target_path_without_sep.length() - 1);
+            auto resource_path_without_sep = resource_path.erase(resource_path.find_last_not_of('/') + 1);
+            size_t pos = resource_path_without_sep.find(this->host_url);
+            if (pos != std::string::npos)
+                resource_path_without_sep.erase(pos, this->host_url.length());
+
+            if (resource_path_without_sep == target_path_without_sep)
+                continue;
+
+            pos = resource_path_without_sep.find_last_of('/');
+            auto name = resource_path_without_sep.substr(pos + 1);
+            auto propstat = response.node().select_node("*[local-name()='propstat']").node();
+            auto prop = propstat.select_node("*[local-name()='prop']").node();
+            std::string creation_date = prop.select_node("*[local-name()='creationdate']").node().first_child().value();
+            std::string content_length = prop.select_node("*[local-name()='getcontentlength']").node().first_child().value();
+            std::string m_date = prop.select_node("*[local-name()='getlastmodified']").node().first_child().value();
+            std::string resource_type = prop.select_node("*[local-name()='resourcetype']").node().first_child().name();
+
+            DirEntry entry;
+            memset(&entry, 0, sizeof(entry));
+            entry.selectable = true;
+            sprintf(entry.directory, "%s", path.c_str());
+            sprintf(entry.name, "%s", name.c_str());
+
+            if (path.length() == 1 and path[0] == '/')
+            {
+                sprintf(entry.path, "%s%s", path.c_str(), name.c_str());
+            }
+            else
+            {
+                sprintf(entry.path, "%s/%s", path.c_str(), name.c_str());
+            }
+
+            entry.isDir = resource_type.find("collection") != std::string::npos;
+            entry.file_size = 0;
+            if (!entry.isDir)
+            {
+                entry.file_size = std::stoll(content_length);
+                DirEntry::SetDisplaySize(&entry);
+            }
+            else
+            {
+                sprintf(entry.display_size, "%s", lang_strings[STR_FOLDER]);
+            }
+
+            char modified_date[32];
+            char *p_char = NULL;
+            sprintf(modified_date, "%s", m_date.c_str());
+            p_char = strchr(modified_date, ' ');
+            if (p_char)
+            {
+                OrbisDateTime gmt;
+                OrbisDateTime lt;
+                char month[5];
+                sscanf(p_char, "%hd %s %hd %hd:%hd:%hd", &gmt.day, month, &gmt.year, &gmt.hour, &gmt.minute, &gmt.second);
+                for (int k = 0; k < 12; k++)
+                {
+                    if (strcmp(month, months[k]) == 0)
+                    {
+                        gmt.month = k + 1;
+                        break;
+                    }
+                }
+                convertUtcToLocalTime(&gmt, &lt);
+                entry.modified.day = lt.day;
+                entry.modified.month = lt.month;
+                entry.modified.year = lt.year;
+                entry.modified.hours = lt.hour;
+                entry.modified.minutes = lt.minute;
+                entry.modified.seconds = lt.second;
+            }
+            out.push_back(entry);
+        }
+    }
+    else
+    {
+        sprintf(this->response, "%s", httplib::to_string(res.error()).c_str());
+        return out;
+    }
+
+    return out;
+}
+
+int WebDAVClient::Put(const std::string &inputfile, const std::string &path, uint64_t offset)
+{
+    size_t bytes_remaining = FS::GetSize(inputfile);
+    bytes_transfered = 0;
+    sceRtcGetCurrentTick(&prev_tick);
+
+    FILE *in = FS::OpenRead(inputfile);
+
+    if (auto res = client->Put(GetFullPath(path), [&](size_t offset, DataSink &sink)
+                               {
+            size_t buf_size = MIN(bytes_remaining, CPPHTTPLIB_RECV_BUFSIZ);
+            char* buf = (char*) malloc(buf_size);
+            FS::Seek(in, offset);
+
+            while (bytes_remaining > 0)
+            {
+                size_t bytes_read = FS::Read(in, buf, buf_size);
+                sink.write(buf, bytes_read);
+                bytes_transfered += bytes_read;
+                bytes_remaining -= bytes_read;
+            }
+            sink.done();
+            free(buf);
+            return true; }, "application/octet-stream"))
+    {
+        if (HTTP_SUCCESS(res->status))
+        {
+            FS::Close(in);
+            return 1;
+        }
+    }
+
+    FS::Close(in);
+    return 0;
+}
+
+int WebDAVClient::Mkdir(const std::string &path)
+{
+    Request req;
+    Headers header = {{"Accept", "*/*"}, {"Connection", "Keep-Alive"}};
+
+    req.method = "MKCOL";
+    req.path = httplib::detail::encode_url(GetFullPath((path)));
+    req.headers = header;
+    req.progress = Progress();
+
+    if (auto res = client->send(req))
+    {
+        if (HTTP_SUCCESS(res->status))
+            return 1;
+    }
+
+    return 0;
+}
+
+int WebDAVClient::Rmdir(const std::string &path, bool recursive)
+{
+    return Delete(path);
+}
+
+int WebDAVClient::Rename(const std::string &src, const std::string &dst)
+{
+    return Move(src, dst);
+}
+
+int WebDAVClient::Delete(const std::string &path)
+{
+    Request req;
+    Headers header = {{"Accept", "*/*"}, {"Connection", "Keep-Alive"}};
+
+    req.method = "DELETE";
+    req.path = httplib::detail::encode_url(GetFullPath((path)));
+    req.headers = header;
+    req.progress = Progress();
+
+    if (auto res = client->send(req))
+    {
+        if (HTTP_SUCCESS(res->status))
+            return 1;
+    }
+
+    return 0;
+}
+
+int WebDAVClient::Copy(const std::string &from, const std::string &to)
+{
+    Request req;
+    Headers header = {{"Accept", "*/*"}, {"Destination", httplib::detail::encode_url(GetFullPath(to))}};
+
+    req.method = "COPY";
+    req.path = httplib::detail::encode_url(GetFullPath(from));
+    req.headers = header;
+    req.progress = Progress();
+
+    if (auto res = client->send(req))
+    {
+        if (HTTP_SUCCESS(res->status))
+            return 1;
+    }
+
+    return 0;
+}
+
+int WebDAVClient::Move(const std::string &from, const std::string &to)
+{
+    Request req;
+    Headers header = {{"Accept", "*/*"}, {"Destination", httplib::detail::encode_url(GetFullPath(to))}};
+
+    req.method = "MOVE";
+    req.path = httplib::detail::encode_url(GetFullPath(from));
+    req.headers = header;
+    req.progress = Progress();
+
+    if (auto res = client->send(req))
+    {
+        if (HTTP_SUCCESS(res->status))
+            return 1;
+    }
+
+    return 0;
+}
+
+ClientType WebDAVClient::clientType()
+{
+    return CLIENT_TYPE_WEBDAV;
+}
+
+uint32_t WebDAVClient::SupportedActions()
+{
+    return REMOTE_ACTION_ALL ^ REMOTE_ACTION_RAW_READ;
+}

source/clients/webdav.h

@@ -0,0 +1,32 @@
+#ifndef EZ_WEBDAV_H
+#define EZ_WEBDAV_H
+
+#include <string>
+#include <vector>
+#include "http/httplib.h"
+#include "clients/baseclient.h"
+#include "clients/remote_client.h"
+#include "common.h"
+
+class WebDAVClient : public BaseClient
+{
+public:
+    int Connect(const std::string &url, const std::string &user, const std::string &pass);
+    int Mkdir(const std::string &path);
+    int Rmdir(const std::string &path, bool recursive);
+    int Rename(const std::string &src, const std::string &dst);
+    int Delete(const std::string &path);
+    int Copy(const std::string &from, const std::string &to);
+    int Move(const std::string &from, const std::string &to);
+    int Put(const std::string &inputfile, const std::string &path, uint64_t offset = 0);
+    int Size(const std::string &path, int64_t *size);
+    std::vector<DirEntry> ListDir(const std::string &path);
+    ClientType clientType();
+    uint32_t SupportedActions();
+    static std::string GetHttpUrl(std::string url);
+
+private:
+    Result PropFind(const std::string &path, int depth);
+};
+
+#endif

source/clients/webdavclient.cpp

@@ -1,387 +0,0 @@
-#include <errno.h>
-#include <unistd.h>
-#include <cstring>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <fcntl.h>
-#include "lang.h"
-#include "webdav/client.hpp"
-#include "clients/webdavclient.h"
-#include "windows.h"
-#include "util.h"
-#include "system.h"
-
-static const char *months[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-namespace WebDAV
-{
-	static int DownloadCallback(void *context, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
-	{
-		int64_t *bytes_transfered = (int64_t *)context;
-		*bytes_transfered = reinterpret_cast<int64_t>(dlnow);
-		return CURLE_OK;
-	}
-
-	static int UploadCallback(void *context, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
-	{
-		int64_t *bytes_transfered = (int64_t *)context;
-		*bytes_transfered = reinterpret_cast<int64_t>(ulnow);
-		return CURLE_OK;
-	}
-
-	int WebDavClient::Connect(const std::string &host, const std::string &user, const std::string &pass)
-	{
-		return Connect(host, user, pass, true);
-	}
-
-	WebDavClient::WebDavClient() {};
-
-	int WebDavClient::Connect(const std::string &host, const std::string &user, const std::string &pass, bool check_enabled)
-	{
-		std::string url = GetHttpUrl(host);
-		std::size_t scheme_pos = url.find_first_of("://");
-		std::string root_folder = "/";
-		if (scheme_pos != std::string::npos)
-		{
-			std::size_t root_folder_pos = url.find_first_of("/", scheme_pos + 3);
-			if (root_folder_pos != std::string::npos)
-			{
-				root_folder = url.substr(root_folder_pos);
-				url = url.substr(0, root_folder_pos);
-			}
-		}
-		WebDAV::dict_t options = {
-			{"webdav_hostname", url},
-			{"webdav_root", root_folder},
-			{"webdav_username", user},
-			{"webdav_password", pass},
-			{"check_enabled", check_enabled ? "1" : "0"}};
-		client = new WebDAV::Client(options);
-		connected = true;
-
-		return 1;
-	}
-
-	/*
-	 * LastResponse - return a pointer to the last response received
-	 */
-	const char *WebDavClient::LastResponse()
-	{
-		return (const char *)response;
-	}
-
-	/*
-	 * IsConnected - return true if connected to remote
-	 */
-	bool WebDavClient::IsConnected()
-	{
-		return connected;
-	}
-
-	/*
-	 * Ping - return true if connected to remote
-	 */
-	bool WebDavClient::Ping()
-	{
-		connected = client->check();
-		sprintf(response, "Http Code %ld", client->status_code());
-		return connected;
-	}
-
-	/*
-	 * Quit - disconnect from remote
-	 *
-	 * return 1 if successful, 0 otherwise
-	 */
-	int WebDavClient::Quit()
-	{
-		if (client != NULL)
-			delete (client);
-		client = NULL;
-		connected = false;
-		return 1;
-	}
-
-	/*
-	 * Mkdir - create a directory at server
-	 *
-	 * return 1 if successful, 0 otherwise
-	 */
-	int WebDavClient::Mkdir(const std::string &ppath)
-	{
-		bool ret = client->create_directory(ppath);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	/*
-	 * Rmdir - remove directory and all files under directory at remote
-	 *
-	 * return 1 if successful, 0 otherwise
-	 */
-	int WebDavClient::_Rmdir(const std::string &ppath)
-	{
-		bool ret = client->clean(ppath);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	/*
-	 * Rmdir - remove directory and all files under directory at remote
-	 *
-	 * return 1 if successful, 0 otherwise
-	 */
-	int WebDavClient::Rmdir(const std::string &path, bool recursive)
-	{
-		if (stop_activity)
-			return 1;
-
-		std::vector<DirEntry> list = ListDir(path);
-		int ret;
-		for (int i = 0; i < list.size(); i++)
-		{
-			if (stop_activity)
-				return 1;
-
-			if (list[i].isDir && recursive)
-			{
-				if (strcmp(list[i].name, "..") == 0)
-					continue;
-				ret = Rmdir(list[i].path, recursive);
-				if (ret == 0)
-				{
-					sprintf(status_message, "%s %s", lang_strings[STR_FAIL_DEL_DIR_MSG], list[i].path);
-					return 0;
-				}
-			}
-			else
-			{
-				sprintf(activity_message, "%s %s\n", lang_strings[STR_DELETING], list[i].path);
-				ret = Delete(list[i].path);
-				if (ret == 0)
-				{
-					sprintf(status_message, "%s %s", lang_strings[STR_FAIL_DEL_FILE_MSG], list[i].path);
-					return 0;
-				}
-			}
-		}
-		ret = _Rmdir(path);
-		if (ret == 0)
-		{
-			sprintf(status_message, "%s %s", lang_strings[STR_FAIL_DEL_DIR_MSG], path.c_str());
-			return 0;
-		}
-
-		return 1;
-	}
-
-	/*
-	 * Get - issue a GET command and write received data to output
-	 *
-	 * return 1 if successful, 0 otherwise
-	 */
-
-	int WebDavClient::Get(const std::string &outputfile, const std::string &ppath, uint64_t offset)
-	{
-		bool ret = client->download(ppath, outputfile, &bytes_transfered, DownloadCallback);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	bool WebDavClient::FileExists(const std::string &ppath)
-	{
-		std::string path = ppath;
-		path = Util::Ltrim(path, "/");
-		bool ret = client->check(path);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	int WebDavClient::GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset)
-	{
-		char *buffer_ptr = nullptr;
-		unsigned long long buffer_size = 0;
-
-		bool ret = client->download_range_to(path, buffer_ptr, buffer_size, offset, offset+size-1);
-		sprintf(response, "Http Code %ld", client->status_code());
-		if (buffer_size != size)
-		{
-			return 0;
-		}
-		memcpy(buffer, buffer_ptr, size);
-		return 1;
-	}
-
-	int WebDavClient::GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset)
-	{
-		return client->download_range_to(path, sink, offset, offset+size-1);
-	}
-
-	/*
-	 * Put - issue a PUT command and send data from input
-	 *
-	 * return 1 if successful, 0 otherwise
-	 */
-	int WebDavClient::Put(const std::string &inputfile, const std::string &ppath, uint64_t offset)
-	{
-		bool ret = client->upload(ppath, inputfile, &bytes_transfered, UploadCallback);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	int WebDavClient::Rename(const std::string &src, const std::string &dst)
-	{
-		bool ret = client->move(src, dst);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	int WebDavClient::Delete(const std::string &ppath)
-	{
-		bool ret = client->clean(ppath);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	int WebDavClient::Copy(const std::string &from, const std::string &to)
-	{
-		bool ret = client->copy(from, to);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	int WebDavClient::Move(const std::string &from, const std::string &to)
-	{
-		bool ret = client->move(from, to);
-		sprintf(response, "Http Code %ld", client->status_code());
-		return ret;
-	}
-
-	int WebDavClient::Size(const std::string &ppath, int64_t *size)
-	{
-		WebDAV::dict_t file_info = client->info(ppath);
-		std::string file_size = WebDAV::get(file_info, "size");
-		if (file_size.empty())
-			return 0;
-		*size = std::stoll(file_size);
-		return 1;
-	}
-
-	std::vector<DirEntry> WebDavClient::ListDir(const std::string &path)
-	{
-		std::vector<DirEntry> out;
-		DirEntry entry;
-		Util::SetupPreviousFolder(path, &entry);
-		out.push_back(entry);
-
-		WebDAV::dict_items_t files = client->list(path);
-		for (int i = 0; i < files.size(); i++)
-		{
-			DirEntry entry;
-			memset(&entry, 0, sizeof(entry));
-			entry.selectable = true;
-			sprintf(entry.directory, "%s", path.c_str());
-			sprintf(entry.name, "%s", WebDAV::get(files[i], "name").c_str());
-
-			if (path.length() == 1 and path[0] == '/')
-			{
-				sprintf(entry.path, "%s%s", path.c_str(), WebDAV::get(files[i], "name").c_str());
-			}
-			else
-			{
-				sprintf(entry.path, "%s/%s", path.c_str(), WebDAV::get(files[i], "name").c_str());
-			}
-
-			std::string resource_type = WebDAV::get(files[i], "type");
-			entry.isDir = resource_type.find("collection") != std::string::npos;
-			entry.file_size = 0;
-			if (!entry.isDir)
-			{
-				entry.file_size = std::stoll(WebDAV::get(files[i], "size"));
-				DirEntry::SetDisplaySize(&entry);
-			}
-			else
-			{
-				sprintf(entry.display_size, "%s", lang_strings[STR_FOLDER]);
-			}
-
-			char modified_date[32];
-			char *p_char = NULL;
-			sprintf(modified_date, "%s", WebDAV::get(files[i], "modified").c_str());
-			p_char = strchr(modified_date, ' ');
-			if (p_char)
-			{
-				OrbisDateTime gmt;
-				OrbisDateTime lt;
-				char month[5];
-				sscanf(p_char, "%hd %s %hd %hd:%hd:%hd", &gmt.day, month, &gmt.year, &gmt.hour, &gmt.minute, &gmt.second);
-				for (int k = 0; k < 12; k++)
-				{
-					if (strcmp(month, months[k]) == 0)
-					{
-						gmt.month = k + 1;
-						break;
-					}
-				}
-				convertUtcToLocalTime(&gmt, &lt);
-				entry.modified.day = lt.day;
-				entry.modified.month = lt.month;
-				entry.modified.year = lt.year;
-				entry.modified.hours = lt.hour;
-				entry.modified.minutes = lt.minute;
-				entry.modified.seconds = lt.second;
-			}
-			out.push_back(entry);
-		}
-
-		return out;
-	}
-
-	std::string WebDavClient::GetPath(std::string ppath1, std::string ppath2)
-	{
-		std::string path1 = ppath1;
-		std::string path2 = ppath2;
-		path1 = Util::Rtrim(Util::Trim(path1, " "), "/");
-		path2 = Util::Rtrim(Util::Trim(path2, " "), "/");
-		path1 = path1 + "/" + path2;
-		return path1;
-	}
-
-	int WebDavClient::Head(const std::string &path, void *buffer, uint64_t len)
-	{
-		char *buffer_ptr = nullptr;
-		unsigned long long buffer_size = 0;
-
-		bool ret = client->download_range_to(path, buffer_ptr, buffer_size, 0, len - 1);
-		sprintf(response, "Http Code %ld", client->status_code());
-		if (buffer_size != len)
-		{
-			return 0;
-		}
-		memcpy(buffer, buffer_ptr, len);
-		return 1;
-	}
-
-	bool WebDavClient::GetHeaders(const std::string &path, dict_t *headers)
-	{
-		return client->head(path, headers);
-	}
-
-	WebDAV::Client *WebDavClient::GetClient()
-	{
-		return this->client;
-	}
-
-	ClientType WebDavClient::clientType()
-	{
-		return CLIENT_TYPE_WEBDAV;
-	}
-
-	uint32_t WebDavClient::SupportedActions()
-	{
-		return REMOTE_ACTION_ALL;
-	}
-}

source/clients/webdavclient.h

@@ -1,62 +0,0 @@
-#ifndef WEBDAVCLIENT_H
-#define WEBDAVCLIENT_H
-
-#include <time.h>
-#include <string>
-#include <vector>
-#include <regex>
-#include "http/httplib.h"
-#include "webdav/client.hpp"
-#include "clients/remote_client.h"
-#include "common.h"
-
-using namespace httplib;
-
-namespace WebDAV
-{
-	inline std::string GetHttpUrl(std::string url)
-	{
-		std::string http_url = std::regex_replace(url, std::regex("webdav://"), "http://");
-		http_url = std::regex_replace(http_url, std::regex("webdavs://"), "https://");
-		return http_url;
-	}
-
-	class WebDavClient : public RemoteClient
-	{
-	public:
-		WebDavClient();
-		int Connect(const std::string &url, const std::string &user, const std::string &pass);
-		int Connect(const std::string &url, const std::string &user, const std::string &pass, bool check_enabled);
-		int Mkdir(const std::string &path);
-		int Rmdir(const std::string &path, bool recursive);
-		int Size(const std::string &path, int64_t *size);
-		int Get(const std::string &outputfile, const std::string &path, uint64_t offset=0);
-		int GetRange(const std::string &path, void *buffer, uint64_t size, uint64_t offset);
-		int GetRange(const std::string &path, DataSink &sink, uint64_t size, uint64_t offset);
-		int Put(const std::string &inputfile, const std::string &path, uint64_t offset=0);
-		int Rename(const std::string &src, const std::string &dst);
-		int Delete(const std::string &path);
-		int Copy(const std::string &from, const std::string &to);
-		int Move(const std::string &from, const std::string &to);
-		bool FileExists(const std::string &path);
-		std::vector<DirEntry> ListDir(const std::string &path);
-		bool IsConnected();
-		bool Ping();
-		const char *LastResponse();
-		int Quit();
-		std::string GetPath(std::string path1, std::string path2);
-		int Head(const std::string &path, void *buffer, uint64_t len);
-		bool GetHeaders(const std::string &path, dict_t *headers);
-		WebDAV::Client *GetClient();
-		ClientType clientType();
-		uint32_t SupportedActions();
-
-	private:
-		int _Rmdir(const std::string &path);
-		WebDAV::Client *client;
-		char response[1024];
-		bool connected = false;
-	};
-
-}
-#endif

source/common.h

@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef EZ_COMMON_H
+#define EZ_COMMON_H
 
 #include <string>
 #include <vector>

source/config.cpp

@@ -25,6 +25,7 @@ char remote_directory[255];
 char app_ver[6];
 char last_site[32];
 char display_site[32];
+std::vector<std::string> langs;
 char language[128];
 std::vector<std::string> sites;
 std::vector<std::string> http_servers;
@@ -37,7 +38,9 @@ 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'};
 unsigned char cipher_iv[16] = {'Y', 'p', '3', 's', '6', 'v', '9', 'y', '$', 'B', '&', 'E', ')', 'H', '@', 'M'};
@@ -152,6 +155,10 @@ namespace CONFIG
         sites = {"Site 1", "Site 2", "Site 3", "Site 4", "Site 5", "Site 6", "Site 7", "Site 8", "Site 9", "Site 10",
                  "Site 11", "Site 12", "Site 13", "Site 14", "Site 15", "Site 16", "Site 17", "Site 18", "Site 19", "Site 20"};
 
+        langs = { "Default", "Arabic", "Catalan", "Croatian", "Dutch", "English", "Euskera", "French", "Galego", "German", "Greek", 
+                  "Hungarian", "Indonesian", "Italiano", "Japanese", "Korean", "Polish", "Portuguese_BR", "Russian", "Romanian", "Ryukyuan", "Spanish", "Turkish",
+                  "Simplified Chinese", "Traditional Chinese", "Thai", "Ukrainian"};
+
         http_servers = {HTTP_SERVER_APACHE, HTTP_SERVER_MS_IIS, HTTP_SERVER_NGINX, HTTP_SERVER_NPX_SERVE, HTTP_SERVER_RCLONE};
         text_file_extensions = { ".txt", ".ini", ".log", ".json", ".xml", ".html", ".xhtml", ".conf", ".config" };
         image_file_extensions = { ".bmp", ".jpg", ".jpeg", ".png", ".webp" };
@@ -167,7 +174,7 @@ namespace CONFIG
         WriteInt(CONFIG_GLOBAL, CONFIG_VERSION, CONFIG_VERSION_NUM);
 
         // Load global config
-        sprintf(language, "%s", ReadString(CONFIG_GLOBAL, CONFIG_LANGUAGE, ""));
+        sprintf(language, "%s", ReadString(CONFIG_GLOBAL, CONFIG_LANGUAGE, "Default"));
         WriteString(CONFIG_GLOBAL, CONFIG_LANGUAGE, language);
 
         sprintf(local_directory, "%s", ReadString(CONFIG_GLOBAL, CONFIG_LOCAL_DIRECTORY, "/"));
@@ -182,22 +189,45 @@ namespace CONFIG
         show_hidden_files = ReadBool(CONFIG_GLOBAL, CONFIG_SHOW_HIDDEN_FILES, false);
         WriteBool(CONFIG_GLOBAL, CONFIG_SHOW_HIDDEN_FILES, show_hidden_files);
 
+        sprintf(temp_folder, ReadString(CONFIG_GLOBAL, CONFIG_TMP_FOLDER_PATH, TMP_FOLDER_PATH));
+        WriteString(CONFIG_GLOBAL, CONFIG_TMP_FOLDER_PATH, temp_folder);
+
+        if (!FS::FolderExists(temp_folder))
+        {
+            FS::MkDirs(temp_folder);
+        }
+
         // alldebrid api key
         char tmp_api_key[512];
         sprintf(tmp_api_key, "%s", ReadString(CONFIG_GLOBAL, CONFIG_ALLDEBRID_API_KEY, ""));
         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);
@@ -268,6 +298,9 @@ namespace CONFIG
             setting.enable_rpi = ReadBool(sites[i].c_str(), CONFIG_ENABLE_RPI, true);
             WriteBool(sites[i].c_str(), CONFIG_ENABLE_RPI, setting.enable_rpi);
 
+            setting.enable_disk_cache = ReadBool(sites[i].c_str(), CONFIG_REMOTE_ENABLE_DISK_CACHE, false);
+            WriteBool(sites[i].c_str(), CONFIG_REMOTE_ENABLE_DISK_CACHE, setting.enable_disk_cache);
+
             sprintf(setting.http_server_type, "%s", ReadString(sites[i].c_str(), CONFIG_REMOTE_HTTP_SERVER_TYPE, HTTP_SERVER_APACHE));
             WriteString(sites[i].c_str(), CONFIG_REMOTE_HTTP_SERVER_TYPE, setting.http_server_type);
 
@@ -341,6 +374,7 @@ namespace CONFIG
         WriteString(last_site, CONFIG_REMOTE_SERVER_USER, remote_settings->username);
         WriteString(last_site, CONFIG_REMOTE_SERVER_PASSWORD, encrypted_text.c_str());
         WriteBool(last_site, CONFIG_ENABLE_RPI, remote_settings->enable_rpi);
+        WriteBool(last_site, CONFIG_REMOTE_ENABLE_DISK_CACHE, remote_settings->enable_disk_cache);
         WriteString(last_site, CONFIG_REMOTE_HTTP_SERVER_TYPE, remote_settings->http_server_type);
         WriteString(last_site, CONFIG_REMOTE_DEFAULT_DIRECTORY, remote_settings->default_directory);
         WriteString(CONFIG_GLOBAL, CONFIG_LAST_SITE, last_site);
@@ -378,19 +412,37 @@ 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);
+        WriteString(CONFIG_GLOBAL, CONFIG_LANGUAGE, language);
         WriteInt(CONFIG_HTTP_SERVER, CONFIG_HTTP_SERVER_PORT, http_server_port);
         WriteString(CONFIG_HTTP_SERVER, CONFIG_HTTP_SERVER_COMPRESSED_FILE_PATH, compressed_file_path);
         WriteBool(CONFIG_HTTP_SERVER, CONFIG_HTTP_SERVER_ENABLED, web_server_enabled);
 
         WriteIniFile(CONFIG_INI_FILE);
         CloseIniFile();
+
+        if (!FS::FolderExists(temp_folder))
+        {
+            FS::MkDirs(temp_folder);
+        }
+
+        if (!FS::FolderExists(compressed_file_path))
+        {
+            FS::MkDirs(compressed_file_path);
+        }
     }
 
     void SaveLocalDirecotry(const std::string &path)

source/config.h

@@ -1,5 +1,5 @@
-#ifndef LAUNCHER_CONFIG_H
-#define LAUNCHER_CONFIG_H
+#ifndef EZ_CONFIG_H
+#define EZ_CONFIG_H
 
 #include <string>
 #include <vector>
@@ -17,6 +17,7 @@
 #define TMP_EDITOR_FILE DATA_PATH "/tmp_editor.txt"
 #define TMP_SFO_PATH DATA_PATH "/tmp_pkg.sfo"
 #define TMP_ICON_PATH DATA_PATH "/tmp_icon.png"
+#define TMP_FOLDER_PATH DATA_PATH "/tmp"
 
 #define CONFIG_GLOBAL "Global"
 
@@ -56,8 +57,10 @@
 #define CONFIG_ENABLE_RPI "remote_server_enable_rpi"
 #define CONFIG_REMOTE_HTTP_SERVER_TYPE "remote_server_http_server_type"
 #define CONFIG_REMOTE_DEFAULT_DIRECTORY "remote_server_default_directory"
+#define CONFIG_REMOTE_ENABLE_DISK_CACHE "remote_server_enable_disk_cache"
 
 #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
@@ -70,6 +73,7 @@
 #define CONFIG_AUTO_DELETE_TMP_PKG "auto_delete_tmp_pkg"
 
 #define CONFIG_LOCAL_DIRECTORY "local_directory"
+#define CONFIG_TMP_FOLDER_PATH "temp_folder"
 
 #define CONFIG_LANGUAGE "language"
 
@@ -107,6 +111,7 @@ struct RemoteSettings
     char http_server_type[24];
     GoogleAccountInfo gg_account;
     char default_directory[256];
+    bool enable_disk_cache;
 };
 
 struct PackageUrlInfo
@@ -126,6 +131,7 @@ extern char remote_directory[255];
 extern char app_ver[6];
 extern char last_site[32];
 extern char display_site[32];
+extern std::vector<std::string> langs;
 extern char language[128];
 extern RemoteSettings *remote_settings;
 extern RemoteClient *remoteclient;
@@ -137,7 +143,9 @@ 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/1fichier.h

@@ -1,5 +1,5 @@
-#ifndef FICHIER_HOST_H
-#define FICHIER_HOST_H
+#ifndef EZ_FICHIER_HOST_H
+#define EZ_FICHIER_HOST_H
 
 #include "filehost.h"
 

source/filehost/alldebrid.h

@@ -1,5 +1,5 @@
-#ifndef ALLDEBRID_HOST_H
-#define ALLDEBRID_HOST_H
+#ifndef EZ_ALLDEBRID_HOST_H
+#define EZ_ALLDEBRID_HOST_H
 
 #include "filehost.h"
 

source/filehost/directhost.cpp

@@ -1,6 +1,4 @@
 #include <regex>
-#include <lexbor/html/parser.h>
-#include <lexbor/dom/interfaces/element.h>
 #include <http/httplib.h>
 
 #include "common.h"

source/filehost/directhost.h

@@ -1,5 +1,5 @@
-#ifndef DIRECT_HOST_H
-#define DIRECT_HOST_H
+#ifndef EZ_DIRECT_HOST_H
+#define EZ_DIRECT_HOST_H
 
 #include "filehost.h"
 

source/filehost/filehost.cpp

@@ -2,17 +2,16 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "openssl/md5.h"
 
 #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"
 #include "filehost/pixeldrain.h"
 #include "config.h"
-#include "base64.h"
 #include "util.h"
 
 #define GDRIVE_REGEX "https:\\/\\/drive\\.google\\.com\\/(.*)"
@@ -22,20 +21,12 @@
 
 static std::map<std::string, std::string> cache_downloal_urls;
 
-std::string FileHost::Hash()
+std::string FileHost::GetUrl()
 {
-    std::vector<unsigned char> res(16);
-    MD5((const unsigned char *)this->url.c_str(), this->url.length(), res.data());
-
-    std::string out;
-    Base64::Encode(res.data(), res.size(), out);
-    Util::ReplaceAll(out, "=", "_");
-    Util::ReplaceAll(out, "+", "_");
-    out = out + ".pkg";
-    return out;
+    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);
@@ -44,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

@@ -1,5 +1,5 @@
-#ifndef FILEHOST_H
-#define FILEHOST_H
+#ifndef EZ_FILEHOST_H
+#define EZ_FILEHOST_H
 
 #include <string>
 #include <vector>
@@ -11,9 +11,9 @@ public:
     virtual ~FileHost(){};
     virtual bool IsValidUrl() = 0;
     virtual std::string GetDownloadUrl() = 0;
+    std::string GetUrl();
 
-    std::string Hash();
-    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/gdrive.h

@@ -1,5 +1,5 @@
-#ifndef GDRIVE_HOST_H
-#define GDRIVE_HOST_H
+#ifndef EZ_GDRIVE_HOST_H
+#define EZ_GDRIVE_HOST_H
 
 #include "filehost.h"
 

source/filehost/mediafire.h

@@ -1,5 +1,5 @@
-#ifndef MEDIAFIRE_HOST_H
-#define MEDIAFIRE_HOST_H
+#ifndef EZ_MEDIAFIRE_HOST_H
+#define EZ_MEDIAFIRE_HOST_H
 
 #include "filehost.h"
 

source/filehost/pixeldrain.h

@@ -1,5 +1,5 @@
-#ifndef PIXELDRAIN_HOST_H
-#define PIXELDRAIN_HOST_H
+#ifndef EZ_PIXELDRAIN_HOST_H
+#define EZ_PIXELDRAIN_HOST_H
 
 #include "filehost.h"
 

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 EZ_REALDEBRID_HOST_H
+#define EZ_REALDEBRID_HOST_H
+
+#include "filehost.h"
+
+class RealDebridHost : public FileHost
+{
+public:
+    RealDebridHost(const std::string &url);
+    bool IsValidUrl();
+    std::string GetDownloadUrl();
+};
+
+#endif

source/fs.cpp

@@ -510,6 +510,8 @@ namespace FS
 
         size_t bytes_read = 0;
         bytes_transfered = 0;
+        sceRtcGetCurrentTick(&prev_tick);
+
         const size_t buf_size = 0x10000;
         unsigned char *buf = new unsigned char[buf_size];
 

source/fs.h

@@ -1,5 +1,5 @@
-#ifndef LAUNCHER_FS_H
-#define LAUNCHER_FS_H
+#ifndef EZ_FS_H
+#define EZ_FS_H
 
 #pragma once
 #include <string.h>

source/gui.h

@@ -1,5 +1,5 @@
-#ifndef LAUNCHER_GUI_H
-#define LAUNCHER_GUI_H
+#ifndef EZ_GUI_H
+#define EZ_GUI_H
 
 #include <string>
 #include "SDL2/SDL.h"

source/http/httplib.cpp

@@ -562,7 +562,7 @@ private:
   size_t read_buff_off_ = 0;
   size_t read_buff_content_size_ = 0;
 
-  static const size_t read_buff_size_ = 1024 * 16;
+  static const size_t read_buff_size_ = 1024 * 512;
 };
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT

source/http/httplib.h

@@ -87,11 +87,11 @@
 #endif
 
 #ifndef CPPHTTPLIB_RECV_BUFSIZ
-#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
+#define CPPHTTPLIB_RECV_BUFSIZ size_t(524288u)
 #endif
 
 #ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
-#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
+#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(524288u)
 #endif
 
 #ifndef CPPHTTPLIB_THREAD_POOL_COUNT

source/ime_dialog.h

@@ -16,8 +16,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __IME_DIALOG_H__
-#define __IME_DIALOG_H__
+#ifndef __EZ_IME_DIALOG_H__
+#define __EZ_IME_DIALOG_H__
 
 #define IME_DIALOG_RESULT_NONE 0
 #define IME_DIALOG_RESULT_RUNNING 1

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

@@ -10,9 +10,8 @@
 #include <orbis/AppInstUtil.h>
 #include <orbis/UserService.h>
 #include <orbis/SystemService.h>
-#include <curl/curl.h>
-#include <web/request.hpp>
-#include <web/urn.hpp>
+#include "clients/webdav.h"
+#include "clients/remote_client.h"
 #include "server/http_server.h"
 #include "installer.h"
 #include "util.h"
@@ -22,15 +21,24 @@
 #include "system.h"
 #include "fs.h"
 #include "sfo.h"
-#include "clients/webdavclient.h"
-#include "clients/remote_client.h"
 
 #define BGFT_HEAP_SIZE (1 * 1024 * 1024)
 
+struct BgProgressCheck
+{
+	ArchivePkgInstallData *archive_pkg_data;
+	SplitPkgInstallData *split_pkg_data;
+	int task_id;
+	std::string hash;
+};
+
 static OrbisBgftInitParams s_bgft_init_params;
 
 static bool s_bgft_initialized = false;
 
+static std::map<std::string, ArchivePkgInstallData *> archive_pkg_install_data_list;
+static std::map<std::string, SplitPkgInstallData *> split_pkg_install_data_list;
+
 namespace INSTALLER
 {
 	int Init(void)
@@ -101,22 +109,22 @@ namespace INSTALLER
 		s_bgft_initialized = false;
 	}
 
-    std::string GetRemotePkgTitle(RemoteClient *client, const std::string &path, pkg_header *header)
-    {
+	std::string GetRemotePkgTitle(RemoteClient *client, const std::string &path, pkg_header *header)
+	{
 		size_t entry_count = BE32(header->pkg_entry_count);
 		uint32_t entry_table_offset = BE32(header->pkg_table_offset);
 		uint64_t entry_table_size = entry_count * sizeof(pkg_table_entry);
 		void *entry_table_data = malloc(entry_table_size);
 
-        int ret = client->GetRange(path, entry_table_data, entry_table_size, entry_table_offset);
-        if (ret == 0)
-        {
-            free(entry_table_data);
-            return "";
-        }
+		int ret = client->GetRange(path, entry_table_data, entry_table_size, entry_table_offset);
+		if (ret == 0)
+		{
+			free(entry_table_data);
+			return "";
+		}
 
 		pkg_table_entry *entries = (pkg_table_entry *)entry_table_data;
-		void* param_sfo_data = nullptr;
+		void *param_sfo_data = nullptr;
 		uint32_t param_sfo_offset = 0;
 		uint32_t param_sfo_size = 0;
 		for (size_t i = 0; i < entry_count; ++i)
@@ -126,7 +134,7 @@ namespace INSTALLER
 				param_sfo_offset = BE32(entries[i].offset);
 				param_sfo_size = BE32(entries[i].size);
 				break;
-            }
+			}
 		}
 		free(entry_table_data);
 
@@ -134,10 +142,10 @@ namespace INSTALLER
 		if (param_sfo_offset > 0 && param_sfo_size > 0)
 		{
 			param_sfo_data = malloc(param_sfo_size);
-            int ret = client->GetRange(path, param_sfo_data, param_sfo_size, param_sfo_offset);
-            if (ret)
+			int ret = client->GetRange(path, param_sfo_data, param_sfo_size, param_sfo_offset);
+			if (ret)
 			{
-				const char* tmp_title = SFO::GetString((const char*)param_sfo_data, param_sfo_size, "TITLE");
+				const char *tmp_title = SFO::GetString((const char *)param_sfo_data, param_sfo_size, "TITLE");
 				if (tmp_title != nullptr)
 					title = std::string(tmp_title);
 			}
@@ -145,7 +153,7 @@ namespace INSTALLER
 		}
 
 		return title;
-    }
+	}
 
 	std::string GetLocalPkgTitle(const std::string &path, pkg_header *header)
 	{
@@ -159,7 +167,7 @@ namespace INSTALLER
 		FS::Read(fd, entry_table_data, entry_table_size);
 
 		pkg_table_entry *entries = (pkg_table_entry *)entry_table_data;
-		void* param_sfo_data = NULL;
+		void *param_sfo_data = NULL;
 		uint32_t param_sfo_offset = 0;
 		uint32_t param_sfo_size = 0;
 		void *icon0_png_data = NULL;
@@ -182,7 +190,7 @@ namespace INSTALLER
 			param_sfo_data = malloc(param_sfo_size);
 			FS::Seek(fd, param_sfo_offset);
 			FS::Read(fd, param_sfo_data, param_sfo_size);
-			const char* tmp_title = SFO::GetString((const char*)param_sfo_data, param_sfo_size, "TITLE");
+			const char *tmp_title = SFO::GetString((const char *)param_sfo_data, param_sfo_size, "TITLE");
 			if (tmp_title != nullptr)
 				title = std::string(tmp_title);
 			free(param_sfo_data);
@@ -196,7 +204,7 @@ namespace INSTALLER
 		if (strlen(remote_settings->username) == 0 && strlen(remote_settings->password) == 0 &&
 			(remoteclient->clientType() == CLIENT_TYPE_WEBDAV || remoteclient->clientType() == CLIENT_TYPE_HTTP_SERVER))
 		{
-			std::string full_url = WebDAV::GetHttpUrl(remote_settings->server + path);
+			std::string full_url = WebDAVClient::GetHttpUrl(remote_settings->server + path);
 			size_t scheme_pos = full_url.find("://");
 			if (scheme_pos == std::string::npos)
 				return "";
@@ -206,32 +214,74 @@ namespace INSTALLER
 
 			if (encodeUrl)
 			{
-				Web::Urn::Path uri(path);
-				CURL *curl = curl_easy_init();
-				path = uri.quote(curl);
-				curl_easy_cleanup(curl);
+				path = httplib::detail::encode_url(path);
 			}
 
 			return host + path;
 		}
 		else
 		{
-			std::string encoded_path = path;
-			std::string encoded_site_name = remote_settings->site_name;
-			Web::Urn::Path uri(encoded_path);
-			Web::Urn::Path site_name(encoded_site_name);
-			CURL *curl = curl_easy_init();
-			encoded_path = uri.quote(curl);
-			encoded_site_name = site_name.quote(curl);
-			curl_easy_cleanup(curl);
-			std::string full_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/rmt_inst" + encoded_site_name + encoded_path;
-
+			std::string encoded_path = httplib::detail::encode_url(path);
+			std::string encoded_site_name = httplib::detail::encode_url(remote_settings->site_name);
+			std::string full_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/rmt_inst/" + encoded_site_name + encoded_path;
 			return full_url;
 		}
 
 		return "";
 	}
 
+	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;
+				bytes_to_download = progress_info.length;
+				bytes_transfered = progress_info.transferred;
+			}
+			sceSystemServicePowerTick();
+			sceKernelUsleep(500000);
+		}
+	finish:
+		if (bg_check_data->archive_pkg_data != nullptr)
+		{
+			bg_check_data->archive_pkg_data->stop_write_thread = true;
+			pthread_join(bg_check_data->archive_pkg_data->thread, NULL);
+			delete (bg_check_data->archive_pkg_data->split_file);
+			free(bg_check_data->archive_pkg_data);
+			RemoveArchivePkgInstallData(bg_check_data->hash);
+			free(bg_check_data);
+		}
+		else if (bg_check_data->split_pkg_data != nullptr)
+		{
+			bg_check_data->split_pkg_data->stop_write_thread = true;
+			bg_check_data->split_pkg_data->split_file->Close();
+			pthread_join(bg_check_data->split_pkg_data->thread, NULL);
+			delete (bg_check_data->split_pkg_data->split_file);
+			if (bg_check_data->split_pkg_data->delete_client)
+				delete (bg_check_data->split_pkg_data->remote_client);
+			free(bg_check_data->split_pkg_data);
+			RemoveSplitPkgInstallData(bg_check_data->hash);
+			free(bg_check_data);
+		}
+		activity_inprogess = false;
+		file_transfering = false;
+		Windows::SetModalMode(false);
+		return nullptr;
+	}
+
 	bool canInstallRemotePkg(const std::string &url)
 	{
 		return true;
@@ -252,6 +302,7 @@ namespace INSTALLER
 		uint32_t content_type = BE32(header->pkg_content_type);
 		uint32_t flags = BE32(header->pkg_content_flags);
 		bool is_patch = false;
+		bool completed = false;
 
 		switch (content_type)
 		{
@@ -323,7 +374,9 @@ namespace INSTALLER
 				{
 					ret = sceAppInstUtilAppUnInstall(cid.c_str());
 					if (ret != 0)
+					{
 						goto err;
+					}
 					goto retry;
 				}
 			}
@@ -336,8 +389,9 @@ namespace INSTALLER
 			}
 		}
 		else if (ret > 0)
+		{
 			goto err;
-
+		}
 		ret = sceBgftServiceDownloadStartTask(task_id);
 		if (ret)
 		{
@@ -345,22 +399,40 @@ namespace INSTALLER
 		}
 
 		Util::Notify("%s queued", display_title.c_str());
-
 		if (prompt)
 		{
 			file_transfering = true;
-			bytes_to_download = 100;
+			bytes_to_download = header->pkg_content_size;
 			bytes_transfered = 0;
-			while (bytes_transfered < 99)
+			sceRtcGetCurrentTick(&prev_tick);
+
+			while (!completed)
 			{
 				memset(&progress_info, 0, sizeof(progress_info));
 				ret = sceBgftServiceDownloadGetProgress(task_id, &progress_info);
 				if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
 					return 0;
-				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;
+					bytes_to_download = progress_info.length;
+					bytes_transfered = progress_info.transferred;
+				}
 				sceSystemServicePowerTick();
 			}
 		}
+		else
+		{
+			BgProgressCheck *bg_check_data = (BgProgressCheck *)malloc(sizeof(BgProgressCheck));
+			memset(bg_check_data, 0, sizeof(BgProgressCheck));
+			bg_check_data->archive_pkg_data = nullptr;
+			bg_check_data->split_pkg_data = nullptr;
+			bg_check_data->task_id = task_id;
+			bg_check_data->hash = "";
+			ret = pthread_create(&bk_install_thid, NULL, CheckBgInstallTaskThread, bg_check_data);
+			return 1;
+		}
 
 		return 1;
 	err:
@@ -371,6 +443,8 @@ namespace INSTALLER
 	{
 		int ret;
 		pkg_header header;
+		bool completed = false;
+
 		memset(&header, 0, sizeof(header));
 		if (FS::Head(path.c_str(), (void *)&header, sizeof(header)) == 0)
 			return 0;
@@ -430,15 +504,23 @@ namespace INSTALLER
 		Util::Notify("%s queued", display_title.c_str());
 
 		file_transfering = true;
-		bytes_to_download = 100;
+		bytes_to_download = header.pkg_content_size;
 		bytes_transfered = 0;
-		while (bytes_transfered < 99)
+		sceRtcGetCurrentTick(&prev_tick);
+
+		while (!completed)
 		{
 			memset(&progress_info, 0, sizeof(progress_info));
 			ret = sceBgftServiceDownloadGetProgress(task_id, &progress_info);
 			if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
 				return 0;
-			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;
+				bytes_to_download = progress_info.length;
+				bytes_transfered = progress_info.transferred;
+			}
 			sceSystemServicePowerTick();
 		}
 		return 1;
@@ -450,12 +532,14 @@ namespace INSTALLER
 	int InstallLocalPkg(const std::string &path, pkg_header *header, bool remove_after_install)
 	{
 		int ret;
+		bool completed = false;
+
 		if (strncmp(path.c_str(), "/data/", 6) != 0 &&
 			strncmp(path.c_str(), "/user/data/", 11) != 0 &&
 			strncmp(path.c_str(), "/mnt/usb", 8) != 0)
 			return -1;
 
-		std::string filename = path.substr(path.find_last_of("/")+1);
+		std::string filename = path.substr(path.find_last_of("/") + 1);
 		char filepath[1024];
 		snprintf(filepath, 1023, "%s", path.c_str());
 		if (strncmp(path.c_str(), "/data/", 6) == 0)
@@ -533,17 +617,24 @@ namespace INSTALLER
 		}
 
 		sprintf(activity_message, "%s", lang_strings[STR_WAIT_FOR_INSTALL_MSG]);
-		bytes_to_download = 1;
+		bytes_to_download = header->pkg_content_size;
 		bytes_transfered = 0;
-		while (prog < 99)
+		sceRtcGetCurrentTick(&prev_tick);
+
+		while (!completed)
 		{
 			memset(&progress_info, 0, sizeof(progress_info));
 			ret = sceBgftServiceDownloadGetProgress(task_id, &progress_info);
 			if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
 				return -3;
-			prog = (uint32_t)(((float)progress_info.transferred / progress_info.length) * 100.f);
-			bytes_to_download = progress_info.length;
-			bytes_transfered = progress_info.transferred;
+
+			if (progress_info.length > 0)
+			{
+				completed = progress_info.transferred == progress_info.length;
+				bytes_to_download = progress_info.length;
+				bytes_transfered = progress_info.transferred;
+			}
+			sceSystemServicePowerTick();
 		}
 		if (auto_delete_tmp_pkg)
 			FS::Rm(path);
@@ -568,7 +659,7 @@ namespace INSTALLER
 		FS::Read(fd, entry_table_data, entry_table_size);
 
 		pkg_table_entry *entries = (pkg_table_entry *)entry_table_data;
-		void* param_sfo_data = NULL;
+		void *param_sfo_data = NULL;
 		uint32_t param_sfo_offset = 0;
 		uint32_t param_sfo_size = 0;
 		void *icon0_png_data = NULL;
@@ -639,7 +730,7 @@ namespace INSTALLER
 			return false;
 
 		pkg_table_entry *entries = (pkg_table_entry *)entry_table_data;
-		void* param_sfo_data = NULL;
+		void *param_sfo_data = NULL;
 		uint32_t param_sfo_offset = 0;
 		uint32_t param_sfo_size = 0;
 		void *icon0_png_data = NULL;
@@ -699,4 +790,384 @@ namespace INSTALLER
 
 		return true;
 	}
+
+	ArchivePkgInstallData *GetArchivePkgInstallData(const std::string &hash)
+	{
+		return archive_pkg_install_data_list[hash];
+	}
+
+	void AddArchivePkgInstallData(const std::string &hash, ArchivePkgInstallData *pkg_data)
+	{
+		std::pair<std::string, ArchivePkgInstallData *> pair = std::make_pair(hash, pkg_data);
+		archive_pkg_install_data_list.erase(hash);
+		archive_pkg_install_data_list.insert(pair);
+	}
+
+	void RemoveArchivePkgInstallData(const std::string &hash)
+	{
+		archive_pkg_install_data_list.erase(hash);
+	}
+
+	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);
+
+		int ret;
+		std::string cid = std::string((char *)header.pkg_content_id);
+		cid = cid.substr(cid.find_first_of("-") + 1, 9);
+		std::string display_title = cid;
+		int user_id;
+		ret = sceUserServiceGetForegroundUser(&user_id);
+		const char *package_type;
+		uint32_t content_type = BE32(header.pkg_content_type);
+		uint32_t flags = BE32(header.pkg_content_flags);
+		bool is_patch = false;
+		bool completed = false;
+
+		switch (content_type)
+		{
+		case PKG_CONTENT_TYPE_GD:
+			package_type = "PS4GD";
+			break;
+		case PKG_CONTENT_TYPE_AC:
+			package_type = "PS4AC";
+			break;
+		case PKG_CONTENT_TYPE_AL:
+			package_type = "PS4AL";
+			break;
+		case PKG_CONTENT_TYPE_DP:
+			package_type = "PS4DP";
+			break;
+		default:
+			package_type = NULL;
+			return 0;
+			break;
+		}
+
+		if (flags & PKG_CONTENT_FLAGS_FIRST_PATCH ||
+			flags & PKG_CONTENT_FLAGS_SUBSEQUENT_PATCH ||
+			flags & PKG_CONTENT_FLAGS_DELTA_PATCH ||
+			flags & PKG_CONTENT_FLAGS_CUMULATIVE_PATCH)
+		{
+			is_patch = true;
+		}
+
+		std::string hash = Util::UrlHash(path);
+		std::string full_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/archive_inst/" + hash;
+		AddArchivePkgInstallData(hash, pkg_data);
+
+		OrbisBgftTaskProgress progress_info;
+		OrbisBgftDownloadParam params;
+		memset(&params, 0, sizeof(params));
+		{
+			params.userId = user_id;
+			params.entitlementType = 5;
+			params.id = (char *)header.pkg_content_id;
+			params.contentUrl = full_url.c_str();
+			params.contentName = display_title.c_str();
+			params.iconPath = "";
+			params.playgoScenarioId = "0";
+			params.option = ORBIS_BGFT_TASK_OPT_DISABLE_CDN_QUERY_PARAM;
+			params.packageType = package_type;
+			params.packageSubType = "";
+			params.packageSize = BE64(header.pkg_size);
+		}
+
+	retry:
+		int task_id = -1;
+		if (!is_patch)
+			ret = sceBgftServiceIntDownloadRegisterTask(&params, &task_id);
+		else
+			ret = sceBgftServiceIntDebugDownloadRegisterPkg(&params, &task_id);
+		if (ret == 0x80990088 || ret == 0x80990015)
+		{
+			if (!bg)
+			{
+				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)
+				{
+					ret = sceAppInstUtilAppUnInstall(cid.c_str());
+					if (ret != 0)
+					{
+						ret = 0;
+						goto finish;
+					}
+					goto retry;
+				}
+			}
+			else
+			{
+				ret = sceAppInstUtilAppUnInstall(cid.c_str());
+				if (ret != 0)
+				{
+					ret = 0;
+					goto finish;
+				}
+				goto retry;
+			}
+		}
+		else if (ret > 0)
+		{
+			ret = 0;
+			goto finish;
+		}
+
+		ret = sceBgftServiceDownloadStartTask(task_id);
+		if (ret)
+		{
+			ret = 0;
+			goto finish;
+		}
+
+		Util::Notify("%s queued", display_title.c_str());
+
+		if (!bg)
+		{
+			file_transfering = true;
+			bytes_to_download = header.pkg_content_size;
+			bytes_transfered = 0;
+			sceRtcGetCurrentTick(&prev_tick);
+
+			while (!completed)
+			{
+				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;
+				}
+				if (progress_info.length > 0)
+				{
+					completed = progress_info.transferred == progress_info.length;
+					bytes_to_download = progress_info.length;
+					bytes_transfered = progress_info.transferred;
+				}
+				sceSystemServicePowerTick();
+			}
+		}
+		else
+		{
+			BgProgressCheck *bg_check_data = (BgProgressCheck *)malloc(sizeof(BgProgressCheck));
+			memset(bg_check_data, 0, sizeof(BgProgressCheck));
+			bg_check_data->archive_pkg_data = pkg_data;
+			bg_check_data->split_pkg_data = nullptr;
+			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);
+		RemoveArchivePkgInstallData(hash);
+		return ret;
+	}
+
+	SplitPkgInstallData *GetSplitPkgInstallData(const std::string &hash)
+	{
+		return split_pkg_install_data_list[hash];
+	}
+
+	void AddSplitPkgInstallData(const std::string &hash, SplitPkgInstallData *pkg_data)
+	{
+		std::pair<std::string, SplitPkgInstallData *> pair = std::make_pair(hash, pkg_data);
+		split_pkg_install_data_list.erase(hash);
+		split_pkg_install_data_list.insert(pair);
+	}
+
+	void RemoveSplitPkgInstallData(const std::string &hash)
+	{
+		split_pkg_install_data_list.erase(hash);
+	}
+
+	bool InstallSplitPkg(const std::string &path, SplitPkgInstallData *pkg_data, bool bg)
+	{
+		pkg_header header;
+		pkg_data->split_file->Read((char *)&header, sizeof(pkg_header), 0);
+
+		int ret;
+		std::string cid = std::string((char *)header.pkg_content_id);
+		cid = cid.substr(cid.find_first_of("-") + 1, 9);
+		std::string display_title = cid;
+		int user_id;
+		ret = sceUserServiceGetForegroundUser(&user_id);
+		const char *package_type;
+		uint32_t content_type = BE32(header.pkg_content_type);
+		uint32_t flags = BE32(header.pkg_content_flags);
+		bool is_patch = false;
+		bool completed = false;
+
+		switch (content_type)
+		{
+		case PKG_CONTENT_TYPE_GD:
+			package_type = "PS4GD";
+			break;
+		case PKG_CONTENT_TYPE_AC:
+			package_type = "PS4AC";
+			break;
+		case PKG_CONTENT_TYPE_AL:
+			package_type = "PS4AL";
+			break;
+		case PKG_CONTENT_TYPE_DP:
+			package_type = "PS4DP";
+			break;
+		default:
+			package_type = NULL;
+			return 0;
+			break;
+		}
+
+		if (flags & PKG_CONTENT_FLAGS_FIRST_PATCH ||
+			flags & PKG_CONTENT_FLAGS_SUBSEQUENT_PATCH ||
+			flags & PKG_CONTENT_FLAGS_DELTA_PATCH ||
+			flags & PKG_CONTENT_FLAGS_CUMULATIVE_PATCH)
+		{
+			is_patch = true;
+		}
+
+		std::string hash = Util::UrlHash(path);
+		std::string full_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/split_inst/" + hash;
+		AddSplitPkgInstallData(hash, pkg_data);
+
+		OrbisBgftTaskProgress progress_info;
+		OrbisBgftDownloadParam params;
+		memset(&params, 0, sizeof(params));
+		{
+			params.userId = user_id;
+			params.entitlementType = 5;
+			params.id = (char *)header.pkg_content_id;
+			params.contentUrl = full_url.c_str();
+			params.contentName = display_title.c_str();
+			params.iconPath = "";
+			params.playgoScenarioId = "0";
+			params.option = ORBIS_BGFT_TASK_OPT_DISABLE_CDN_QUERY_PARAM;
+			params.packageType = package_type;
+			params.packageSubType = "";
+			params.packageSize = BE64(header.pkg_size);
+		}
+
+	retry:
+		int task_id = -1;
+		if (!is_patch)
+			ret = sceBgftServiceIntDownloadRegisterTask(&params, &task_id);
+		else
+			ret = sceBgftServiceIntDebugDownloadRegisterPkg(&params, &task_id);
+		if (ret == 0x80990088 || ret == 0x80990015)
+		{
+			if (!bg)
+			{
+				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)
+				{
+					ret = sceAppInstUtilAppUnInstall(cid.c_str());
+					if (ret != 0)
+					{
+						ret = 0;
+						goto finish;
+					}
+					goto retry;
+				}
+			}
+			else
+			{
+				ret = sceAppInstUtilAppUnInstall(cid.c_str());
+				if (ret != 0)
+				{
+					ret = 0;
+					goto finish;
+				}
+				goto retry;
+			}
+		}
+		else if (ret > 0)
+		{
+			ret = 0;
+			goto finish;
+		}
+
+		ret = sceBgftServiceDownloadStartTask(task_id);
+		if (ret)
+		{
+			ret = 0;
+			goto finish;
+		}
+
+		Util::Notify("%s queued", display_title.c_str());
+
+		if (!bg)
+		{
+			file_transfering = true;
+			bytes_to_download = pkg_data->size;
+			bytes_transfered = 0;
+			sceRtcGetCurrentTick(&prev_tick);
+
+			while (!completed)
+			{
+				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;
+				}
+				if (progress_info.length > 0)
+				{
+					completed = progress_info.transferred == progress_info.length;
+					bytes_to_download = progress_info.length;
+					bytes_transfered = progress_info.transferred;
+				}
+				sceSystemServicePowerTick();
+			}
+		}
+		else
+		{
+			BgProgressCheck *bg_check_data = (BgProgressCheck *)malloc(sizeof(BgProgressCheck));
+			memset(bg_check_data, 0, sizeof(BgProgressCheck));
+			bg_check_data->split_pkg_data = pkg_data;
+			bg_check_data->archive_pkg_data = nullptr;
+			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;
+		pkg_data->split_file->Close();
+		pthread_join(pkg_data->thread, NULL);
+		delete (pkg_data->split_file);
+		if (pkg_data->delete_client)
+			delete (pkg_data->remote_client);
+		free(pkg_data);
+		RemoveSplitPkgInstallData(hash);
+		activity_inprogess = false;
+		file_transfering = false;
+		Windows::SetModalMode(false);
+		return ret;
+	}
 }

source/installer.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include "clients/remote_client.h"
+#include "zip_util.h"
+#include "split_file.h"
+#include "pthread.h"
 
 #define SWAP16(x)                                         \
     ((uint16_t)((((uint16_t)(x)&UINT16_C(0x00FF)) << 8) | \
@@ -46,6 +49,8 @@
 #define PKG_ENTRY_ID__PARAM_SFO 0x1000
 #define PKG_ENTRY_ID__ICON0_PNG 0x1200
 
+#define INSTALL_ARCHIVE_PKG_SPLIT_SIZE 10485760
+
 typedef struct
 {
     uint32_t pkg_magic;                 // 0x000 - 0x7F434E54
@@ -116,6 +121,27 @@ enum pkg_content_type
     PKG_CONTENT_TYPE_DP = 0x1E, /* pkg_ps4_delta_patch */
 };
 
+struct ArchivePkgInstallData
+{
+    SplitFile *split_file;
+    ArchiveEntry *archive_entry;
+    pthread_t thread;
+    bool stop_write_thread;
+};
+
+struct SplitPkgInstallData
+{
+    SplitFile *split_file;
+    RemoteClient *remote_client;
+    std::string path;
+    int64_t size;
+    pthread_t thread;
+    bool stop_write_thread;
+    bool delete_client;
+};
+
+static pthread_t bk_install_thid;
+
 namespace INSTALLER
 {
     int Init(void);
@@ -130,4 +156,12 @@ namespace INSTALLER
     bool ExtractRemotePkg(const std::string &path, const std::string sfo_path, const std::string icon_path);
     std::string GetRemotePkgTitle(RemoteClient *client, const std::string &path, pkg_header *header);
     std::string GetLocalPkgTitle(const std::string &path, pkg_header *header);
+    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 bg = false);
+    SplitPkgInstallData *GetSplitPkgInstallData(const std::string &hash);
+    void AddSplitPkgInstallData(const std::string &hash, SplitPkgInstallData *pkg_data);
+    void RemoveSplitPkgInstallData(const std::string &hash);
+    bool InstallSplitPkg(const std::string &path, SplitPkgInstallData* pkg_data, bool bg = false);
 }

source/lang.cpp

@@ -10,164 +10,170 @@ 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
+	"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
+	"Enable disk caching. Can improve package install speed in cases where connection to remote is slow",          // STR_ENABLE_DISC_CACHE_MSG
+	"DC",                                                                                             // STR_ENABLE_DISK_CACHE
 };
 
 bool needs_extended_font = false;
@@ -181,7 +187,7 @@ namespace Lang
 
 		std::string lang = std::string(language);
 		lang = Util::Trim(lang, " ");
-		if (lang.size() > 0)
+		if (lang.size() > 0 && lang.compare("Default") != 0)
 		{
 			sprintf(langFile, "/app0/assets/langs/%s.ini", lang.c_str());
 		}

source/lang.h

@@ -1,167 +1,173 @@
-#ifndef __LANG_H__
-#define __LANG_H__
+#ifndef __EZ_LANG_H__
+#define __EZ_LANG_H__
 
 #include "config.h"
 
-#define FOREACH_STR(FUNC)                \
-	FUNC(STR_CONNECTION_SETTINGS)        \
-	FUNC(STR_SITE)                       \
-	FUNC(STR_LOCAL)                      \
-	FUNC(STR_REMOTE)                     \
-	FUNC(STR_MESSAGES)                   \
-	FUNC(STR_UPDATE_SOFTWARE)            \
-	FUNC(STR_CONNECT)                    \
-	FUNC(STR_DISCONNECT)                 \
-	FUNC(STR_SEARCH)                     \
-	FUNC(STR_REFRESH)                    \
-	FUNC(STR_SERVER)                     \
-	FUNC(STR_USERNAME)                   \
-	FUNC(STR_PASSWORD)                   \
-	FUNC(STR_PORT)                       \
-	FUNC(STR_PASV)                       \
-	FUNC(STR_DIRECTORY)                  \
-	FUNC(STR_FILTER)                     \
-	FUNC(STR_YES)                        \
-	FUNC(STR_NO)                         \
-	FUNC(STR_CANCEL)                     \
-	FUNC(STR_CONTINUE)                   \
-	FUNC(STR_CLOSE)                      \
-	FUNC(STR_FOLDER)                     \
-	FUNC(STR_FILE)                       \
-	FUNC(STR_TYPE)                       \
-	FUNC(STR_NAME)                       \
-	FUNC(STR_SIZE)                       \
-	FUNC(STR_DATE)                       \
-	FUNC(STR_NEW_FOLDER)                 \
-	FUNC(STR_RENAME)                     \
-	FUNC(STR_DELETE)                     \
-	FUNC(STR_UPLOAD)                     \
-	FUNC(STR_DOWNLOAD)                   \
-	FUNC(STR_SELECT_ALL)                 \
-	FUNC(STR_CLEAR_ALL)                  \
-	FUNC(STR_UPLOADING)                  \
-	FUNC(STR_DOWNLOADING)                \
-	FUNC(STR_OVERWRITE)                  \
-	FUNC(STR_DONT_OVERWRITE)             \
-	FUNC(STR_ASK_FOR_CONFIRM)            \
-	FUNC(STR_DONT_ASK_CONFIRM)           \
-	FUNC(STR_ALLWAYS_USE_OPTION)         \
-	FUNC(STR_ACTIONS)                    \
-	FUNC(STR_CONFIRM)                    \
-	FUNC(STR_OVERWRITE_OPTIONS)          \
-	FUNC(STR_PROPERTIES)                 \
-	FUNC(STR_PROGRESS)                   \
-	FUNC(STR_UPDATES)                    \
-	FUNC(STR_DEL_CONFIRM_MSG)            \
-	FUNC(STR_CANCEL_ACTION_MSG)          \
-	FUNC(STR_FAIL_UPLOAD_MSG)            \
-	FUNC(STR_FAIL_DOWNLOAD_MSG)          \
-	FUNC(STR_FAIL_READ_LOCAL_DIR_MSG)    \
-	FUNC(STR_CONNECTION_CLOSE_ERR_MSG)   \
-	FUNC(STR_REMOTE_TERM_CONN_MSG)       \
-	FUNC(STR_FAIL_LOGIN_MSG)             \
-	FUNC(STR_FAIL_TIMEOUT_MSG)           \
-	FUNC(STR_FAIL_DEL_DIR_MSG)           \
-	FUNC(STR_DELETING)                   \
-	FUNC(STR_FAIL_DEL_FILE_MSG)          \
-	FUNC(STR_DELETED)                    \
-	FUNC(STR_LINK)                       \
-	FUNC(STR_SHARE)                      \
-	FUNC(STR_FAILED)                     \
-	FUNC(STR_FAIL_CREATE_LOCAL_FILE_MSG) \
-	FUNC(STR_INSTALL)                    \
-	FUNC(STR_INSTALLING)                 \
-	FUNC(STR_INSTALL_SUCCESS)            \
-	FUNC(STR_INSTALL_FAILED)             \
-	FUNC(STR_INSTALL_SKIPPED)            \
-	FUNC(STR_CHECK_HTTP_MSG)             \
-	FUNC(STR_FAILED_HTTP_CHECK)          \
-	FUNC(STR_REMOTE_NOT_HTTP)            \
-	FUNC(STR_INSTALL_FROM_DATA_MSG)      \
-	FUNC(STR_ALREADY_INSTALLED_MSG)      \
-	FUNC(STR_INSTALL_FROM_URL)           \
-	FUNC(STR_CANNOT_READ_PKG_HDR_MSG)    \
-	FUNC(STR_FAVORITE_URLS)              \
-	FUNC(STR_SLOT)                       \
-	FUNC(STR_EDIT)                       \
-	FUNC(STR_ONETIME_URL)                \
-	FUNC(STR_NOT_A_VALID_PACKAGE)        \
-	FUNC(STR_WAIT_FOR_INSTALL_MSG)       \
-	FUNC(STR_FAIL_INSTALL_TMP_PKG_MSG)   \
-	FUNC(STR_FAIL_TO_OBTAIN_GG_DL_MSG)   \
-	FUNC(STR_AUTO_DELETE_TMP_PKG)        \
-	FUNC(STR_PROTOCOL_NOT_SUPPORTED)     \
-	FUNC(STR_COULD_NOT_RESOLVE_HOST)     \
-	FUNC(STR_EXTRACT)                    \
-	FUNC(STR_EXTRACTING)                 \
-	FUNC(STR_FAILED_TO_EXTRACT)          \
-	FUNC(STR_EXTRACT_LOCATION)           \
-	FUNC(STR_COMPRESS)                   \
-	FUNC(STR_ZIP_FILE_PATH)              \
-	FUNC(STR_COMPRESSING)                \
-	FUNC(STR_ERROR_CREATE_ZIP)           \
-	FUNC(STR_UNSUPPORTED_FILE_FORMAT)    \
-	FUNC(STR_CUT)                        \
-	FUNC(STR_COPY)                       \
-	FUNC(STR_PASTE)                      \
-	FUNC(STR_MOVING)                     \
-	FUNC(STR_COPYING)                    \
-	FUNC(STR_FAIL_MOVE_MSG)              \
-	FUNC(STR_FAIL_COPY_MSG)              \
-	FUNC(STR_CANT_MOVE_TO_SUBDIR_MSG)    \
-	FUNC(STR_CANT_COPY_TO_SUBDIR_MSG)    \
-	FUNC(STR_UNSUPPORTED_OPERATION_MSG)  \
-	FUNC(STR_HTTP_PORT)                  \
-	FUNC(STR_REINSTALL_CONFIRM_MSG)      \
-	FUNC(STR_REMOTE_NOT_SUPPORT_MSG)     \
-	FUNC(STR_CANNOT_CONNECT_REMOTE_MSG)  \
-	FUNC(STR_DOWNLOAD_INSTALL_MSG)       \
-	FUNC(STR_CHECKING_REMOTE_SERVER_MSG) \
-	FUNC(STR_ENABLE_RPI)                 \
-	FUNC(STR_ENABLE_RPI_FTP_SMB_MSG)     \
-	FUNC(STR_ENABLE_RPI_WEBDAV_MSG)      \
-	FUNC(STR_FILES)                      \
-	FUNC(STR_EDITOR)                     \
-	FUNC(STR_SAVE)                       \
-	FUNC(STR_MAX_EDIT_FILE_SIZE_MSG)     \
-	FUNC(STR_DELETE_LINE)                \
-	FUNC(STR_INSERT_LINE)                \
-	FUNC(STR_MODIFIED)                   \
-	FUNC(STR_FAIL_GET_TOKEN_MSG)         \
-	FUNC(STR_GET_TOKEN_SUCCESS_MSG)      \
-	FUNC(STR_PERM_DRIVE)                 \
-	FUNC(STR_PERM_DRIVE_APPDATA)         \
-	FUNC(STR_PERM_DRIVE_FILE)            \
-	FUNC(STR_PERM_DRIVE_METADATA)        \
-	FUNC(STR_PERM_DRIVE_METADATA_RO)     \
-	FUNC(STR_GOOGLE_LOGIN_FAIL_MSG)      \
-	FUNC(STR_GOOGLE_LOGIN_TIMEOUT_MSG)   \
-	FUNC(STR_NEW_FILE)                   \
-	FUNC(STR_SETTINGS)                   \
-	FUNC(STR_CLIENT_ID)                  \
-	FUNC(STR_CLIENT_SECRET)              \
-	FUNC(STR_GLOBAL)                     \
-	FUNC(STR_GOOGLE)                     \
-	FUNC(STR_COPY_LINE)                  \
-	FUNC(STR_PASTE_LINE)                 \
-	FUNC(STR_SHOW_HIDDEN_FILES)          \
-	FUNC(STR_SET_DEFAULT_DIRECTORY)      \
-	FUNC(STR_SET_DEFAULT_DIRECTORY_MSG)  \
-	FUNC(STR_VIEW_IMAGE)                 \
-	FUNC(STR_VIEW_PKG_INFO)              \
-	FUNC(STR_NFS_EXP_PATH_MISSING_MSG)   \
-	FUNC(STR_FAIL_INIT_NFS_CONTEXT)      \
-	FUNC(STR_FAIL_MOUNT_NFS_MSG)         \
-	FUNC(STR_WEB_SERVER)                 \
-	FUNC(STR_ENABLE)                     \
-	FUNC(STR_COMPRESSED_FILE_PATH)       \
-	FUNC(STR_COMPRESSED_FILE_PATH_MSG)   \
-	FUNC(STR_ALLDEBRID)                  \
-	FUNC(STR_API_KEY)                    \
-	FUNC(STR_CANT_EXTRACT_URL_MSG)       \
-	FUNC(STR_FAIL_INSTALL_FROM_URL_MSG)  \
-	FUNC(STR_INVALID_URL)                \
-	FUNC(STR_ALLDEBRID_API_KEY_MISSING_MSG)
+#define FOREACH_STR(FUNC)                   \
+	FUNC(STR_CONNECTION_SETTINGS)           \
+	FUNC(STR_SITE)                          \
+	FUNC(STR_LOCAL)                         \
+	FUNC(STR_REMOTE)                        \
+	FUNC(STR_MESSAGES)                      \
+	FUNC(STR_UPDATE_SOFTWARE)               \
+	FUNC(STR_CONNECT)                       \
+	FUNC(STR_DISCONNECT)                    \
+	FUNC(STR_SEARCH)                        \
+	FUNC(STR_REFRESH)                       \
+	FUNC(STR_SERVER)                        \
+	FUNC(STR_USERNAME)                      \
+	FUNC(STR_PASSWORD)                      \
+	FUNC(STR_PORT)                          \
+	FUNC(STR_PASV)                          \
+	FUNC(STR_DIRECTORY)                     \
+	FUNC(STR_FILTER)                        \
+	FUNC(STR_YES)                           \
+	FUNC(STR_NO)                            \
+	FUNC(STR_CANCEL)                        \
+	FUNC(STR_CONTINUE)                      \
+	FUNC(STR_CLOSE)                         \
+	FUNC(STR_FOLDER)                        \
+	FUNC(STR_FILE)                          \
+	FUNC(STR_TYPE)                          \
+	FUNC(STR_NAME)                          \
+	FUNC(STR_SIZE)                          \
+	FUNC(STR_DATE)                          \
+	FUNC(STR_NEW_FOLDER)                    \
+	FUNC(STR_RENAME)                        \
+	FUNC(STR_DELETE)                        \
+	FUNC(STR_UPLOAD)                        \
+	FUNC(STR_DOWNLOAD)                      \
+	FUNC(STR_SELECT_ALL)                    \
+	FUNC(STR_CLEAR_ALL)                     \
+	FUNC(STR_UPLOADING)                     \
+	FUNC(STR_DOWNLOADING)                   \
+	FUNC(STR_OVERWRITE)                     \
+	FUNC(STR_DONT_OVERWRITE)                \
+	FUNC(STR_ASK_FOR_CONFIRM)               \
+	FUNC(STR_DONT_ASK_CONFIRM)              \
+	FUNC(STR_ALLWAYS_USE_OPTION)            \
+	FUNC(STR_ACTIONS)                       \
+	FUNC(STR_CONFIRM)                       \
+	FUNC(STR_OVERWRITE_OPTIONS)             \
+	FUNC(STR_PROPERTIES)                    \
+	FUNC(STR_PROGRESS)                      \
+	FUNC(STR_UPDATES)                       \
+	FUNC(STR_DEL_CONFIRM_MSG)               \
+	FUNC(STR_CANCEL_ACTION_MSG)             \
+	FUNC(STR_FAIL_UPLOAD_MSG)               \
+	FUNC(STR_FAIL_DOWNLOAD_MSG)             \
+	FUNC(STR_FAIL_READ_LOCAL_DIR_MSG)       \
+	FUNC(STR_CONNECTION_CLOSE_ERR_MSG)      \
+	FUNC(STR_REMOTE_TERM_CONN_MSG)          \
+	FUNC(STR_FAIL_LOGIN_MSG)                \
+	FUNC(STR_FAIL_TIMEOUT_MSG)              \
+	FUNC(STR_FAIL_DEL_DIR_MSG)              \
+	FUNC(STR_DELETING)                      \
+	FUNC(STR_FAIL_DEL_FILE_MSG)             \
+	FUNC(STR_DELETED)                       \
+	FUNC(STR_LINK)                          \
+	FUNC(STR_SHARE)                         \
+	FUNC(STR_FAILED)                        \
+	FUNC(STR_FAIL_CREATE_LOCAL_FILE_MSG)    \
+	FUNC(STR_INSTALL)                       \
+	FUNC(STR_INSTALLING)                    \
+	FUNC(STR_INSTALL_SUCCESS)               \
+	FUNC(STR_INSTALL_FAILED)                \
+	FUNC(STR_INSTALL_SKIPPED)               \
+	FUNC(STR_CHECK_HTTP_MSG)                \
+	FUNC(STR_FAILED_HTTP_CHECK)             \
+	FUNC(STR_REMOTE_NOT_HTTP)               \
+	FUNC(STR_INSTALL_FROM_DATA_MSG)         \
+	FUNC(STR_ALREADY_INSTALLED_MSG)         \
+	FUNC(STR_INSTALL_FROM_URL)              \
+	FUNC(STR_CANNOT_READ_PKG_HDR_MSG)       \
+	FUNC(STR_FAVORITE_URLS)                 \
+	FUNC(STR_SLOT)                          \
+	FUNC(STR_EDIT)                          \
+	FUNC(STR_ONETIME_URL)                   \
+	FUNC(STR_NOT_A_VALID_PACKAGE)           \
+	FUNC(STR_WAIT_FOR_INSTALL_MSG)          \
+	FUNC(STR_FAIL_INSTALL_TMP_PKG_MSG)      \
+	FUNC(STR_FAIL_TO_OBTAIN_GG_DL_MSG)      \
+	FUNC(STR_AUTO_DELETE_TMP_PKG)           \
+	FUNC(STR_PROTOCOL_NOT_SUPPORTED)        \
+	FUNC(STR_COULD_NOT_RESOLVE_HOST)        \
+	FUNC(STR_EXTRACT)                       \
+	FUNC(STR_EXTRACTING)                    \
+	FUNC(STR_FAILED_TO_EXTRACT)             \
+	FUNC(STR_EXTRACT_LOCATION)              \
+	FUNC(STR_COMPRESS)                      \
+	FUNC(STR_ZIP_FILE_PATH)                 \
+	FUNC(STR_COMPRESSING)                   \
+	FUNC(STR_ERROR_CREATE_ZIP)              \
+	FUNC(STR_UNSUPPORTED_FILE_FORMAT)       \
+	FUNC(STR_CUT)                           \
+	FUNC(STR_COPY)                          \
+	FUNC(STR_PASTE)                         \
+	FUNC(STR_MOVING)                        \
+	FUNC(STR_COPYING)                       \
+	FUNC(STR_FAIL_MOVE_MSG)                 \
+	FUNC(STR_FAIL_COPY_MSG)                 \
+	FUNC(STR_CANT_MOVE_TO_SUBDIR_MSG)       \
+	FUNC(STR_CANT_COPY_TO_SUBDIR_MSG)       \
+	FUNC(STR_UNSUPPORTED_OPERATION_MSG)     \
+	FUNC(STR_HTTP_PORT)                     \
+	FUNC(STR_REINSTALL_CONFIRM_MSG)         \
+	FUNC(STR_REMOTE_NOT_SUPPORT_MSG)        \
+	FUNC(STR_CANNOT_CONNECT_REMOTE_MSG)     \
+	FUNC(STR_DOWNLOAD_INSTALL_MSG)          \
+	FUNC(STR_CHECKING_REMOTE_SERVER_MSG)    \
+	FUNC(STR_ENABLE_RPI)                    \
+	FUNC(STR_ENABLE_RPI_FTP_SMB_MSG)        \
+	FUNC(STR_ENABLE_RPI_WEBDAV_MSG)         \
+	FUNC(STR_FILES)                         \
+	FUNC(STR_EDITOR)                        \
+	FUNC(STR_SAVE)                          \
+	FUNC(STR_MAX_EDIT_FILE_SIZE_MSG)        \
+	FUNC(STR_DELETE_LINE)                   \
+	FUNC(STR_INSERT_LINE)                   \
+	FUNC(STR_MODIFIED)                      \
+	FUNC(STR_FAIL_GET_TOKEN_MSG)            \
+	FUNC(STR_GET_TOKEN_SUCCESS_MSG)         \
+	FUNC(STR_PERM_DRIVE)                    \
+	FUNC(STR_PERM_DRIVE_APPDATA)            \
+	FUNC(STR_PERM_DRIVE_FILE)               \
+	FUNC(STR_PERM_DRIVE_METADATA)           \
+	FUNC(STR_PERM_DRIVE_METADATA_RO)        \
+	FUNC(STR_GOOGLE_LOGIN_FAIL_MSG)         \
+	FUNC(STR_GOOGLE_LOGIN_TIMEOUT_MSG)      \
+	FUNC(STR_NEW_FILE)                      \
+	FUNC(STR_SETTINGS)                      \
+	FUNC(STR_CLIENT_ID)                     \
+	FUNC(STR_CLIENT_SECRET)                 \
+	FUNC(STR_GLOBAL)                        \
+	FUNC(STR_GOOGLE)                        \
+	FUNC(STR_COPY_LINE)                     \
+	FUNC(STR_PASTE_LINE)                    \
+	FUNC(STR_SHOW_HIDDEN_FILES)             \
+	FUNC(STR_SET_DEFAULT_DIRECTORY)         \
+	FUNC(STR_SET_DEFAULT_DIRECTORY_MSG)     \
+	FUNC(STR_VIEW_IMAGE)                    \
+	FUNC(STR_VIEW_PKG_INFO)                 \
+	FUNC(STR_NFS_EXP_PATH_MISSING_MSG)      \
+	FUNC(STR_FAIL_INIT_NFS_CONTEXT)         \
+	FUNC(STR_FAIL_MOUNT_NFS_MSG)            \
+	FUNC(STR_WEB_SERVER)                    \
+	FUNC(STR_ENABLE)                        \
+	FUNC(STR_COMPRESSED_FILE_PATH)          \
+	FUNC(STR_COMPRESSED_FILE_PATH_MSG)      \
+	FUNC(STR_ALLDEBRID)                     \
+	FUNC(STR_API_KEY)                       \
+	FUNC(STR_CANT_EXTRACT_URL_MSG)          \
+	FUNC(STR_FAIL_INSTALL_FROM_URL_MSG)     \
+	FUNC(STR_INVALID_URL)                   \
+	FUNC(STR_ALLDEBRID_API_KEY_MISSING_MSG) \
+	FUNC(STR_LANGUAGE)                      \
+	FUNC(STR_TEMP_DIRECTORY)                \
+	FUNC(STR_REALDEBRID)                    \
+	FUNC(STR_BACKGROUND_INSTALL_INPROGRESS) \
+	FUNC(STR_ENABLE_DISC_CACHE_MSG)         \
+	FUNC(STR_ENABLE_DISK_CACHE)
 
 #define GET_VALUE(x) x,
 #define GET_STRING(x) #x,
@@ -171,7 +177,7 @@ enum
 	FOREACH_STR(GET_VALUE)
 };
 
-#define LANG_STRINGS_NUM 158
+#define LANG_STRINGS_NUM 164
 #define LANG_ID_SIZE 64
 #define LANG_STR_SIZE 384
 extern char lang_identifiers[LANG_STRINGS_NUM][LANG_ID_SIZE];

source/mem_file.cpp

@@ -0,0 +1,197 @@
+#include <stdio.h>
+#include <stdio.h>
+#include <string>
+
+#include "common.h"
+#include "mem_file.h"
+
+MemFile::MemFile(const std::string &path, size_t block_size)
+{
+    this->block_size = block_size;
+    this->complete = false;
+    sem_init(&this->block_ready, 0, 0);
+}
+
+MemFile::~MemFile()
+{
+    for (int i = 0; i < this->mem_blocks.size(); i++)
+    {
+        if (this->mem_blocks[i] != nullptr && this->mem_blocks[i]->status != MEM_BLOCK_STATUS_DELETED)
+        {
+            if (this->mem_blocks[i]->buf != nullptr)
+            {
+                free(this->mem_blocks[i]->buf);
+                this->mem_blocks[i]->buf = nullptr;
+            }
+            free(this->mem_blocks[i]);
+        }
+    }
+    sem_destroy(&this->block_ready);
+};
+
+int MemFile::Open()
+{
+    this->block_in_progress = NewBlock();
+    this->block_in_progress->buf = malloc(block_size);
+
+    return (block_in_progress->buf == nullptr);
+}
+
+size_t MemFile::Read(char *buf, size_t buf_size, size_t offset)
+{
+    int first_block_num, block_num;
+    size_t block_offset;
+    size_t remaining;
+    size_t bytes_read;
+    size_t total_bytes_read;
+    MemBlock *block;
+    char *p;
+
+    first_block_num= offset / this->block_size;
+    block_num = first_block_num;
+    block_offset = offset % this->block_size;
+
+    while ((block_num >= this->mem_blocks.size() && !this->complete) ||
+           (block_num < this->mem_blocks.size() && this->mem_blocks[block_num]->status == MEM_BLOCK_STATUS_NOT_EXISTS))
+    {
+        sem_wait(&this->block_ready);
+    }
+
+    block = this->mem_blocks[block_num];
+    if (block->status == MEM_BLOCK_STATUS_DELETED)
+    {
+        return -1;
+    }
+
+    if (block_offset > block->size - 1 && this->complete)
+    {
+        // requested offset is pass the end of split file
+        return 0;
+    }
+
+    remaining = buf_size;
+    bool eof = false;
+    total_bytes_read = 0;
+    p = buf;
+
+    while (remaining > 0 && !eof)
+    {
+        uint8_t *src = (uint8_t*)block->buf;
+        src += block_offset;
+        bytes_read = block_size - block_offset;
+        memcpy(p, src, bytes_read);
+
+        if (bytes_read == remaining)
+        {
+            p += bytes_read;
+            total_bytes_read += bytes_read;
+        }
+        else
+        {
+            p += bytes_read;
+            total_bytes_read += bytes_read;
+            if (block->is_last)
+            {
+                eof = true;
+                continue;
+            }
+        }
+
+        remaining -= bytes_read;
+
+        if (remaining == 0)
+            continue;
+
+        block_num++;
+        block_offset = 0;
+
+        while ((block_num > this->mem_blocks.size() - 1 && !this->complete) ||
+               this->mem_blocks[block_num]->status == MEM_BLOCK_STATUS_NOT_EXISTS)
+        {
+            sem_wait(&this->block_ready);
+        }
+
+        block = this->mem_blocks[block_num];
+    }
+
+    // delete blocks before the first read offset block. Assumuption, that reads are always
+    // forward and won't read previously already read blocks. For safety, keeping only current block and 2 previous blocks
+    for (int j=0; j < first_block_num - 2; j++)
+    {
+        if (this->mem_blocks[j]->status == MEM_BLOCK_STATUS_CREATED)
+        {
+            if (this->mem_blocks[j]->buf != nullptr)
+            {
+                free(this->mem_blocks[j]->buf);
+                this->mem_blocks[j]->buf = nullptr;
+            }
+            this->mem_blocks[j]->status = MEM_BLOCK_STATUS_DELETED;
+        }
+    }
+
+    return total_bytes_read;
+}
+
+size_t MemFile::Write(char *buf, size_t buf_size)
+{
+    size_t bytes_written;
+    size_t block_space_remaining;
+    size_t bytes_to_write;
+
+    char *p = buf;
+    size_t total_bytes_written = 0;
+    size_t remaining_to_write = buf_size;
+
+    while (remaining_to_write > 0)
+    {
+        block_space_remaining = this->block_size - block_in_progress->size;
+        bytes_to_write = MIN(remaining_to_write, block_space_remaining);
+        memcpy(block_in_progress->buf, p, bytes_to_write);
+        bytes_written = bytes_to_write;
+        block_in_progress->size += bytes_written;
+        total_bytes_written += bytes_written;
+        remaining_to_write -= bytes_written;
+        block_space_remaining -= bytes_written;
+        p += bytes_written;
+
+        // error if bytes_to_write != bytes_written
+        if (bytes_written != bytes_to_write)
+        {
+            break;
+        }
+
+        if (block_space_remaining == 0)
+        {
+            block_in_progress->status = MEM_BLOCK_STATUS_CREATED;
+            this->mem_blocks.push_back(block_in_progress);
+            sem_post(&this->block_ready);
+
+            block_in_progress = NewBlock();
+        }
+    }
+
+    return total_bytes_written;
+}
+
+int MemFile::Close()
+{
+    block_in_progress->status = MEM_BLOCK_STATUS_CREATED;
+    block_in_progress->is_last = true;
+    this->mem_blocks.push_back(block_in_progress);
+    this->complete = true;
+    sem_post(&this->block_ready);
+
+    return 0;
+}
+
+MemBlock *MemFile::NewBlock()
+{
+    MemBlock *block = (MemBlock *)malloc(sizeof(MemBlock));
+    memset(block, 0, sizeof(MemBlock));
+
+    block->is_last = false;
+    block->size = 0;
+    block->buf = malloc(block_size);
+
+    return block;
+}

source/mem_file.h

@@ -0,0 +1,46 @@
+#ifndef EZ_MEM_FILE_H
+#define EZ_MEM_FILE_H
+
+#include <string>
+#include <vector>
+#include <mutex>
+#include <pthread.h>
+
+enum MemBlockStatus
+{
+    MEM_BLOCK_STATUS_NOT_EXISTS,
+    MEM_BLOCK_STATUS_CREATED,
+    MEM_BLOCK_STATUS_DELETED
+};
+
+typedef struct
+{
+    size_t size;
+    void* buf;
+    bool is_last;
+    MemBlockStatus status;
+} MemBlock;
+
+class MemFile
+{
+public:
+    MemFile(const std::string& path, size_t block_size);
+    ~MemFile();
+    size_t Read(char* buf, size_t buf_size, size_t offset);
+    size_t Write(char* buf, size_t buf_size);
+    int Open();
+    int Close();
+
+private:
+    std::vector<MemBlock*> mem_blocks;
+    size_t write_offset;
+    size_t block_size;
+    int write_error;
+    bool complete;
+    MemBlock *block_in_progress;
+    sem_t block_ready;
+
+    MemBlock *NewBlock();
+};
+
+#endif

source/server/http_server.cpp

@@ -8,6 +8,12 @@
 #include "clients/smbclient.h"
 #include "clients/ftpclient.h"
 #include "clients/nfsclient.h"
+#include "clients/webdav.h"
+#include "clients/apache.h"
+#include "clients/iis.h"
+#include "clients/nginx.h"
+#include "clients/npxserve.h"
+#include "clients/rclone.h"
 #include "filehost/filehost.h"
 #include "config.h"
 #include "fs.h"
@@ -15,6 +21,7 @@
 #include "lang.h"
 #include "system.h"
 #include "zip_util.h"
+#include "util.h"
 #include "installer.h"
 
 #define SERVER_CERT_FILE "/app0/assets/certs/domain.crt"
@@ -23,9 +30,18 @@
 #define SUCCESS_MSG "{ \"result\": { \"success\": true, \"error\": null } }"
 #define FAILURE_MSG "{ \"result\": { \"success\": false, \"error\": \"%s\" } }"
 #define SUCCESS_MSG_LEN 48
+#define PKG_INITIAL_REQUEST_SIZE 8388608ul
 
 using namespace httplib;
 
+struct RemoteDownloadData
+{
+    RemoteClient *client = nullptr;
+    std::map<std::string, void *> fp_handles;
+};
+
+static RemoteDownloadData remote_data[100];
+
 Server *svr;
 int http_server_port = 8080;
 char compressed_file_path[1024];
@@ -90,22 +106,22 @@ namespace HttpServer
         return s;
     }
 
-    void failed(Response & res, int status, const std::string &msg)
+    void failed(Response &res, int status, const std::string &msg)
     {
         res.status = status;
-        char response_msg[msg.length()+strlen(FAILURE_MSG)+2];
+        char response_msg[msg.length() + strlen(FAILURE_MSG) + 2];
         snprintf(response_msg, sizeof(response_msg), "{ \"result\": { \"success\": false, \"error\": \"%s\" } }", msg.c_str());
         res.set_content(response_msg, strlen(response_msg), "application/json");
         return;
     }
 
-    void bad_request(Response & res, const std::string &msg)
+    void bad_request(Response &res, const std::string &msg)
     {
         failed(res, 200, msg);
         return;
     }
 
-    void success(Response & res)
+    void success(Response &res)
     {
         res.status = 200;
         res.set_content(SUCCESS_MSG, SUCCESS_MSG_LEN, "application/json");
@@ -181,15 +197,87 @@ namespace HttpServer
         return 1;
     }
 
+    static RemoteClient *GetRemoteClient(int site_idx, bool new_client)
+    {
+        RemoteClient *tmp_client;
+        RemoteSettings *tmp_settings = &site_settings[sites[site_idx]];
+
+        if (!new_client)
+        {
+            tmp_client = remote_data[site_idx].client;
+            if (tmp_client != nullptr)
+                return tmp_client;
+        }
+
+        if (tmp_settings->type == CLIENT_TYPE_SFTP)
+        {
+            tmp_client = new SFTPClient();
+        }
+        else if (tmp_settings->type == CLIENT_TYPE_SMB)
+        {
+            tmp_client = new SmbClient();
+        }
+        else if (tmp_settings->type == CLIENT_TYPE_FTP)
+        {
+            tmp_client = new FtpClient();
+        }
+        else if (tmp_settings->type == CLIENT_TYPE_NFS)
+        {
+            tmp_client = new NfsClient();
+        }
+        else if (tmp_settings->type == CLIENT_TYPE_WEBDAV)
+        {
+            tmp_client = new WebDAVClient();
+        }
+        else if (tmp_settings->type == CLIENT_TYPE_GOOGLE)
+        {
+            if (remoteclient != nullptr && remoteclient->clientType() == CLIENT_TYPE_GOOGLE)
+                tmp_client = remoteclient;
+            else
+                tmp_client = new GDriveClient();
+                tmp_client->Connect("", "", "");
+        }
+        else if (tmp_settings->type == CLIENT_TYPE_HTTP_SERVER)
+        {
+            if (strcmp(remote_settings->http_server_type, HTTP_SERVER_APACHE) == 0)
+                tmp_client = new ApacheClient();
+            else if (strcmp(remote_settings->http_server_type, HTTP_SERVER_MS_IIS) == 0)
+                tmp_client = new IISClient();
+            else if (strcmp(remote_settings->http_server_type, HTTP_SERVER_NGINX) == 0)
+                tmp_client = new NginxClient();
+            else if (strcmp(remote_settings->http_server_type, HTTP_SERVER_NPX_SERVE) == 0)
+                tmp_client = new NpxServeClient();
+            else if (strcmp(remote_settings->http_server_type, HTTP_SERVER_RCLONE) == 0)
+                tmp_client = new RCloneClient();
+        }
+
+        if (tmp_client->clientType() != CLIENT_TYPE_GOOGLE)
+            tmp_client->Connect(tmp_settings->server, tmp_settings->username, tmp_settings->password);
+
+        if (!new_client && tmp_client->clientType() != CLIENT_TYPE_FTP)
+        {
+            remote_data[site_idx].client = tmp_client;
+        }
+
+        return tmp_client;
+    }
+
+    static void DeleteRemoteClient(RemoteClient *tmp_client, int site_idx)
+    {
+        if (tmp_client != nullptr && tmp_client->clientType() != CLIENT_TYPE_GOOGLE)
+        {
+            tmp_client->Quit();
+            delete tmp_client;
+        }
+    }
+    
     void *ServerThread(void *argp)
     {
-        svr->Get("/", [&](const Request & req, Response & res)
-        {
-            res.set_redirect("/index.html");
-        });
+        svr->Get("/", [&](const Request &req, Response &res)
+                 { res.set_redirect("/index.html"); });
 
-        svr->Get("/index.html", [&](const Request & req, Response & res)
-        {
+        svr->Get("/index.html", [&](const Request &req, Response &res)
+                 {
             FILE *in = FS::OpenRead("/mnt/sandbox/pfsmnt/RMTC00001-app0/assets/index.html");
             size_t size = FS::GetSize("/mnt/sandbox/pfsmnt/RMTC00001-app0/assets/index.html");
             res.set_content_provider(
@@ -205,11 +293,10 @@ namespace HttpServer
                 },
                 [in](bool success) {
                     FS::Close(in);
-                });
-        });
+                }); });
 
-        svr->Get("/favicon.ico", [&](const Request & req, Response & res)
-        {
+        svr->Get("/favicon.ico", [&](const Request &req, Response &res)
+                 {
             FILE *in = FS::OpenRead("/mnt/sandbox/pfsmnt/RMTC00001-app0/assets/favicon.ico");
             size_t size = FS::GetSize("/mnt/sandbox/pfsmnt/RMTC00001-app0/assets/favicon.ico");
             res.set_content_provider(
@@ -225,11 +312,10 @@ namespace HttpServer
                 },
                 [in](bool success) {
                     FS::Close(in);
-                });
-        });
+                }); });
 
-        svr->Post("/__local__/list", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/list", [&](const Request &req, Response &res)
+                  {
             const char *path;
             bool onlyFolders = false;
             json_object *jobj = json_tokener_parse(req.body.c_str());
@@ -275,11 +361,10 @@ namespace HttpServer
             json_object_object_add(results, "result", json_files);
             const char *results_str = json_object_to_json_string(results);
             res.status = 200;
-            res.set_content(results_str, strlen(results_str), "application/json");
-        });
+            res.set_content(results_str, strlen(results_str), "application/json"); });
 
-        svr->Post("/__local__/rename", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/rename", [&](const Request &req, Response &res)
+                  {
             const char *item;
             const char *newItemPath;
             json_object *jobj = json_tokener_parse(req.body.c_str());
@@ -301,11 +386,10 @@ namespace HttpServer
 
             FS::Rename(item, newItemPath);
             success(res);
-            return;
-        });
+            return; });
 
-        svr->Post("/__local__/move", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/move", [&](const Request &req, Response &res)
+                  {
             const json_object *items;
             const char *newPath;
             json_object *jobj = json_tokener_parse(req.body.c_str());
@@ -356,11 +440,10 @@ namespace HttpServer
                 failed(res, 200, error_msg);
             }
             else
-                success(res);
-        });
+                success(res); });
 
-        svr->Post("/__local__/copy", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/copy", [&](const Request &req, Response &res)
+                  {
             const json_object *items;
             const char *newPath;
             const char *singleFilename;
@@ -431,11 +514,10 @@ namespace HttpServer
                 failed(res, 200, error_msg);
             }
             else
-                success(res);
-        });
+                success(res); });
 
-        svr->Post("/__local__/remove", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/remove", [&](const Request &req, Response &res)
+                  {
             json_object *items;
             json_object *jobj = json_tokener_parse(req.body.c_str());
             if (jobj != nullptr)
@@ -471,11 +553,10 @@ namespace HttpServer
                 failed(res, 200, error_msg);
             }
             else
-                success(res);
-        });
+                success(res); });
 
-        svr->Post("/__local__/install", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/install", [&](const Request &req, Response &res)
+                  {
             json_object *items;
             json_object *jobj = json_tokener_parse(req.body.c_str());
             if (jobj != nullptr)
@@ -508,11 +589,10 @@ namespace HttpServer
                 failed(res, 200, error_msg);
             }
             else
-                success(res);
-        });
+                success(res); });
 
-        svr->Post("/__local__/edit", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/edit", [&](const Request &req, Response &res)
+                  {
             const char *item;
             const char *content;
             size_t content_len;
@@ -542,11 +622,10 @@ namespace HttpServer
                 return;
             }
 
-            success(res);
-        });
+            success(res); });
 
-        svr->Post("/__local__/getContent", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/getContent", [&](const Request &req, Response &res)
+                  {
             const char *item;
             json_object *jobj = json_tokener_parse(req.body.c_str());
             if (jobj != nullptr)
@@ -569,11 +648,10 @@ namespace HttpServer
             json_object_object_add(result, "result", json_object_new_string(content.data()));
             const char *result_str = json_object_to_json_string(result);
             res.status = 200;
-            res.set_content(result_str, strlen(result_str), "application/json");
-        });
+            res.set_content(result_str, strlen(result_str), "application/json"); });
 
-        svr->Post("/__local__/createFolder", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/createFolder", [&](const Request &req, Response &res)
+                  {
             const char *newPath;
             json_object *jobj = json_tokener_parse(req.body.c_str());
             if (jobj != nullptr)
@@ -592,16 +670,13 @@ namespace HttpServer
             }
 
             FS::MkDirs(newPath);
-            success(res);
-        });
+            success(res); });
 
-        svr->Post("/__local__/permission", [&](const Request & req, Response & res)
-        {
-            failed(res, 200, "Operation not supported");
-        });
+        svr->Post("/__local__/permission", [&](const Request &req, Response &res)
+                  { failed(res, 200, "Operation not supported"); });
 
-        svr->Post("/__local__/compress", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/compress", [&](const Request &req, Response &res)
+                  {
             json_object *items;
             const char* destination;
             const char* compressedFilename;
@@ -651,11 +726,10 @@ namespace HttpServer
             else
             {
                 failed(res, 200, "Failed to create zip");
-            }
-        });
+            } });
 
-        svr->Post("/__local__/extract", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/extract", [&](const Request &req, Response &res)
+                  {
             const char* item;
             const char* destination;
             const char* folderName;
@@ -691,11 +765,10 @@ namespace HttpServer
             else if (ret == -1)
                 failed(res, 200, "Unsupported compressed file format");
             else
-                success(res);
-        });
+                success(res); });
 
         svr->Get("/__local__/uploadResumeSize", [&](const Request &req, Response &res)
-        {
+                 {
             std::string destination = req.get_param_value("destination");
             std::string filename = req.get_param_value("filename");
             std::string file_path = destination + "/" + filename;
@@ -704,11 +777,10 @@ namespace HttpServer
                 size = FS::GetSize(file_path);
             std::string result_str = "{\"size\":" + std::to_string(size) + "}";
             res.status = 200;
-            res.set_content(result_str.c_str(), result_str.length(), "application/json");
-        });
+            res.set_content(result_str.c_str(), result_str.length(), "application/json"); });
 
         svr->Post("/__local__/upload", [&](const Request &req, Response &res, const ContentReader &content_reader)
-        {
+                  {
             MultipartFormDataItems items;
             std::string destination;
             size_t chunk_size = 0;
@@ -774,12 +846,11 @@ namespace HttpServer
             {
                 FS::Close(out);
             }
-            success(res);
-        });
+            success(res); });
 
         // Download multiple files as ZIP
-        svr->Get("/__local__/downloadMultiple", [&](const Request & req, Response & res)
-        {
+        svr->Get("/__local__/downloadMultiple", [&](const Request &req, Response &res)
+                 {
             if (req.get_param_value_count("items") == 0 || req.get_param_value_count("toFilename") == 0)
             {
                 failed(res, 200, "Required items and toFilename parameter missing");
@@ -833,12 +904,11 @@ namespace HttpServer
             else
             {
                 failed(res, 200, "Failed to create zip");
-            }
-        });
+            } });
 
         // Download single file
-        svr->Get("/__local__/downloadFile", [&](const Request & req, Response & res)
-        {
+        svr->Get("/__local__/downloadFile", [&](const Request &req, Response &res)
+                 {
             std::string path = req.get_param_value("path", 0);
             if (path.empty())
             {
@@ -868,11 +938,10 @@ namespace HttpServer
                 },
                 [in](bool success) {
                     FS::Close(in);
-                });
-        });
+                }); });
 
         svr->Get("/google_auth", [](const Request &req, Response &res)
-        {
+                 {
             std::string auth_code = req.get_param_value("code");
             Client client(GOOGLE_OAUTH_HOST);
             client.set_follow_location(true);
@@ -918,12 +987,11 @@ namespace HttpServer
             }
             login_state = -1;
             std::string str = std::string(lang_strings[STR_FAIL_GET_TOKEN_MSG]) + " Google";
-            res.set_content(str.c_str(), "text/plain");
-        });
+            res.set_content(str.c_str(), "text/plain"); });
 
-        svr->Get("/rmt_inst/Site (\\d+)(/)(.*)", [&](const Request & req, Response & res)
-        {
-            RemoteClient *tmp_client;
+        svr->Get("/rmt_inst/Site (\\d+)(/)(.*)", [&](const Request &req, Response &res)
+                 {
+            RemoteClient *tmp_client = nullptr;
             RemoteSettings *tmp_settings;
             auto site_idx = std::stoi(req.matches[1])-1;
             std::string path;
@@ -931,33 +999,6 @@ namespace HttpServer
             if (site_idx != 98)
             {
                 path = std::string("/") + std::string(req.matches[3]);
-
-                tmp_settings = &site_settings[sites[site_idx]];
-
-                if (tmp_settings->type == CLIENT_TYPE_SFTP)
-                {
-                    tmp_client = new SFTPClient();
-                    tmp_client->Connect(tmp_settings->server, tmp_settings->username, tmp_settings->password);
-                }
-                else if (tmp_settings->type == CLIENT_TYPE_SMB)
-                {
-                    tmp_client = new SmbClient();
-                    tmp_client->Connect(tmp_settings->server, tmp_settings->username, tmp_settings->password);
-                }
-                else if (tmp_settings->type == CLIENT_TYPE_FTP)
-                {
-                    tmp_client = new FtpClient();
-                    tmp_client->Connect(tmp_settings->server, tmp_settings->username, tmp_settings->password);
-                }
-                else if (tmp_settings->type == CLIENT_TYPE_NFS)
-                {
-                    tmp_client = new NfsClient();
-                    tmp_client->Connect(tmp_settings->server, tmp_settings->username, tmp_settings->password);
-                }
-                else
-                {
-                    tmp_client = remoteclient;
-                }
             }
             else
             {
@@ -972,33 +1013,34 @@ namespace HttpServer
                 tmp_client->Connect(host, "", "");
             }
 
-            if (tmp_client == nullptr || !tmp_client->IsConnected())
-            {
-                res.status = 404;
-                return;
-            }
-
-
             if (req.method == "HEAD")
             {
                 int64_t file_size;
                 int ret;
+                if (site_idx != 98)
+                    tmp_client = GetRemoteClient(site_idx, true);
+
                 ret = tmp_client->Size(path, &file_size);
                 if (!ret)
                 {
                     res.status = 500;
+                    DeleteRemoteClient(tmp_client, site_idx);
                     return;
                 }
 
                 res.status = 204;
                 res.set_header("Content-Length", std::to_string(file_size));
                 res.set_header("Accept-Ranges", "bytes");
+                DeleteRemoteClient(tmp_client, site_idx);
                 return;
             }
 
             if (req.ranges.empty())
             {
                 res.status = 200;
+                if (site_idx != 98)
+                    tmp_client = GetRemoteClient(site_idx, true);
+
                 res.set_content_provider(
                     (1024*128), "application/octet-stream",
                     [tmp_client, path](size_t offset, size_t length, DataSink &sink) {
@@ -1006,15 +1048,7 @@ namespace HttpServer
                         return (ret == 1);
                     },
                     [tmp_client, path, site_idx](bool success) {
-                        if (tmp_client != nullptr && (tmp_client->clientType() == CLIENT_TYPE_SFTP
-                            || tmp_client->clientType() == CLIENT_TYPE_SMB
-                            || tmp_client->clientType() == CLIENT_TYPE_FTP
-                            || tmp_client->clientType() == CLIENT_TYPE_NFS
-                            || (tmp_client->clientType() == CLIENT_TYPE_HTTP_SERVER && site_idx == 98)))
-                        {
-                            tmp_client->Quit();
-                            delete tmp_client;
-                        }
+                        DeleteRemoteClient(tmp_client, site_idx);
                     });
             }
             else
@@ -1023,44 +1057,192 @@ namespace HttpServer
                 size_t range_len = (req.ranges[0].second - req.ranges[0].first) + 1;
                 if (req.ranges[0].second >= 18000000000000000000ul)
                 {
-                    range_len = 65536ul - req.ranges[0].first;
+                    range_len = PKG_INITIAL_REQUEST_SIZE;
                     res.set_header("Content-Length", std::to_string(range_len));
-                    res.set_header("Content-Range", std::string("bytes ") + std::to_string(req.ranges[0].first)+"-65535/"+std::to_string(range_len));
+                    res.set_header("Content-Range", std::string("bytes ") + std::to_string(req.ranges[0].first)+"-" + std::to_string(req.ranges[0].first+PKG_INITIAL_REQUEST_SIZE-1) + "/"+std::to_string(range_len));
+                    sceRtcGetCurrentTick(&prev_tick);
+                    if (site_idx != 98)
+                        tmp_client = GetRemoteClient(site_idx, true);
+                }
+                else
+                {
+                    if (site_idx != 98)
+                        tmp_client = GetRemoteClient(site_idx, false);
+                }
+
+                std::pair<ssize_t, ssize_t> range = req.ranges[0];
+                res.set_content_provider(
+                    range_len, "application/octet-stream",
+                    [tmp_client, path, range, range_len, site_idx](size_t offset, size_t length, DataSink &sink) {
+                        int ret;
+                        if (range_len == PKG_INITIAL_REQUEST_SIZE)
+                        {
+                            ret = tmp_client->GetRange(path, sink, range_len, range.first);
+                        }
+                        else if ((tmp_client->SupportedActions() & REMOTE_ACTION_RAW_READ) == 0)
+                        {
+                            ret = tmp_client->GetRange(path, sink, range_len, range.first);
+                        }
+                        else
+                        {
+                            std::map<std::string, void *>::iterator it = remote_data[site_idx].fp_handles.find(path);
+                            void *fp;
+                            if (it == remote_data[site_idx].fp_handles.end())
+                            {
+                                fp = tmp_client->Open(path, O_RDONLY);
+                                remote_data[site_idx].fp_handles[path] = fp;
+                            }
+                            else
+                            {
+                                fp = it->second;
+                            }
+                            ret = tmp_client->GetRange(fp, sink, range_len, range.first);
+                        }
+                        return (ret==1);
+                    },
+                    [tmp_client, path, range, site_idx](bool success) {
+                        if (range.second >= 18000000000000000000ul ||
+                            (tmp_client->clientType() == CLIENT_TYPE_HTTP_SERVER && site_idx == 98) ||
+                            tmp_client->clientType() == CLIENT_TYPE_FTP)
+                        {
+                            DeleteRemoteClient(tmp_client, site_idx);
+                        }
+                    });
+            } });
+
+        svr->Get("/archive_inst/(.*)", [&](const Request &req, Response &res)
+                 {
+            RemoteClient *tmp_client;
+            RemoteSettings *tmp_settings;
+            std::string hash = req.matches[1];
+
+            ArchivePkgInstallData *pkg_data = INSTALLER::GetArchivePkgInstallData(hash);
+
+            if (req.method == "HEAD")
+            {
+                res.status = 204;
+                res.set_header("Content-Length", std::to_string(pkg_data->archive_entry->filesize));
+                res.set_header("Accept-Ranges", "bytes");
+                return;
+            }
+
+            if (req.ranges.empty())
+            {
+                res.status = 200;
+                res.set_content_provider(
+                    131072, "application/octet-stream",
+                    [pkg_data](size_t offset, size_t length, DataSink &sink) {
+                        char *buf = (char*) malloc(131072);
+                        size_t bytes_read = pkg_data->split_file->Read(buf, 131072, offset);
+                        sink.write(buf, bytes_read);
+                        free(buf);
+                        return true;
+                    },
+                    [](bool success) {
+                        return true;
+                    });
+            }
+            else
+            {
+                res.status = 206;
+                size_t range_len = (req.ranges[0].second - req.ranges[0].first) + 1;
+                if (req.ranges[0].second >= 18000000000000000000ul)
+                {
+                    range_len = PKG_INITIAL_REQUEST_SIZE;
+                    res.set_header("Content-Length", std::to_string(range_len));
+                    res.set_header("Content-Range", std::string("bytes ") + std::to_string(req.ranges[0].first)+"-" + std::to_string(req.ranges[0].first+PKG_INITIAL_REQUEST_SIZE-1) + "/"+std::to_string(range_len));
+                    sceRtcGetCurrentTick(&prev_tick);
                 }
                 std::pair<ssize_t, ssize_t> range = req.ranges[0];
                 res.set_content_provider(
                     range_len, "application/octet-stream",
-                    [tmp_client, path, range, range_len](size_t offset, size_t length, DataSink &sink) {
-                        int ret = tmp_client->GetRange(path, sink, range_len, range.first);
-                        return (ret == 1);
+                    [pkg_data, range, range_len](size_t offset, size_t length, DataSink &sink) {
+                        char *buf = (char*) malloc(range_len);
+                        size_t bytes_read = pkg_data->split_file->Read(buf, range_len, range.first);
+                        sink.write(buf, bytes_read);
+                        free(buf);
+                        return true;
                     },
-                    [tmp_client, site_idx, path, range, range_len](bool success) {
-                        if (tmp_client != nullptr && (tmp_client->clientType() == CLIENT_TYPE_SFTP 
-                            || tmp_client->clientType() == CLIENT_TYPE_SMB
-                            || tmp_client->clientType() == CLIENT_TYPE_FTP
-                            || tmp_client->clientType() == CLIENT_TYPE_NFS
-                            || (tmp_client->clientType() == CLIENT_TYPE_HTTP_SERVER && site_idx == 98)))
-                        {
-                            tmp_client->Quit();
-                            delete tmp_client;
-                        }
+                    [](bool success) {
+                        return true;
+                    });
+            } });
+
+        svr->Get("/split_inst/(.*)", [&](const Request &req, Response &res)
+        {
+            std::string hash = req.matches[1];
+
+            SplitPkgInstallData *pkg_data = INSTALLER::GetSplitPkgInstallData(hash);
+
+            if (req.method == "HEAD")
+            {
+                res.status = 204;
+                res.set_header("Content-Length", std::to_string(pkg_data->size));
+                res.set_header("Accept-Ranges", "bytes");
+                return;
+            }
+
+            if (req.ranges.empty())
+            {
+                res.status = 200;
+                res.set_content_provider(
+                    131072, "application/octet-stream",
+                    [pkg_data](size_t offset, size_t length, DataSink &sink) {
+                        char *buf = (char*) malloc(131072);
+                        size_t bytes_read = pkg_data->split_file->Read(buf, 131072, offset);
+                        sink.write(buf, bytes_read);
+                        free(buf);
+                        return true;
+                    },
+                    [](bool success) {
+                        return true;
                     });
             }
-        });
+            else
+            {
+                res.status = 206;
+                size_t range_len = (req.ranges[0].second - req.ranges[0].first) + 1;
+                if (req.ranges[0].second >= 18000000000000000000ul)
+                {
+                    range_len = PKG_INITIAL_REQUEST_SIZE;
+                    res.set_header("Content-Length", std::to_string(range_len));
+                    res.set_header("Content-Range", std::string("bytes ") + std::to_string(req.ranges[0].first)+"-" + std::to_string(req.ranges[0].first+PKG_INITIAL_REQUEST_SIZE-1) + "/"+std::to_string(range_len));
+                    sceRtcGetCurrentTick(&prev_tick);
+                }
+                std::pair<ssize_t, ssize_t> range = req.ranges[0];
+                res.set_content_provider(
+                    range_len, "application/octet-stream",
+                    [pkg_data, range, range_len](size_t offset, size_t length, DataSink &sink) {
+                        char *buf = (char*) malloc(range_len);
+                        size_t bytes_read = pkg_data->split_file->Read(buf, range_len, range.first);
+                        sink.write(buf, bytes_read);
+                        free(buf);
+                        return true;
+                    },
+                    [](bool success) {
+                        return true;
+                    });
+            } });
 
-        svr->Post("/__local__/install_url", [&](const Request & req, Response & res)
-        {
+        svr->Post("/__local__/install_url", [&](const Request &req, Response &res)
+                  {
             std::string url;
             const char *url_param;
-            bool use_alldebrid;
+            bool use_alldebrid = false;
+            bool use_realdebrid = false;
+            bool use_disk_cache = 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"));
+                use_disk_cache = json_object_get_boolean(json_object_object_get(jobj, "use_disk_cache"));
+
                 if (url_param == nullptr)
                 {
-                    bad_request(res, "Required url_param, use_alldebrid parameter missing");
+                    bad_request(res, "Required url_param parameter missing");
                     return;
                 }
             }
@@ -1070,14 +1252,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())
             {
@@ -1085,15 +1267,25 @@ namespace HttpServer
                 return;
             }
 
-            std::string hash = filehost->Hash();
+            std::string hash = Util::UrlHash(filehost->GetUrl());
+            snprintf(activity_message, 1023, "%s %s", lang_strings[STR_INSTALLING], filehost->GetUrl().c_str());
+            activity_inprogess = true;
+            file_transfering = true;
+            bytes_to_download = 100;
+            bytes_transfered = 0;
+            sceRtcGetCurrentTick(&prev_tick);
+
+            Windows::SetModalMode(true);
+
             std::string download_url = filehost->GetDownloadUrl();
             if (download_url.empty())
             {
                 failed(res, 200, lang_strings[STR_CANT_EXTRACT_URL_MSG]);
+                activity_inprogess = false;
+                file_transfering = false;
+                Windows::SetModalMode(true);
                 return;
             }
-
-            FileHost::AddCacheDownloadUrl(hash, download_url);
             delete(filehost);
 
 			size_t scheme_pos = download_url.find("://");
@@ -1105,32 +1297,107 @@ 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)
+            if (BE32(header.pkg_magic) == 0x7F434E54)
             {
-                failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
-                return;
+                bytes_to_download = header.pkg_content_size;
+                FileHost::AddCacheDownloadUrl(hash, download_url);
+                std::string title = INSTALLER::GetRemotePkgTitle(baseclient, path, &header);
+
+                if (!use_disk_cache)
+                {
+                    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, false);
+                    if (rc == 0)
+                    {
+                        failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                        activity_inprogess = false;
+                        file_transfering = false;
+                        Windows::SetModalMode(true);
+                        return;
+                    }
+                }
+                else
+                {
+                    SplitPkgInstallData *install_data = (SplitPkgInstallData*) malloc(sizeof(SplitPkgInstallData));
+                    memset(install_data, 0, sizeof(SplitPkgInstallData));
+
+                    OrbisTick tick;
+                    sceRtcGetCurrentTick(&tick);
+                    std::string install_pkg_path = std::string(temp_folder) + "/" + std::to_string(tick.mytick) + ".pkg";
+                    SplitFile *sp = new SplitFile(install_pkg_path, INSTALL_ARCHIVE_PKG_SPLIT_SIZE/2);
+
+                    install_data->split_file = sp;
+                    install_data->remote_client = baseclient;
+                    install_data->path = path;
+                    baseclient->Size(path, &install_data->size);
+                    install_data->stop_write_thread = false;
+                    install_data->delete_client = true;
+
+                    int ret = pthread_create(&install_data->thread, NULL, Actions::DownloadSplitPkg, install_data);
+
+                    ret = INSTALLER::InstallSplitPkg(download_url, install_data, true);
+
+                    if (ret == 0)
+                    {
+                        failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                        activity_inprogess = false;
+                        file_transfering = false;
+                        free(install_data);
+                        Windows::SetModalMode(false);
+                        return;
+                    }
+                }
             }
-            
-            success(res);
-        });
+            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]);
+                        activity_inprogess = false;
+                        file_transfering = false;
+                        free(install_data);
+                        Windows::SetModalMode(false);
+                        return;
+                    }
+                }
+                else
+                {
+                    failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                    activity_inprogess = false;
+                    file_transfering = false;
+                    Windows::SetModalMode(false);
+                    return;
+                }
+            }
+            success(res); });
 
         svr->Get("/stop", [&](const Request & /*req*/, Response & /*res*/)
-        {
-            svr->stop();
-        });
+                 { svr->stop(); });
 
         svr->set_error_handler([](const Request & /*req*/, Response &res)
-        {
+                               {
             const char *fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
             char buf[BUFSIZ];
             snprintf(buf, sizeof(buf), fmt, res.status);
-            res.set_content(buf, "text/html");
-        });
+            res.set_content(buf, "text/html"); });
 
         /*
         svr->set_logger([](const Request &req, const Response &res)
@@ -1142,7 +1409,7 @@ namespace HttpServer
         svr->set_payload_max_length(1024 * 1024 * 12);
         svr->set_tcp_nodelay(true);
         svr->set_mount_point("/", "/");
-        
+
         if (web_server_enabled)
             svr->listen("0.0.0.0", http_server_port);
         else

source/server/http_server.h

@@ -1,5 +1,5 @@
-#ifndef HTTP_SERVER_H
-#define HTTP_SERVER_H
+#ifndef EZ_HTTP_SERVER_H
+#define EZ_HTTP_SERVER_H
 
 #include "http/httplib.h"
 

source/sfo.h

@@ -1,5 +1,5 @@
-#ifndef LAUNCHER_SFO_H
-#define LAUNCHER_SFO_H
+#ifndef EZ_SFO_H
+#define EZ_SFO_H
 
 #pragma once
 

source/split_file.cpp

@@ -0,0 +1,229 @@
+#include <stdio.h>
+#include <stdio.h>
+#include <string>
+
+#include "common.h"
+#include "split_file.h"
+
+SplitFile::SplitFile(const std::string &path, size_t block_size)
+{
+    this->block_size = block_size;
+    this->path = path;
+    this->complete = false;
+    sem_init(&this->block_ready, 0, 0);
+}
+
+SplitFile::~SplitFile()
+{
+    for (int i = 0; i < this->file_blocks.size(); i++)
+    {
+        if (this->file_blocks[i] != nullptr && this->file_blocks[i]->status != BLOCK_STATUS_DELETED)
+        {
+            if (this->file_blocks[i]->fd != nullptr)
+            {
+                fclose(this->file_blocks[i]->fd);
+            }
+            remove(this->file_blocks[i]->block_file.c_str());
+            free(this->file_blocks[i]);
+        }
+    }
+    sem_destroy(&this->block_ready);
+};
+
+int SplitFile::Open()
+{
+    this->block_in_progress = NewBlock();
+    this->block_in_progress->fd = fopen(block_in_progress->block_file.c_str(), "w");
+
+    return (block_in_progress->fd == nullptr);
+}
+
+size_t SplitFile::Read(char *buf, size_t buf_size, size_t offset)
+{
+    int first_block_num, block_num;
+    size_t block_offset;
+    size_t remaining;
+    size_t bytes_read;
+    size_t total_bytes_read;
+    FileBlock *block;
+    FILE *fd;
+    char *p;
+
+    first_block_num= offset / this->block_size;
+    block_num = first_block_num;
+    block_offset = offset % this->block_size;
+
+    while ((block_num >= this->file_blocks.size() && !this->complete) ||
+           (block_num < this->file_blocks.size() && this->file_blocks[block_num]->status == BLOCK_STATUS_NOT_EXISTS))
+    {
+        sem_wait(&this->block_ready);
+    }
+
+    block = this->file_blocks[block_num];
+    if (block->status == BLOCK_STATUS_DELETED)
+    {
+        return -1;
+    }
+
+    if (block_offset > block->size - 1 && this->complete)
+    {
+        // requested offset is pass the end of split file
+        return 0;
+    }
+
+    remaining = buf_size;
+    bool eof = false;
+    total_bytes_read = 0;
+    p = buf;
+
+    while (remaining > 0 && !eof)
+    {
+        fd = block->fd;
+        if (fd == nullptr)
+        {
+            fd = fopen(block->block_file.c_str(), "rb");
+            block->fd = fd;
+        }
+
+        fseek(fd, block_offset, SEEK_SET);
+        bytes_read = fread(p, 1, remaining, fd);
+
+        if (bytes_read == remaining)
+        {
+            p += bytes_read;
+            total_bytes_read += bytes_read;
+        }
+        else
+        {
+            if (feof(fd))
+            {
+                p += bytes_read;
+                total_bytes_read += bytes_read;
+                if (block->is_last)
+                {
+                    eof = true;
+                    continue;
+                }
+            }
+            else
+                return -1;
+        }
+
+        remaining -= bytes_read;
+
+        if (remaining == 0)
+            continue;
+
+        block_num++;
+        block_offset = 0;
+
+        while ((block_num > this->file_blocks.size() - 1 && !this->complete) ||
+               this->file_blocks[block_num]->status == BLOCK_STATUS_NOT_EXISTS)
+        {
+            sem_wait(&this->block_ready);
+        }
+
+        block = this->file_blocks[block_num];
+    }
+
+    // delete blocks before the first read offset block. Assumuption, that reads are always
+    // forward and won't read previously already read blocks. For safety, keeping only current block and 2 previous blocks
+    for (int j=0; j < first_block_num - 2; j++)
+    {
+        if (this->file_blocks[j]->status == BLOCK_STATUS_CREATED)
+        {
+            if (this->file_blocks[j]->fd != nullptr)
+            {
+                fclose(this->file_blocks[j]->fd);
+                this->file_blocks[j]->fd = nullptr;
+            }
+            this->file_blocks[j]->status = BLOCK_STATUS_DELETED;
+            remove(this->file_blocks[j]->block_file.c_str());
+        }
+    }
+
+    return total_bytes_read;
+}
+
+size_t SplitFile::Write(char *buf, size_t buf_size)
+{
+    size_t bytes_written;
+    size_t block_space_remaining;
+    size_t bytes_to_write;
+
+    char *p = buf;
+    size_t total_bytes_written = 0;
+    size_t remaining_to_write = buf_size;
+
+    while (remaining_to_write > 0 && !this->complete)
+    {
+        block_space_remaining = this->block_size - block_in_progress->size;
+        bytes_to_write = MIN(remaining_to_write, block_space_remaining);
+
+        bytes_written = fwrite(p, 1, bytes_to_write, block_in_progress->fd);
+        block_in_progress->size += bytes_written;
+        total_bytes_written += bytes_written;
+        remaining_to_write -= bytes_written;
+        block_space_remaining -= bytes_written;
+        p += bytes_written;
+
+        // error if bytes_to_write != bytes_written
+        if (bytes_written != bytes_to_write)
+        {
+            break;
+        }
+
+        if (block_space_remaining == 0)
+        {
+            fflush(block_in_progress->fd);
+            fclose(block_in_progress->fd);
+            block_in_progress->fd = nullptr;
+            block_in_progress->status = BLOCK_STATUS_CREATED;
+            this->file_blocks.push_back(block_in_progress);
+
+            sem_post(&this->block_ready);
+
+            block_in_progress = NewBlock();
+        }
+    }
+
+    return total_bytes_written;
+}
+
+int SplitFile::Close()
+{
+    if (this->complete)
+        return 0;
+
+    if (block_in_progress->fd != nullptr)
+    {
+        fflush(block_in_progress->fd);
+        fclose(block_in_progress->fd);
+        block_in_progress->fd = nullptr;
+    }
+    block_in_progress->status = BLOCK_STATUS_CREATED;
+    block_in_progress->is_last = true;
+    this->file_blocks.push_back(block_in_progress);
+    this->complete = true;
+    sem_post(&this->block_ready);
+
+    return 0;
+}
+
+bool SplitFile::IsClosed()
+{
+    return this->complete;
+}
+
+FileBlock *SplitFile::NewBlock()
+{
+    FileBlock *block = (FileBlock *)malloc(sizeof(FileBlock));
+    memset(block, 0, sizeof(FileBlock));
+
+    block->is_last = false;
+    block->size = 0;
+    block->block_file = this->path + "." + std::to_string(this->file_blocks.size());
+    block->fd = fopen(block->block_file.c_str(), "w");
+
+    return block;
+}

source/split_file.h

@@ -0,0 +1,49 @@
+#ifndef EZ_SPLIT_FILE_H
+#define EZ_SPLIT_FILE_H
+
+#include <string>
+#include <vector>
+#include <mutex>
+#include <pthread.h>
+
+enum FileBlockStatus
+{
+    BLOCK_STATUS_NOT_EXISTS,
+    BLOCK_STATUS_CREATED,
+    BLOCK_STATUS_DELETED
+};
+
+typedef struct
+{
+    std::string block_file;
+    size_t size;
+    FILE* fd;
+    bool is_last;
+    FileBlockStatus status;
+} FileBlock;
+
+class SplitFile
+{
+public:
+    SplitFile(const std::string& path, size_t block_size);
+    ~SplitFile();
+    size_t Read(char* buf, size_t buf_size, size_t offset);
+    size_t Write(char* buf, size_t buf_size);
+    int Open();
+    int Close();
+    bool IsClosed();
+
+private:
+    std::vector<FileBlock*> file_blocks;
+    size_t write_offset;
+    size_t block_size;
+    std::string path;
+    int write_error;
+    bool complete;
+    FileBlock *block_in_progress;
+    sem_t block_ready;
+
+    FileBlock *NewBlock();
+};
+
+#endif

source/system.h

@@ -1,3 +1,6 @@
+#ifndef EZ_SYSTEM_H
+#define EZ_SYSTEM_H
+
 #include <stdint.h>
 
 #ifdef __cplusplus 
@@ -42,3 +45,5 @@ void convertLocalTimeToUtc(const OrbisDateTime *local_time, OrbisDateTime *utc);
 #ifdef __cplusplus
 }
 #endif
+
+#endif

source/textures.h

@@ -1,5 +1,5 @@
-#ifndef LAUNCHER_TEXTURES_H
-#define LAUNCHER_TEXTURES_H
+#ifndef EZ_TEXTURES_H
+#define EZ_TEXTURES_H
 
 #include <string>
 #include <SDL2/SDL.h>

source/util.h

@@ -6,6 +6,8 @@
 #include <algorithm>
 #include <stdarg.h>
 #include <orbis/libkernel.h>
+#include "base64.h"
+#include "openssl/md5.h"
 #include "lang.h"
 
 namespace Util
@@ -47,6 +49,13 @@ namespace Util
         return s;
     }
 
+    static inline bool EndsWith(std::string const &value, std::string const &ending)
+    {
+        if (ending.size() > value.size())
+            return false;
+        return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
+    }
+
     static inline std::vector<std::string> Split(const std::string &str, const std::string &delimiter)
     {
         std::string text = std::string(str);
@@ -66,6 +75,19 @@ namespace Util
         return tokens;
     }
 
+    static inline std::string UrlHash(const std::string &text)
+    {
+        std::vector<unsigned char> res(16);
+        MD5((const unsigned char *)text.c_str(), text.length(), res.data());
+
+        std::string out;
+        Base64::Encode(res.data(), res.size(), out);
+        Util::ReplaceAll(out, "=", "_");
+        Util::ReplaceAll(out, "+", "_");
+        out = out + ".pkg";
+        return out;
+    }
+
     static inline void Notify(const char *fmt, ...)
     {
         OrbisNotificationRequest request;

source/web/callback.cpp

@@ -1,120 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#include <algorithm>
-#include <fstream>
-#include <cstring>
-#include "http/httplib.h"
-
-#include "callback.hpp"
-
-using namespace httplib;
-
-namespace Web
-{
-  namespace Callback
-  {
-    namespace Read
-    {
-      size_t stream(char* ptr, size_t item_size, size_t item_count, void* stream)
-      {
-        auto in_stream = reinterpret_cast<std::istream*>(stream);
-        auto read_bytes = static_cast<unsigned long long>(item_size * item_count);
-        auto position = static_cast<unsigned long long>(in_stream->tellg());
-        in_stream->seekg(0, std::ios::end);
-        auto size = static_cast<unsigned long long>(in_stream->tellg());
-        in_stream->seekg(position, std::ios::beg);
-        auto rest_bytes = size - position;
-        read_bytes = std::min<unsigned long long>(read_bytes, rest_bytes);
-        in_stream->read(ptr, read_bytes);
-        return read_bytes;
-      }
-
-      size_t buffer(char* ptr, size_t item_size, size_t item_count, void* buffer)
-      {
-        auto data = (Data*)buffer;
-        auto size = static_cast<unsigned long long>(item_size * item_count);
-        auto rest_bytes = data->size - data->position;
-        auto copied_bytes = std::min<unsigned long long>(size, rest_bytes);
-        memcpy(ptr, data->buffer, copied_bytes);
-        data->position += copied_bytes;
-        return copied_bytes;
-      }
-    } // namespace Read
-
-    namespace Write
-    {
-      size_t stream(char* ptr, size_t item_size, size_t item_count, void* stream)
-      {
-        auto out_stream = reinterpret_cast<std::ostream*>(stream);
-        size_t write_bytes = item_size * item_count;
-        out_stream->write(ptr, write_bytes);
-        return write_bytes;
-      }
-
-      size_t buffer(char* ptr, size_t item_size, size_t item_count, void* buffer)
-      {
-        auto data = reinterpret_cast<Data*>(buffer);
-        auto size = static_cast<unsigned long long>(item_size * item_count);
-        auto rest_bytes = data->size - data->position;
-        auto copied_bytes = std::min<unsigned long long>(size, rest_bytes);
-        memcpy(data->buffer, ptr, copied_bytes);
-        data->position += copied_bytes;
-        return copied_bytes;
-      }
-    } // namespace Write
-
-    namespace Append
-    {
-      size_t buffer(char* ptr, size_t item_size, size_t item_count, void* buffer)
-      {
-        auto data = reinterpret_cast<Data*>(buffer);
-        auto append_size = item_size * item_count;
-        auto new_buffer_size = data->size + append_size;
-        auto new_buffer = new char[new_buffer_size];
-        if (data->size != 0) memcpy(new_buffer, data->buffer, data->size);
-        memcpy(new_buffer + data->size, ptr, append_size);
-        delete[] data->buffer;
-        data->buffer = new_buffer;
-        data->size = new_buffer_size;
-        return append_size;
-      }
-
-      size_t stream(char* ptr, size_t item_size, size_t item_count, void* stream)
-      {
-        auto out_stream = reinterpret_cast<std::ostream*>(stream);
-        size_t write_bytes = item_size * item_count;
-        out_stream->seekp(0, std::ios::end);
-        out_stream->write(ptr, write_bytes);
-        return write_bytes;
-      }
-
-      size_t stream2sink(char* ptr, size_t item_size, size_t item_count, void* sink)
-      {
-        auto ostream = reinterpret_cast<DataSink*>(sink);
-        size_t write_bytes = item_size * item_count;
-        ostream->write(ptr, write_bytes);
-        return write_bytes;
-      }
-    } // namespace Append
-  } // namespace Callback
-} // namespace Web

source/web/callback.hpp

@@ -1,68 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#ifndef WEB_CALLBACK_HPP
-#define WEB_CALLBACK_HPP
-
-namespace Web
-{
-  struct Data
-  {
-    char* buffer;
-    unsigned long long position;
-    unsigned long long size;
-    void reset()
-    {
-      buffer = nullptr;
-      position = 0;
-      size = 0;
-    }
-    ~Data()
-    {
-      delete[] buffer;
-    }
-  };
-
-  namespace Callback
-  {
-    namespace Read
-    {
-      size_t stream(char* data, size_t size, size_t count, void* stream);
-      size_t buffer(char* data, size_t size, size_t count, void* buffer);
-    }
-
-    namespace Write
-    {
-      size_t stream(char* data, size_t size, size_t count, void* stream);
-      size_t buffer(char* data, size_t size, size_t count, void* buffer);
-    }
-
-    namespace Append
-    {
-      size_t stream(char* data, size_t size, size_t count, void* stream);
-      size_t buffer(char* data, size_t size, size_t count, void* buffer);
-      size_t stream2sink(char* ptr, size_t item_size, size_t item_count, void* sink);
-    }
-  }
-} // namespace Web
-
-#endif

source/web/fsinfo.cpp

@@ -1,42 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#include "fsinfo.hpp"
-#include <fstream>
-
-namespace Web
-{
-  namespace FileInfo
-  {
-    auto exists(const std::string& path) -> bool
-    {
-      std::ifstream file(path);
-      return file.good();
-    }
-
-    auto size(const std::string& path_file) -> unsigned long long
-    {
-      std::ifstream file(path_file, std::ios::binary | std::ios::ate);
-      return static_cast<unsigned long long>(file.tellg());
-    }
-  } // namespace FileInfo
-} // namespace Web

source/web/fsinfo.hpp

@@ -1,38 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#ifndef WEB_FSINFO_HPP
-#define WEB_FSINFO_HPP
-
-#include <fstream>
-#include <string>
-
-namespace Web
-{
-  namespace FileInfo
-  {
-    auto exists(const std::string& path) -> bool;
-    auto size(const std::string& path_file) -> unsigned long long;
-  } // namespace FileInfo
-} // namespace Web
-
-#endif

source/web/header.cpp

@@ -1,69 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#include "header.hpp"
-
-#include <curl/curl.h>
-
-namespace Web
-{
-  Header::Header(const std::initializer_list<std::string>& init_list) noexcept : handle(nullptr)
-  {
-    for (auto& item : init_list)
-    {
-      this->append(item);
-    }
-  }
-
-  Header::~Header() noexcept
-  {
-    curl_slist_free_all(reinterpret_cast<curl_slist*>(this->handle));
-  }
-
-  Header::Header(Header&& other) noexcept
-  {
-    handle = other.handle;
-    other.handle = nullptr;
-  }
-
-  auto Header::operator=(Header&& other) noexcept -> Header&
-  {
-    if (this != &other)
-    {
-      Header(std::move(other)).swap(*this);
-    }
-
-    return *this;
-  }
-
-  auto Header::swap(Header& other) noexcept -> void
-  {
-    using std::swap;
-    swap(handle, other.handle);
-  }
-
-  void
-  Header::append(const std::string& item) noexcept
-  {
-    this->handle = curl_slist_append(reinterpret_cast<curl_slist*>(this->handle), item.c_str());
-  }
-} // namespace Web

source/web/header.hpp

@@ -1,51 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#ifndef WEB_HEADER_HPP
-#define WEB_HEADER_HPP
-
-#include <initializer_list>
-#include <string>
-
-namespace Web
-{
-  class Header final
-  {
-  public:
-    void* handle;
-
-    Header(const std::initializer_list<std::string>& init_list) noexcept;
-    Header(const Header& other) = delete;
-    Header(Header&& other) noexcept;
-    ~Header() noexcept;
-
-    auto operator=(const Header& other) -> Header& = delete;
-    auto operator=(Header&& other) noexcept -> Header&;
-
-    void append(const std::string& item) noexcept;
-
-  private:
-    auto swap(Header& other) noexcept -> void;
-  };
-} // namespace Web
-
-#endif

source/web/request.cpp

@@ -1,227 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#include "request.hpp"
-#include "fsinfo.hpp"
-#include "util.h"
-
-namespace Web
-{
-  static int sockopt_callback(void *clientp, curl_socket_t curlfd, curlsocktype purpose)
-  {
-    int const size = 1048576;
-    if (setsockopt(curlfd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)) == -1)
-    {
-      return CURL_SOCKOPT_ERROR;
-    }
-    if (setsockopt(curlfd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)) == -1)
-    {
-      return CURL_SOCKOPT_ERROR;
-    }
-
-    return CURL_SOCKOPT_OK;
-  }
-
-  auto inline get(const dict_t &options, const std::string &&name) -> std::string
-  {
-    auto it = options.find(name);
-    if (it == options.end())
-    {
-      return std::string{""};
-    }
-    else
-    {
-      return it->second;
-    }
-  }
-
-  Request::Request(dict_t &&options_) : options(options_)
-  {
-    auto hostname = get(options, "hostname");
-    auto username = get(options, "username");
-    auto password = get(options, "password");
-    auto timeout = get(options, "password");
-
-    auto proxy_hostname = get(options, "proxy_hostname");
-    auto proxy_username = get(options, "proxy_username");
-    auto proxy_password = get(options, "proxy_password");
-
-    auto cert_path = get(options, "cert_path");
-    auto key_path = get(options, "key_path");
-
-    this->handle = curl_easy_init();
-
-    this->set(CURLOPT_SSL_VERIFYHOST, 0);
-    this->set(CURLOPT_SSL_VERIFYPEER, 0);
-
-#ifdef _DEBUG
-    this->set(CURLOPT_VERBOSE, 1);
-#else
-    this->set(CURLOPT_VERBOSE, 0);
-#endif
-    if (this->cert_required())
-    {
-      this->set(CURLOPT_SSLCERTTYPE, "PEM");
-      this->set(CURLOPT_SSLKEYTYPE, "PEM");
-      this->set(CURLOPT_SSLCERT, const_cast<char *>(cert_path.c_str()));
-      this->set(CURLOPT_SSLKEY, const_cast<char *>(key_path.c_str()));
-    }
-
-    this->set(CURLOPT_URL, const_cast<char *>(hostname.c_str()));
-    if (!username.empty())
-    {
-      this->set(CURLOPT_HTTPAUTH, static_cast<int>(CURLAUTH_BASIC));
-      auto token = username + ":" + password;
-      this->set(CURLOPT_USERPWD, const_cast<char *>(token.c_str()));
-    }
-    this->set(CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
-    this->set(CURLOPT_FOLLOWLOCATION, 1);
-    this->set(CURLOPT_COOKIEJAR, "/data/ps4-webdav-client/cookies.txt");
-    this->set(CURLOPT_COOKIEFILE, "/data/ps4-webdav-client/cookies.txt");
-    if (timeout.empty())
-    {
-      this->set(CURLOPT_CONNECTTIMEOUT, 15L);
-    }
-    else
-    {
-      this->set(CURLOPT_CONNECTTIMEOUT, atoi(timeout.c_str()));
-    }
-
-    if (!this->proxy_enabled())
-      return;
-
-    this->set(CURLOPT_PROXY, const_cast<char *>(proxy_hostname.c_str()));
-    this->set(CURLOPT_PROXYAUTH, static_cast<int>(CURLAUTH_BASIC));
-
-    if (proxy_username.empty())
-      return;
-
-    if (proxy_password.empty())
-    {
-      this->set(CURLOPT_PROXYUSERNAME, const_cast<char *>(proxy_username.c_str()));
-    }
-    else
-    {
-      if (!username.empty() && !password.empty())
-      {
-        auto token = proxy_username + ":" + proxy_password;
-        this->set(CURLOPT_PROXYUSERPWD, const_cast<char *>(token.c_str()));
-      }
-    }
-  }
-
-  Request::~Request() noexcept
-  {
-    if (this->handle != nullptr)
-      curl_easy_cleanup(this->handle);
-  }
-
-  auto Request::swap(Request &other) noexcept -> void
-  {
-    using std::swap;
-    swap(handle, other.handle);
-  }
-
-  Request::Request(Request &&other) noexcept : handle{
-                                                   other.handle}
-  {
-    other.handle = nullptr;
-  }
-
-  auto Request::operator=(Request &&other) noexcept -> Request &
-  {
-    if (this != &other)
-    {
-      Request(std::move(other)).swap(*this);
-    }
-    return *this;
-  }
-
-  bool Request::perform() noexcept
-  {
-    if (this->handle == nullptr)
-      return false;
-    this->res = curl_easy_perform(this->handle);
-    auto is_performed = this->res == CURLE_OK;
-    if (!is_performed)
-      return false;
-    this->http_code = 0;
-    curl_easy_getinfo(this->handle, CURLINFO_RESPONSE_CODE, &this->http_code);
-    if (this->http_code < 200 || this->http_code > 299)
-      return false;
-    return true;
-  }
-
-  bool Request::proxy_enabled() const noexcept
-  {
-    auto proxy_hostname = get(options, "proxy_hostname");
-    auto proxy_username = get(options, "proxy_username");
-    auto proxy_password = get(options, "proxy_password");
-    bool proxy_hostname_presented = !proxy_hostname.empty();
-    if (!proxy_hostname_presented)
-      return false;
-    bool proxy_username_presented = !proxy_username.empty();
-    bool proxy_password_presented = !proxy_password.empty();
-    if (proxy_password_presented && !proxy_username_presented)
-      return false;
-    return true;
-  }
-
-  bool Request::cert_required() const noexcept
-  {
-    const auto cert_path = get(options, "cert_path");
-    const auto key_path = get(options, "key_path");
-    if (cert_path.empty())
-      return false;
-    bool cert_is_existed = FileInfo::exists(cert_path);
-    if (!cert_is_existed)
-      return false;
-    if (key_path.empty())
-      return false;
-    return FileInfo::exists(key_path);
-  }
-
-  long Request::status_code() const noexcept
-  {
-    return this->http_code;
-  }
-
-  int Request::result() const noexcept
-  {
-    return this->res;
-  }
-
-  class Environment
-  {
-  public:
-    Environment()
-    {
-      curl_global_init(CURL_GLOBAL_ALL);
-    }
-    ~Environment()
-    {
-      curl_global_cleanup();
-    }
-  };
-} // namespace Web
-
-static const Web::Environment env;

source/web/request.hpp

@@ -1,74 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#ifndef WEB_REQUEST_HPP
-#define WEB_REQUEST_HPP
-
-#include <curl/curl.h>
-#include <map>
-#include <string>
-
-namespace Web
-{
-  bool inline check_code(CURLcode code)
-  {
-    return code == CURLE_OK;
-  }
-
-  using dict_t = std::map<std::string, std::string>;
-
-  class Request
-  {
-  public:
-    explicit Request(dict_t &&options_);
-    Request(const Request &other) = delete;
-    Request(Request &&other) noexcept;
-    ~Request() noexcept;
-
-    auto operator=(const Request &other) -> Request & = delete;
-    auto operator=(Request &&other) noexcept -> Request &;
-
-    template <typename T>
-    auto set(CURLoption option, T value) const noexcept -> bool
-    {
-      if (this->handle == nullptr)
-        return false;
-      return check_code(curl_easy_setopt(this->handle, option, value));
-    }
-
-    bool perform() noexcept;
-    long status_code() const noexcept;
-    int result() const noexcept;
-    void *handle;
-
-  private:
-    const dict_t options;
-    dict_t response_header = {};
-    long http_code;
-    int res;
-    bool proxy_enabled() const noexcept;
-    bool cert_required() const noexcept;
-    auto swap(Request &other) noexcept -> void;
-  };
-} // namespace Web
-
-#endif

source/web/urn.cpp

@@ -1,262 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#include <curl/curl.h>
-
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
-
-using std::string;
-using std::vector;
-
-#include "urn.hpp"
-
-namespace Web
-{
-  namespace Urn
-  {
-
-    const string Path::separate = "/";
-    const string Path::root = "/";
-    const string Path::param_separate = "&";
-    const string Path::query_separate = "?";
-
-    string encodeUrl(const string &url, void *request)
-    {
-      size_t scheme_pos = url.find("://");
-      size_t root_pos = url.find("/", scheme_pos+3);
-      if (root_pos == string::npos)
-        return url;
-
-      string uri = url.substr(root_pos);
-      auto path = Path(uri);
-      return url.substr(0, root_pos) + path.quote(request);
-    }
-
-    Path::Path(const string& path_, bool force_dir)
-    {
-      string path = path_;
-      if (path_.empty()) path = Path::root;
-      auto first_position = path.find(Path::separate);
-      if (first_position != 0) path = Path::root + path;
-
-      auto last_symbol_index = path.length() - 1;
-      auto last_symbol = path.substr(last_symbol_index, 1);
-      auto is_dir = last_symbol == Path::separate;
-
-      if (force_dir && !is_dir) path += Path::separate;
-      m_path = path;
-      auto double_separte = Path::separate + Path::separate;
-      bool is_find = false;
-      do
-      {
-        auto first_position = m_path.find(double_separte);
-        is_find = first_position != m_path.npos;
-        if (is_find)
-        {
-          m_path.replace(first_position, double_separte.size(), Path::separate);
-        }
-      }
-      while (is_find);
-    }
-
-    Path::Path(std::nullptr_t)
-    {
-      m_path = nullptr;
-    }
-
-    auto Path::path() const -> string
-    {
-      return m_path;
-    }
-
-    auto escape(void* request, const string& name) -> string
-    {
-      string path = curl_easy_escape(request, name.c_str(), static_cast<int>(name.length()));
-      return path;
-    }
-
-    auto split(const string& text, const string& delims) -> vector<string>
-    {
-      vector<string> tokens;
-      auto start = text.find_first_not_of(delims);
-      auto end = text.npos;
-
-      while ((end = text.find_first_of(delims, start)) != text.npos)
-      {
-        tokens.push_back(text.substr(start, end - start));
-        start = text.find_first_not_of(delims, end);
-      }
-      if (start != text.npos)
-      {
-        tokens.push_back(text.substr(start));
-      }
-      return tokens;
-    }
-
-    auto Path::quote(void* request) const -> string
-    {
-      if (this->is_root()) return m_path;
-
-      size_t query_pos = m_path.find_first_of(Path::query_separate);
-      string query;
-      string path;
-      if (query_pos != string::npos)
-      {
-        query = m_path.substr(query_pos+1);
-        path = m_path.substr(0, query_pos);
-      }
-      else
-      {
-        path = m_path;
-      }
-      auto names = split(path, Path::separate);
-      string quote_path;
-
-      std::for_each(names.begin(), names.end(), [&quote_path, request](string & name)
-      {
-        auto escape_name = escape(request, name);
-        quote_path.append(Path::separate);
-        quote_path.append(escape_name);
-      });
-
-      if (is_directory())
-      {
-        quote_path.append(Path::separate);
-      }
-
-      if (query.length()>0)
-      {
-        auto params = split(query, Path::param_separate);
-        if (params.size() > 0)
-          quote_path.append(Path::query_separate);
-        std::for_each(params.begin(), params.end(), [&quote_path, request](string & param)
-        {
-          auto param_pair = split(param, "=");
-          if (param_pair.size() == 0)
-          {
-            quote_path.append(Path::param_separate);
-          }
-          else
-          {          
-            quote_path.append(escape(request, param_pair[0]));
-            quote_path.append("=");
-            if (param_pair.size() > 1)
-            {
-              quote_path.append(escape(request, param_pair[1]));
-            }
-            quote_path.append(Path::param_separate);
-          }
-        });
-        quote_path.pop_back();
-      }
-      return quote_path;
-    }
-
-    auto Path::name() const -> string
-    {
-      auto path = this->path();
-      auto is_root = path == Path::separate;
-      if (is_root) return string{""};
-
-      if (this->is_directory())
-      {
-        auto path_without_slash = path.substr(0, path.length() - 1);
-        auto pre_last_separate_position = path_without_slash.rfind(Path::separate);
-        auto name = path.substr(pre_last_separate_position + 1);
-        return name;
-      }
-      else
-      {
-        auto last_separate_position = path.rfind(Path::separate);
-        auto name = path.substr(last_separate_position + 1);
-        return name;
-      }
-    }
-
-    auto Path::parent() const -> Path
-    {
-      if (this->is_root()) return Path{m_path};
-
-      auto last_separate_position = m_path.rfind(Path::separate, m_path.length() - 2);
-      if (last_separate_position == 0) return Path{Path::separate};
-
-      auto parent = m_path.substr(0, last_separate_position + 1);
-      return Path{parent};
-    }
-
-    auto Path::is_directory() const -> bool
-    {
-      auto path = this->path();
-      auto last_symbol_index = path.length() - 1;
-      auto last_symbol = path.substr(last_symbol_index, 1);
-      auto is_equal = last_symbol == Path::separate;
-      return is_equal;
-    }
-
-    auto Path::is_root() const -> bool
-    {
-      return m_path == Path::separate;
-    }
-
-    auto Path::operator+(const string& rhs) const -> Path
-    {
-      return Path{ m_path + rhs };
-    }
-
-    auto Path::operator==(const Path& rhs) const -> bool
-    {
-      if (this->is_root() && rhs.is_root()) return true;
-      if (!this->is_root() && rhs.is_root()) return false;
-
-      string lhs_path;
-      bool is_dir = is_directory();
-      if (is_dir)
-      {
-        lhs_path = m_path.substr(0, m_path.length() - 1);
-      }
-      else
-      {
-        lhs_path = m_path;
-      }
-      string rhs_path;
-      if (rhs.is_directory())
-      {
-        rhs_path = rhs.path();
-        rhs_path = rhs_path.substr(0, rhs_path.length() - 1);
-      }
-      else
-      {
-        rhs_path = rhs.path();
-      }
-      return lhs_path == rhs_path;
-    }
-  } // namespace Urn
-} // namespace Web
-
-auto operator<<(std::ostream& stream, const Web::Urn::Path& path) -> std::ostream&
-{
-  return stream << path.path();
-}

source/web/urn.hpp

@@ -1,70 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#ifndef WEB_URN_HPP
-#define WEB_URN_HPP
-
-#include <cstddef>
-#include <iostream>
-#include <string>
-
-namespace Web
-{
-  namespace Urn
-  {
-    using std::string;
-    using std::nullptr_t;
-
-    string encodeUrl(const string &url, void *request);
-
-    class Path
-    {
-    public:
-
-      explicit Path(const string& path_, bool force_dir = false);
-      explicit Path(nullptr_t);
-
-      auto operator+(const std::string& rhs) const -> Path;
-      auto operator==(const Path& rhs) const -> bool;
-
-      auto is_directory() const -> bool;
-      auto is_root() const -> bool;
-      auto name() const -> string;
-      auto parent() const -> Path;
-      auto path() const -> string;
-      auto quote(void* request) const -> string;
-
-    private:
-
-      string m_path;
-
-      static const string separate;
-      static const string root;
-      static const string param_separate;
-      static const string query_separate;
-    };
-  }
-}
-
-auto operator<<(std::ostream& stream, const Web::Urn::Path& path) -> std::ostream&;
-
-#endif

source/webdav/client.hpp

@@ -1,419 +0,0 @@
-/*#***************************************************************************
-#                         __    __   _____       _____
-#   Project              |  |  |  | |     \     /  ___|
-#                        |  |__|  | |  |\  \   /  /
-#                        |        | |  | )  ) (  (
-#                        |   /\   | |  |/  /   \  \___
-#                         \_/  \_/  |_____/     \_____|
-#
-# Copyright (C) 2018, The WDC Project, <rusdevops@gmail.com>, et al.
-#
-# This software is licensed as described in the file LICENSE, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the LICENSE file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-############################################################################*/
-
-#ifndef WEBDAV_CLIENT_HPP
-#define WEBDAV_CLIENT_HPP
-
-#include <functional>
-#include <iostream>
-#include <map>
-#include <string>
-#include <vector>
-#include <curl/curl.h>
-#include "http/httplib.h"
-
-using namespace httplib;
-
-namespace WebDAV
-{
-  using progress_data_t = void*;
-
-  using progress_t = int(void* context,
-                                       curl_off_t dltotal,
-                                       curl_off_t dlnow,
-                                       curl_off_t ultotal,
-                                       curl_off_t ulnow);
-
-  using callback_t = std::function<void(bool)> ;
-
-  using strings_t = std::vector<std::string>;
-  using dict_t = std::map<std::string, std::string>;
-  using dict_items_t = std::vector<dict_t>;
-
-  auto inline get(const dict_t& options, const std::string&& name) -> std::string
-  {
-    auto it = options.find(name);
-    if (it == options.end()) return "";
-    else return it->second;
-  }
-
-  ///
-  /// \brief WebDAV Client
-  /// \author designerror
-  /// \version 1.1.4
-  /// \date 3/16/2018
-  ///
-  class Client
-  {
-  public:
-
-    ///
-    /// \param[in] webdav_hostname
-    /// \param[in] webdav_root
-    /// \param[in] webdav_username
-    /// \param[in] webdav_password
-    /// \param[in] proxy_hostname
-    /// \param[in] proxy_username
-    /// \param[in] proxy_password
-    /// \param[in] cert_path
-    /// \param[in] key_path
-    /// \include client/init.cpp
-    ///
-    explicit Client(const dict_t& options);
-
-    ///
-    /// Get free size of the WebDAV server
-    /// \return size in bytes
-    /// \include client/size.cpp
-    ///
-    auto free_size() -> unsigned long long;
-
-    ///
-    /// Check for existence of a remote resource
-    /// \param[in] remote_resource
-    /// \include client/check.cpp
-    ///
-    auto check(const std::string& remote_resource = "/") -> bool;
-
-    ///
-    /// Get information of a remote resource
-    /// \param[in] remote_resource
-    /// \include client/info.cpp
-    ///
-    auto info(const std::string& remote_resource) -> dict_t;
-
-    ///
-    /// Get information of a remote resource
-    /// \param[in] remote_resource
-    /// \include client/info.cpp
-    ///
-    auto head(const std::string& remote_resource, dict_t *headers) -> bool;
-
-    ///
-    /// Clean an remote resource
-    /// \param[in] remote_resource
-    /// \include client/clean.cpp
-    ///
-    auto clean(const std::string& remote_resource) -> bool;
-
-    ///
-    /// Checks whether the resource directory
-    /// \param[in] remote_resource
-    ///
-    auto is_directory(const std::string& remote_resource) -> bool;
-
-    ///
-    /// List a remote directory
-    /// \param[in] remote_directory
-    /// \include client/list.cpp
-    ///
-    auto list(const std::string& remote_directory = "") -> dict_items_t;
-
-    ///
-    /// Create a remote directory
-    /// \param[in] remote_directory
-    /// \param[in] recursive
-    /// \include client/mkdir.cpp
-    ///
-    auto create_directory(
-      const std::string& remote_directory,
-      bool recursive = false
-    ) -> bool;
-
-    ///
-    /// Move a remote resource
-    /// \param[in] remote_source_resource
-    /// \param[in] remote_destination_resource
-    /// \include client/move.cpp
-    ///
-    auto move(
-      const std::string& remote_source_resource,
-      const std::string& remote_destination_resource
-    ) -> bool;
-
-    ///
-    /// Copy a remote resource
-    /// \param[in] remote_source_resource
-    /// \param[in] remote_destination_resource
-    /// \include client/copy.cpp
-    ///
-    auto copy(
-      const std::string& remote_source_resource,
-      const std::string& remote_destination_resource
-    ) -> bool;
-
-    ///
-    /// Download a remote file to a local file
-    /// \param[in] remote_file
-    /// \param[in] local_file
-    /// \param[in] progress
-    /// \snippet client/download.cpp download_to_file
-    ///
-    auto download(
-      const std::string& remote_file,
-      const std::string& local_file,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Download a remote file to a buffer
-    /// \param[in] remote_file
-    /// \param[out] buffer_ptr
-    /// \param[out] buffer_size
-    /// \param[in] progress
-    /// \snippet client/download.cpp download_to_buffer
-    ///
-    auto download_to(
-      const std::string& remote_file,
-      char*& buffer_ptr,
-      unsigned long long& buffer_size,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Download a remote file to a buffer for specified range
-    /// \param[in] remote_file
-    /// \param[out] buffer_ptr
-    /// \param[out] buffer_size
-    /// \param[in] range_from,
-    /// \param[in] range_to
-    /// \param[in] progress
-    /// \snippet client/download.cpp download_to_buffer
-    ///
-    auto download_range_to(
-      const std::string& remote_file,
-      char*& buffer_ptr,
-      unsigned long long& buffer_size,
-      uint64_t range_from,
-      uint64_t range_to,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Download a remote file to a buffer for specified range
-    /// \param[in] remote_file
-    /// \param[out] sink,
-    /// \param[in] range_from,
-    /// \param[in] range_to
-    /// \param[in] progress
-    /// \snippet client/download.cpp download_to_buffer
-    ///
-    auto download_range_to(
-      const std::string &remote_file,
-      DataSink &sink,
-      uint64_t range_from,
-      uint64_t range_to,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;  
-
-    ///
-    /// Download a remote file to a stream
-    /// \param[in] remote_file
-    /// \param[out] stream
-    /// \param[in] progress
-    /// \snippet client/download.cpp download_to_stream
-    ///
-    auto download_to(
-      const std::string& remote_file,
-      std::ostream& stream,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Asynchronously download a remote file to a local file
-    /// \param[in] remote_file
-    /// \param[in] local_file
-    /// \param[in] callback
-    /// \param[in] progress
-    /// \snippet client/download.cpp async_download_to_file
-    ///
-    auto async_download(
-      const std::string& remote_file,
-      const std::string& local_file,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> void;
-
-    ///
-    /// Upload a remote file from a local file
-    /// \param[in] remote_file
-    /// \param[in] local_file
-    /// \param[in] progress
-    /// \snippet client/upload.cpp upload_from_file
-    ///
-    auto upload(
-      const std::string& remote_file,
-      const std::string& local_file,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Upload a remote file from a buffer
-    /// \param[in] remote_file
-    /// \param[in] buffer_ptr
-    /// \param[in] buffer_size
-    /// \param[in] progress
-    /// \snippet client/upload.cpp upload_from_buffer
-    ///
-    auto upload_from(
-      const std::string& remote_file,
-      char* buffer_ptr,
-      unsigned long long buffer_size,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Upload a remote file from a stream
-    /// \param[in] remote_file
-    /// \param[in] stream
-    /// \param[in] progress
-    /// \snippet client/upload.cpp upload_from_stream
-    ///
-    auto upload_from(
-      const std::string& remote_file,
-      std::istream& stream,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    ///
-    /// Asynchronously upload a remote file from a local file
-    /// \param[in] remote_file
-    /// \param[in] local_file
-    /// \param[in] callback
-    /// \param[in] progress
-    /// \snippet client/upload.cpp async_upload_from_file
-    ///
-    auto async_upload(
-      const std::string& remote_file,
-      const std::string& local_file,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> void;
-
-    long status_code();
-
-  private:
-
-    auto sync_download(
-      const std::string& remote_file,
-      const std::string& local_file,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    auto sync_download_to(
-      const std::string& remote_file,
-      char*& buffer_ptr,
-      unsigned long long& buffer_size,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    auto sync_download_range_to(
-      const std::string& remote_file,
-      char*& buffer_ptr,
-      unsigned long long& buffer_size,
-      uint64_t range_from,
-      uint64_t range_to,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    auto sync_download_range_to(
-      const std::string &remote_file,
-      DataSink &sink,
-      uint64_t range_from,
-      uint64_t range_to,
-      callback_t callback,
-      progress_data_t progress_data,
-      progress_t progress
-     ) -> bool;
-
-    bool sync_download_to(
-      const std::string& remote_file,
-      std::ostream& stream,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    );
-
-    bool sync_upload(
-      const std::string& remote_file,
-      const std::string& local_file,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    );
-
-    auto sync_upload_from(
-      const std::string& remote_file,
-      char* buffer_ptr,
-      unsigned long long buffer_size,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    auto sync_upload_from(
-      const std::string& remote_file,
-      std::istream& stream,
-      callback_t callback = nullptr,
-      progress_data_t progress_data = nullptr,
-      progress_t progress = nullptr
-    ) -> bool;
-
-    enum { buffer_size = 1000 * 1000 };
-
-    std::string webdav_hostname;
-    std::string webdav_root;
-    std::string webdav_username;
-    std::string webdav_password;
-
-    std::string proxy_hostname;
-    std::string proxy_username;
-    std::string proxy_password;
-
-    std::string cert_path;
-    std::string key_path;
-
-    dict_t options();
-
-    long http_code;
-    int result;
-    int check_enabled = 0;
-  };
-} // namespace WebDAV
-
-#endif

source/windows.cpp

@@ -14,10 +14,11 @@
 #include "util.h"
 #include "lang.h"
 #include "ime_dialog.h"
-#include "IconsFontAwesome6.h"
+#include "IconsFontAwesome6.h" 
 #include "OpenFontIcons.h"
 #include "textures.h"
 #include "sfo.h"
+#include "system.h"
 
 #define MAX_IMAGE_HEIGHT 980
 #define MAX_IMAGE_WIDTH 1820
@@ -30,6 +31,9 @@ extern "C"
 bool paused = false;
 int view_mode;
 static float scroll_direction = 0.0f;
+static int selected_local_position = -1;
+static int selected_remote_position = -1;
+
 static ime_callback_t ime_callback = nullptr;
 static ime_callback_t ime_after_update = nullptr;
 static ime_callback_t ime_before_update = nullptr;
@@ -43,6 +47,8 @@ static char txt_http_server_port[6];
 bool handle_updates = false;
 int64_t bytes_transfered;
 int64_t bytes_to_download;
+OrbisTick prev_tick;
+
 std::vector<DirEntry> local_files;
 std::vector<DirEntry> remote_files;
 std::set<DirEntry> multi_selected_local_files;
@@ -243,20 +249,33 @@ namespace Windows
     {
         std::string zipfolder;
         std::vector<DirEntry> files;
+        bool local_browser_selected = saved_selected_browser & LOCAL_BROWSER;
+        bool remote_browser_selected = saved_selected_browser & REMOTE_BROWSER;
 
-        if (multi_selected_local_files.size() > 0)
-            std::copy(multi_selected_local_files.begin(), multi_selected_local_files.end(), std::back_inserter(files));
+        if (local_browser_selected)
+        {
+            if (multi_selected_local_files.size() > 0)
+                std::copy(multi_selected_local_files.begin(), multi_selected_local_files.end(), std::back_inserter(files));
+            else
+                files.push_back(selected_local_file);
+        }
         else
-            files.push_back(selected_local_file);
+        {
+            if (multi_selected_remote_files.size() > 0)
+                std::copy(multi_selected_remote_files.begin(), multi_selected_remote_files.end(), std::back_inserter(files));
+            else
+                files.push_back(selected_remote_file);
+        }
 
-        if (strncmp(files.begin()->directory, "/data", 5) != 0 &&
-            strncmp(files.begin()->directory, "/mnt/usb", 8) != 0)
+        if (strncmp(local_directory, "/data", 5) != 0 &&
+            strncmp(local_directory, "/mnt/usb", 8) != 0 &&
+            strncmp(local_directory, "/user/data", 10) != 0)
         {
             zipfolder = "/data";
         }
         else if (files.size() > 1)
         {
-            zipfolder = files.begin()->directory;
+            zipfolder = local_directory;
         }
         else
         {
@@ -436,6 +455,26 @@ namespace Windows
             ImGui::PopTextWrapPos();
             ImGui::EndTooltip();
         }
+
+        ImGui::SameLine();
+        ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 5);
+        ImGui::TextColored(colors[ImGuiCol_ButtonHovered], "%s:", lang_strings[STR_ENABLE_DISK_CACHE]);
+        ImGui::SameLine();
+
+        if (ImGui::Checkbox("###enable_disk_cache", &remote_settings->enable_disk_cache))
+        {
+            CONFIG::SaveConfig();
+        }
+        if (ImGui::IsItemHovered())
+        {
+            ImGui::SetNextWindowSize(ImVec2(450, 70));
+            ImGui::BeginTooltip();
+            ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + 440);
+            ImGui::Text("%s", lang_strings[STR_ENABLE_DISC_CACHE_MSG]);
+            ImGui::PopTextWrapPos();
+            ImGui::EndTooltip();
+        }
+
         ImGui::PopStyleVar();
 
         ImGui::SameLine();
@@ -601,6 +640,22 @@ namespace Windows
                     ImGui::Text("%s", item.name);
                     ImGui::EndTooltip();
                 }
+                if (ImGui::IsKeyPressed(ImGuiKey_GamepadDpadUp) && !paused)
+                {
+                    if (j == 0)
+                    {
+                        selected_local_position = local_files.size()-1;
+                        scroll_direction = 0.0f;
+                    }
+                }
+                else if (ImGui::IsKeyPressed(ImGuiKey_GamepadDpadDown) && !paused)
+                {
+                    if (j == local_files.size()-1)
+                    {
+                        selected_local_position = 0;
+                        scroll_direction = 1.0f;
+                    }
+                }
             }
             if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows))
             {
@@ -610,6 +665,12 @@ namespace Windows
                     ImGui::SetScrollHereY(0.5f);
                     sprintf(local_file_to_select, "");
                 }
+                if (selected_local_position == j && !paused)
+                {
+                    SetNavFocusHere();
+                    ImGui::SetScrollHereY(scroll_direction);
+                    selected_local_position = -1;
+                }
                 selected_browser |= LOCAL_BROWSER;
             }
             ImGui::NextColumn();
@@ -766,6 +827,22 @@ namespace Windows
                     ImGui::Text("%s", item.name);
                     ImGui::EndTooltip();
                 }
+                if (ImGui::IsKeyPressed(ImGuiKey_GamepadDpadUp) && !paused)
+                {
+                    if (j == 0)
+                    {
+                        selected_remote_position = remote_files.size()-1;
+                        scroll_direction = 0.0f;
+                    }
+                }
+                else if (ImGui::IsKeyPressed(ImGuiKey_GamepadDpadDown) && !paused)
+                {
+                    if (j == remote_files.size()-1)
+                    {
+                        selected_remote_position = 0;
+                        scroll_direction = 1.0f;
+                    }
+                }
             }
             ImGui::PopID();
             if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows))
@@ -776,6 +853,12 @@ namespace Windows
                     ImGui::SetScrollHereY(0.5f);
                     sprintf(remote_file_to_select, "");
                 }
+                if (selected_remote_position == j && !paused)
+                {
+                    SetNavFocusHere();
+                    ImGui::SetScrollHereY(scroll_direction);
+                    selected_remote_position = -1;
+                }
                 selected_browser |= REMOTE_BROWSER;
             }
             ImGui::NextColumn();
@@ -1049,26 +1132,29 @@ namespace Windows
             ImGui::PopID();
             ImGui::Separator();
 
+            ImGui::PushID("Extract##settings");
+            if (ImGui::Selectable(lang_strings[STR_EXTRACT], false, getSelectableFlag(REMOTE_ACTION_EXTRACT) | ImGuiSelectableFlags_DontClosePopups, ImVec2(220, 0)))
+            {
+                ResetImeCallbacks();
+                sprintf(extract_zip_folder, "%s", getExtractFolder().c_str());
+                ime_single_field = extract_zip_folder;
+                ime_field_size = 255;
+                ime_callback = SingleValueImeCallback;
+                if (local_browser_selected)
+                    ime_after_update = AfterExtractFolderCallback;
+                else
+                    ime_after_update = AfterExtractRemoteFolderCallback;
+                Dialog::initImeDialog(lang_strings[STR_EXTRACT_LOCATION], extract_zip_folder, 255, ORBIS_TYPE_BASIC_LATIN, 600, 350);
+                gui_mode = GUI_MODE_IME;
+                file_transfering = false;
+                SetModalMode(false);
+                ImGui::CloseCurrentPopup();
+            }
+            ImGui::PopID();
+            ImGui::Separator();
+
             if (local_browser_selected)
             {
-                ImGui::PushID("Extract##settings");
-                if (ImGui::Selectable(lang_strings[STR_EXTRACT], false, getSelectableFlag(REMOTE_ACTION_NONE) | ImGuiSelectableFlags_DontClosePopups, ImVec2(220, 0)))
-                {
-                    ResetImeCallbacks();
-                    sprintf(extract_zip_folder, "%s", getExtractFolder().c_str());
-                    ime_single_field = extract_zip_folder;
-                    ime_field_size = 255;
-                    ime_callback = SingleValueImeCallback;
-                    ime_after_update = AfterExtractFolderCallback;
-                    Dialog::initImeDialog(lang_strings[STR_EXTRACT_LOCATION], extract_zip_folder, 255, ORBIS_TYPE_BASIC_LATIN, 600, 350);
-                    gui_mode = GUI_MODE_IME;
-                    file_transfering = false;
-                    SetModalMode(false);
-                    ImGui::CloseCurrentPopup();
-                }
-                ImGui::PopID();
-                ImGui::Separator();
-
                 ImGui::PushID("Compress##settings");
                 if (ImGui::Selectable(lang_strings[STR_COMPRESS], false, getSelectableFlag(REMOTE_ACTION_NONE) | ImGuiSelectableFlags_DontClosePopups, ImVec2(220, 0)))
                 {
@@ -1340,8 +1426,19 @@ namespace Windows
                 if (file_transfering)
                 {
                     static float progress = 0.0f;
+                    static double transfer_speed = 0.0f;
+                    static char progress_text[32];
+                    static OrbisTick cur_tick;
+                    static double tick_delta;
+                   
+                    sceRtcGetCurrentTick(&cur_tick);
+                    tick_delta = (cur_tick.mytick - prev_tick.mytick) * 1.0f / 1000000.0f;
+
                     progress = bytes_transfered * 1.0f / (float)bytes_to_download;
-                    ImGui::ProgressBar(progress, ImVec2(625, 0));
+                    transfer_speed = (bytes_transfered * 1.0f / tick_delta) / 1048576.0f;
+
+                    sprintf(progress_text, "%.2f MB/s", transfer_speed);
+                    ImGui::ProgressBar(progress, ImVec2(625, 0), progress_text);
                 }
 
                 ImGui::Separator();
@@ -1605,11 +1702,38 @@ namespace Windows
             ImGui::OpenPopup(lang_strings[STR_SETTINGS]);
 
             ImGui::SetNextWindowPos(ImVec2(1050, 80));
-            ImGui::SetNextWindowSizeConstraints(ImVec2(850, 80), ImVec2(850, 650), NULL, NULL);
+            ImGui::SetNextWindowSizeConstraints(ImVec2(850, 80), ImVec2(850, 750), NULL, NULL);
             if (ImGui::BeginPopupModal(lang_strings[STR_SETTINGS], NULL, ImGuiWindowFlags_AlwaysAutoResize))
             {
+                char id[192];
+                ImVec2 field_size;
+                float width;
+
                 ImGui::TextColored(colors[ImGuiCol_ButtonHovered], "%s", lang_strings[STR_GLOBAL]);
                 ImGui::Separator();
+                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
+                ImGui::Text("%s", lang_strings[STR_LANGUAGE]);
+                ImGui::SameLine();
+                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
+                ImGui::SetNextItemWidth(690);
+                if (ImGui::BeginCombo("##Language", language, ImGuiComboFlags_PopupAlignLeft | ImGuiComboFlags_HeightLargest))
+                {
+                    for (int n = 0; n < langs.size(); n++)
+                    {
+                        const bool is_selected = strcmp(langs[n].c_str(), language) == 0;
+                        if (ImGui::Selectable(langs[n].c_str(), is_selected))
+                        {
+                            sprintf(language, "%s", langs[n].c_str());
+                        }
+
+                        // Set the initial focus when opening the combo (scrolling + keyboard navigation focus)
+                        if (is_selected)
+                            ImGui::SetItemDefaultFocus();
+                    }
+                    ImGui::EndCombo();
+                }
+                ImGui::Separator();
+
                 ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
                 ImGui::Text("%s", lang_strings[STR_AUTO_DELETE_TMP_PKG]);
                 ImGui::SameLine();
@@ -1623,6 +1747,26 @@ namespace Windows
                 ImGui::Checkbox("##show_hidden_files", &show_hidden_files);
                 ImGui::Separator();
 
+                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
+                ImGui::Text("%s", lang_strings[STR_TEMP_DIRECTORY]);
+                ImGui::SameLine();
+                field_size = ImGui::CalcTextSize(lang_strings[STR_TEMP_DIRECTORY]);
+                width = field_size.x + 45;
+                sprintf(id, "%s##temp_direcotry", temp_folder);
+                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
+                ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 1.0f));
+                if (ImGui::Button(id, ImVec2(835-width, 0)))
+                {
+                    ResetImeCallbacks();
+                    ime_single_field = temp_folder;
+                    ime_field_size = 512;
+                    ime_callback = SingleValueImeCallback;
+                    Dialog::initImeDialog(lang_strings[STR_COMPRESSED_FILE_PATH], temp_folder, 255, ORBIS_TYPE_BASIC_LATIN, 1050, 80);
+                    gui_mode = GUI_MODE_IME;
+                }
+                ImGui::PopStyleVar();
+                ImGui::Separator();
+
                 // Web Server settings
                 ImGui::TextColored(colors[ImGuiCol_ButtonHovered], "%s", lang_strings[STR_WEB_SERVER]);
                 ImGui::Separator();
@@ -1633,15 +1777,13 @@ namespace Windows
                 ImGui::Checkbox("##web_server_enabled", &web_server_enabled);
                 ImGui::Separator();
 
-                ImVec2 field_size;
                 field_size = ImGui::CalcTextSize(lang_strings[STR_PORT]);
-                float width = field_size.x + 45;
+                width = field_size.x + 45;
                 ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
                 ImGui::Text("%s", lang_strings[STR_PORT]);
                 ImGui::SameLine();
                 ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 1.0f));
 
-                char id[192];
                 sprintf(id, "%s##http_server_port", txt_http_server_port);
                 ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 15);
                 if (ImGui::Button(id, ImVec2(835-width, 0)))
@@ -1674,7 +1816,6 @@ namespace Windows
                 ImGui::PopStyleVar();
                 ImGui::Separator();
 
-                // Google settings
                 ImGui::TextColored(colors[ImGuiCol_ButtonHovered], "%s", lang_strings[STR_ALLDEBRID]);
                 ImGui::Separator();
 
@@ -1689,14 +1830,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();
@@ -2000,10 +2168,19 @@ namespace Windows
             activity_inprogess = true;
             sprintf(activity_message, "%s", "");
             stop_activity = false;
-            file_transfering = false;
+            file_transfering = true;
             selected_action = ACTION_NONE;
             Actions::ExtractLocalZips();
             break;
+        case ACTION_EXTRACT_REMOTE_ZIP:
+            sprintf(status_message, "%s", "");
+            activity_inprogess = true;
+            sprintf(activity_message, "%s", "");
+            stop_activity = false;
+            file_transfering = true;
+            selected_action = ACTION_NONE;
+            Actions::ExtractRemoteZips();
+            break;
         case ACTION_CREATE_LOCAL_ZIP:
             sprintf(status_message, "%s", "");
             activity_inprogess = true;
@@ -2086,6 +2263,7 @@ namespace Windows
         case ACTION_INSTALL_REMOTE_PKG:
             sprintf(status_message, "%s", "");
             activity_inprogess = true;
+            file_transfering = true;
             sprintf(activity_message, "%s", "");
             stop_activity = false;
             Actions::InstallRemotePkgs();
@@ -2383,6 +2561,11 @@ namespace Windows
         selected_action = ACTION_EXTRACT_LOCAL_ZIP;
     }
 
+    void AfterExtractRemoteFolderCallback(int ime_result)
+    {
+        selected_action = ACTION_EXTRACT_REMOTE_ZIP;
+    }
+
     void AfterZipFileCallback(int ime_result)
     {
         selected_action = ACTION_CREATE_LOCAL_ZIP;

source/windows.h

@@ -1,5 +1,5 @@
-#ifndef LAUNCHER_WINDOWS_H
-#define LAUNCHER_WINDOWS_H
+#ifndef EZ_WINDOWS_H
+#define EZ_WINDOWS_H
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <set>
@@ -7,6 +7,7 @@
 #include "imgui_internal.h"
 #include "common.h"
 #include "actions.h"
+#include "system.h"
 #include "SDL2/SDL.h"
 
 #define LOCAL_BROWSER 1
@@ -16,6 +17,7 @@ extern int view_mode;
 extern bool handle_updates;
 extern int64_t bytes_transfered;
 extern int64_t bytes_to_download;
+extern OrbisTick prev_tick;
 extern std::vector<DirEntry> local_files;
 extern std::vector<DirEntry> remote_files;
 extern std::set<DirEntry> multi_selected_local_files;
@@ -206,6 +208,7 @@ namespace Windows
     void AfterPackageUrlCallback(int ime_result);
     void AfterFavoriteUrlCallback(int ime_result);
     void AfterExtractFolderCallback(int ime_result);
+    void AfterExtractRemoteFolderCallback(int ime_result);
     void AfterZipFileCallback(int ime_result);
     void AferServerChangeCallback(int ime_result);
     void AfterHttpPortChangeCallback(int ime_result);

source/zip_util.cpp

@@ -12,16 +12,17 @@
 #include <archive.h>
 #include <archive_entry.h>
 
+#include "clients/remote_client.h"
+#include "config.h"
 #include "common.h"
 #include "fs.h"
 #include "ime_dialog.h"
 #include "lang.h"
 #include "system.h"
 #include "windows.h"
+#include "util.h"
 #include "zip_util.h"
 
-#define TRANSFER_SIZE (16 * 1024)
-
 namespace ZipUtil
 {
     static char filename_extracted[256];
@@ -71,6 +72,8 @@ namespace ZipUtil
         convertToZipTime(file_stat.st_mtim.tv_sec, &zi.tmz_date);
 
         bytes_transfered = 0;
+        sceRtcGetCurrentTick(&prev_tick);
+
         bytes_to_download = file_stat.st_size;
 
         // Large file?
@@ -95,12 +98,12 @@ namespace ZipUtil
         }
 
         // Add file to zip
-        void *buf = memalign(4096, TRANSFER_SIZE);
+        void *buf = memalign(4096, ARCHIVE_TRANSFER_SIZE);
         uint64_t seek = 0;
 
         while (1)
         {
-            int read = FS::Read(fd, buf, TRANSFER_SIZE);
+            int read = FS::Read(fd, buf, ARCHIVE_TRANSFER_SIZE);
             if (read < 0)
             {
                 free(buf);
@@ -234,7 +237,8 @@ namespace ZipUtil
         len = strlen(path);
         while (len && path[len - 1] == '/')
             len--;
-        if ((str = (char*) malloc(len + 1)) == NULL) {
+        if ((str = (char *)malloc(len + 1)) == NULL)
+        {
             errno = ENOMEM;
         }
         memcpy(str, path, len);
@@ -252,21 +256,23 @@ namespace ZipUtil
 
         prelen = prefix ? strlen(prefix) + 1 : 0;
         len = strlen(path) + 1;
-        if ((str = (char*) malloc(prelen + len)) == NULL) {
+        if ((str = (char *)malloc(prelen + len)) == NULL)
+        {
             errno = ENOMEM;
         }
-        if (prefix) {
-            memcpy(str, prefix, prelen);	/* includes zero */
-            str[prelen - 1] = '/';		/* splat zero */
+        if (prefix)
+        {
+            memcpy(str, prefix, prelen); /* includes zero */
+            str[prelen - 1] = '/';       /* splat zero */
         }
-        memcpy(str + prelen, path, len);	/* includes zero */
+        memcpy(str + prelen, path, len); /* includes zero */
 
         return (str);
     }
 
     /*
-    * Extract a directory.
-    */
+     * Extract a directory.
+     */
     static void extract_dir(struct archive *a, struct archive_entry *e, const std::string &path)
     {
         int mode;
@@ -279,39 +285,49 @@ namespace ZipUtil
     }
 
     /*
-    * Extract to a file descriptor
-    */
+     * Extract to a file descriptor
+     */
     static int extract2fd(struct archive *a, const std::string &pathname, int fd)
     {
         ssize_t len;
-        unsigned char buffer[TRANSFER_SIZE];
+        unsigned char *buffer = (unsigned char *)malloc(ARCHIVE_TRANSFER_SIZE);
+        bytes_transfered = 0;
+        sceRtcGetCurrentTick(&prev_tick);
 
         /* loop over file contents and write to fd */
-        for (int n = 0; ; n++) {
-            len = archive_read_data(a, buffer, sizeof buffer);
+        for (int n = 0;; n++)
+        {
+            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;
             }
+            bytes_transfered += len;
 
             if (write(fd, buffer, len) != len)
             {
                 sprintf(status_message, "error write('%s')", pathname.c_str());
+                free(buffer);
                 return 0;
             }
         }
 
+        free(buffer);
         return 1;
     }
 
     /*
-    * Extract a regular file.
-    */
+     * Extract a regular file.
+     */
     static void extract_file(struct archive *a, struct archive_entry *e, const std::string &path)
     {
         struct stat sb;
@@ -320,13 +336,15 @@ namespace ZipUtil
 
         /* look for existing file of same name */
     recheck:
-        if (lstat(path.c_str(), &sb) == 0) {
+        if (lstat(path.c_str(), &sb) == 0)
+        {
             (void)unlink(path.c_str());
         }
 
         /* process symlinks */
         linkname = archive_entry_symlink(e);
-        if (linkname != NULL) {
+        if (linkname != NULL)
+        {
             if (symlink(linkname, path.c_str()) != 0)
             {
                 sprintf(status_message, "error symlink('%s')", path.c_str());
@@ -337,7 +355,8 @@ namespace ZipUtil
             return;
         }
 
-        if ((fd = open(path.c_str(), O_RDWR|O_CREAT|O_TRUNC, 0777)) < 0)
+        bytes_to_download = archive_entry_size(e);
+        if ((fd = open(path.c_str(), O_RDWR | O_CREAT | O_TRUNC, 0777)) < 0)
         {
             sprintf(status_message, "error open('%s')", path.c_str());
             return;
@@ -356,9 +375,9 @@ namespace ZipUtil
     {
         char *pathname, *realpathname;
         mode_t filetype;
-        char *p, *q;
 
-        if ((pathname = pathdup(archive_entry_pathname(e))) == NULL) {
+        if ((pathname = pathdup(archive_entry_pathname(e))) == NULL)
+        {
             archive_read_data_skip(a);
             return;
         }
@@ -367,14 +386,16 @@ namespace ZipUtil
         /* sanity checks */
         if (pathname[0] == '/' ||
             strncmp(pathname, "../", 3) == 0 ||
-            strstr(pathname, "/../") != NULL) {
+            strstr(pathname, "/../") != NULL)
+        {
             archive_read_data_skip(a);
             free(pathname);
             return;
         }
 
         /* I don't think this can happen in a zipfile.. */
-        if (!S_ISDIR(filetype) && !S_ISREG(filetype) && !S_ISLNK(filetype)) {
+        if (!S_ISDIR(filetype) && !S_ISREG(filetype) && !S_ISLNK(filetype))
+        {
             archive_read_data_skip(a);
             free(pathname);
             return;
@@ -398,9 +419,9 @@ namespace ZipUtil
     }
 
     /*
-    * Callback function for reading passphrase.
-    * Originally from cpio.c and passphrase.c, libarchive.
-    */
+     * Callback function for reading passphrase.
+     * Originally from cpio.c and passphrase.c, libarchive.
+     */
     static const char *passphrase_callback(struct archive *a, void *_client_data)
     {
         Dialog::initImeDialog(lang_strings[STR_PASSWORD], password, 127, ORBIS_TYPE_DEFAULT, 560, 200);
@@ -422,14 +443,102 @@ namespace ZipUtil
         return password;
     }
 
+    static RemoteArchiveData *OpenRemoteArchive(const std::string &file, RemoteClient *client)
+    {
+        RemoteArchiveData *data;
+
+        data = (RemoteArchiveData *)malloc(sizeof(RemoteArchiveData));
+        memset(data, 0, sizeof(RemoteArchiveData));
+
+        data->offset = 0;
+        client->Size(file, &data->size);
+        data->client = client;
+        data->path = file;
+        if (client->SupportedActions() & REMOTE_ACTION_RAW_READ)
+        {
+            data->fp = client->Open(file, O_RDONLY);
+        }
+        return data;
+    }
+
+    static ssize_t ReadRemoteArchive(struct archive *a, void *client_data, const void **buff)
+    {
+        ssize_t to_read;
+        int ret;
+        RemoteArchiveData *data;
+
+        data = (RemoteArchiveData *)client_data;
+        *buff = data->buf;
+
+        to_read = data->size - data->offset;
+        if (to_read == 0)
+            return 0;
+
+        to_read = MIN(to_read, ARCHIVE_TRANSFER_SIZE);
+        if (data->client->SupportedActions() & REMOTE_ACTION_RAW_READ)
+            ret = data->client->GetRange((data->fp), data->buf, to_read, data->offset);
+        else
+            ret = data->client->GetRange(data->path, data->buf, to_read, data->offset);
+
+        if (ret == 0)
+            return -1;
+        data->offset = data->offset + to_read;
+
+        return to_read;
+    }
+
+    static int CloseRemoteArchive(struct archive *a, void *client_data)
+    {
+        if (client_data != nullptr)
+        {
+            RemoteArchiveData *data = (RemoteArchiveData *)client_data;
+            if (data->client->SupportedActions() & REMOTE_ACTION_RAW_READ)
+                data->client->Close(data->fp);
+            free(client_data);
+        }
+        return 0;
+    }
+
+    int64_t SeekRemoteArchive(struct archive *, void *client_data, int64_t offset, int whence)
+    {
+        RemoteArchiveData *data = (RemoteArchiveData *)client_data;
+
+        if (whence == SEEK_SET)
+        {
+            data->offset = offset;
+        }
+        else if (whence == SEEK_CUR)
+        {
+            data->offset = data->offset + offset - 1;
+        }
+        else if (whence == SEEK_END)
+        {
+            data->offset = data->size - 1;
+        }
+        else
+            return ARCHIVE_FATAL;
+
+        return data->offset;
+    }
+
+    int64_t SkipRemoteArchive(struct archive *, void *client_data, int64_t request)
+    {
+        RemoteArchiveData *data = (RemoteArchiveData *)client_data;
+
+        data->offset = data->offset + request - 1;
+
+        return request;
+    }
+
     /*
-    * 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)
+     * 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, RemoteClient *client)
     {
         struct archive *a;
         struct archive_entry *e;
+        RemoteArchiveData *client_data = nullptr;
         int ret;
         uintmax_t total_size, file_count, error_count;
 
@@ -440,14 +549,41 @@ namespace ZipUtil
         archive_read_support_filter_all(a);
         archive_read_set_passphrase_callback(a, NULL, &passphrase_callback);
 
-        ret = archive_read_open_filename(a, file.path, TRANSFER_SIZE);
-        if (ret < ARCHIVE_OK)
+        if (client == nullptr)
         {
-            sprintf(status_message, "%s", "archive_read_open_filename failed");
-            return 0;
+            ret = archive_read_open_filename(a, file.path, ARCHIVE_TRANSFER_SIZE);
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "%s", "archive_read_open_filename failed");
+                return 0;
+            }
+        }
+        else
+        {
+            client_data = OpenRemoteArchive(file.path, client);
+            if (client_data == nullptr)
+            {
+                sprintf(status_message, "%s", "archive_read_open_filename failed");
+                return 0;
+            }
+
+            ret = archive_read_set_seek_callback(a, SeekRemoteArchive);
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "archive_read_set_seek_callback failed - %s", archive_error_string(a));
+                return 0;
+            }
+
+            ret = archive_read_open2(a, client_data, NULL, ReadRemoteArchive, SkipRemoteArchive, CloseRemoteArchive);
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "%s", "archive_read_open failed");
+                return 0;
+            }
         }
 
-        for (;;) {
+        for (;;)
+        {
             if (stop_activity)
                 break;
 
@@ -462,7 +598,7 @@ namespace ZipUtil
 
             if (ret == ARCHIVE_EOF)
                 break;
-            
+
             extract(a, e, basepath);
         }
 
@@ -471,4 +607,196 @@ namespace ZipUtil
         return 1;
     }
 
+    ArchiveEntry *GetPackageEntry(const std::string &zip_file, RemoteClient *client)
+    {
+        struct archive *a;
+        struct archive_entry *e;
+        RemoteArchiveData *client_data = nullptr;
+        char *pathname;
+        mode_t filetype;
+        ArchiveEntry *pkg_entry = nullptr;
+        int ret;
+
+        if ((a = archive_read_new()) == NULL)
+        {
+            sprintf(status_message, "%s", "archive_read_new failed");
+            return nullptr;
+        }
+
+        archive_read_support_format_all(a);
+        archive_read_support_filter_all(a);
+        archive_read_set_passphrase_callback(a, NULL, &passphrase_callback);
+
+        if (client == nullptr)
+        {
+            ret = archive_read_open_filename(a, zip_file.c_str(), ARCHIVE_TRANSFER_SIZE);
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "%s", "archive_read_open_filename failed");
+                return nullptr;
+            }
+        }
+        else
+        {
+            client_data = OpenRemoteArchive(zip_file, client);
+            if (client_data == nullptr)
+            {
+                sprintf(status_message, "%s", "archive_read_open_filename failed");
+                return nullptr;
+            }
+
+            ret = archive_read_set_seek_callback(a, SeekRemoteArchive);
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "archive_read_set_seek_callback failed - %s", archive_error_string(a));
+                return 0;
+            }
+
+            ret = archive_read_open2(a, client_data, NULL, ReadRemoteArchive, SkipRemoteArchive, CloseRemoteArchive);
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "%s", "archive_read_open_filename failed");
+                return nullptr;
+            }
+        }
+
+        for (;;)
+        {
+            ret = archive_read_next_header(a, &e);
+
+            if (ret < ARCHIVE_OK)
+            {
+                sprintf(status_message, "%s", "archive_read_next_header failed");
+                archive_read_free(a);
+                return nullptr;
+            }
+
+            if (ret == ARCHIVE_EOF)
+            {
+                break;
+            }
+
+            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");
+                archive_read_free(a);
+                return nullptr;
+            }
+
+            if (ret == ARCHIVE_EOF)
+                break;
+
+            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;
+    }
 }

source/zip_util.h

@@ -1,13 +1,17 @@
-#ifndef ZIP_UTIL_H
-#define ZIP_UTIL_H
+#ifndef EZ_ZIP_UTIL_H
+#define EZ_ZIP_UTIL_H
 
 #include <string.h>
 #include <stdlib.h>
 #include <minizip/unzip.h>
 #include <minizip/zip.h>
+#include <archive.h>
+#include <archive_entry.h>
 #include "common.h"
 #include "fs.h"
 
+#define ARCHIVE_TRANSFER_SIZE 20971520
+
 static uint8_t MAGIC_ZIP_1[4] = {0x50, 0x4B, 0x03, 0x04};
 static uint8_t MAGIC_ZIP_2[4] = {0x50, 0x4B, 0x05, 0x06};
 static uint8_t MAGIC_ZIP_3[4] = {0x50, 0x4B, 0x07, 0x08};
@@ -24,9 +28,30 @@ enum CompressFileType {
     COMPRESS_FILE_TYPE_UNKNOWN
 };
 
+struct RemoteArchiveData
+{
+    void *fp;
+    std::string path;
+    ssize_t size;
+    ssize_t offset;
+    uint8_t buf[ARCHIVE_TRANSFER_SIZE];
+    RemoteClient *client;
+};
+
+struct ArchiveEntry
+{
+    struct archive *archive;
+    struct archive_entry *entry;
+    std::string filename;
+    size_t filesize;
+    RemoteArchiveData *client_data;
+};
+
 namespace ZipUtil
 {
     int ZipAddPath(zipFile zf, const std::string &path, int filename_start, int level);
-    int Extract(const DirEntry &file, const std::string &dir);
+    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