Merge branch 'feature-updates' into develop

setvisible · Sep 7, 2024 · 054ed7c · 054ed7c
2 parents 6077035 + bb2cf34
commit 054ed7c
Show file tree

Hide file tree

Showing 70 changed files with 22,023 additions and 8,034 deletions.
diff --git a/.tx/config b/.tx/config
@@ -9,20 +9,20 @@ source_file  = src/locale/arrowdl_en_US.ts
 source_lang  = en
 type         = QT
 minimum_perc = 0
-lang_map     = ar_EG: ar_EG, de_DE: de_DE, en_US: en_US, es_ES: es_ES, fr_FR: fr_FR, hu_HU: hu_HU, it_IT: it_IT, ja_JP: ja_JP, ko_KR: ko_KR, nl_NL: nl_NL, pl_PL: pl_PL, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru_RU, vi_VN: vi_VN, zh_CN: zh_CN
+lang_map     = ar_EG: ar_EG, de_DE: de_DE, en_US: en_US, es_BO: es_BO, es_ES: es_ES, es_US: es_US, fr_FR: fr_FR, hu_HU: hu_HU, it_IT: it_IT, ja_JP: ja_JP, ko_KR: ko_KR, nl_NL: nl_NL, pl_PL: pl_PL, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru_RU, vi_VN: vi_VN, zh_CN: zh_CN, zh_TW: zh_TW
 
 [o:arrowdl:p:arrowdl:r:web-extension]
 file_filter  = web-extension/extension/src/base/_locales/<lang>/messages.json
 source_file  = web-extension/extension/src/base/_locales/en/messages.json
 source_lang  = en
 type         = CHROME
 minimum_perc = 0
-lang_map     = ar_EG: ar, de_DE: de, en_US: en, es_ES: es, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN
+lang_map     = ar_EG: ar, de_DE: de, en_US: en, es_BO: es_BO, es_ES: es_ES, es_US: es_US, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN, zh_TW: zh_TW
 
 [o:arrowdl:p:arrowdl:r:windows-installer]
 file_filter = installer/windows/NSIS/i18n/sources/<lang>.json
 source_file = installer/windows/NSIS/i18n/sources/en.json
 source_lang = en
 type        = KEYVALUEJSON
-lang_map    = ar_EG: ar, de_DE: de, en_US: en, es_ES: es, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN
+lang_map    = ar_EG: ar, de_DE: de, en_US: en, es_BO: es_BO, es_ES: es_ES, es_US: es_US, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN, zh_TW: zh_TW
 
diff --git a/3rd/yt-dlp/bin/yt-dlp b/3rd/yt-dlp/bin/yt-dlp
diff --git a/3rd/yt-dlp/bin/yt-dlp.exe b/3rd/yt-dlp/bin/yt-dlp.exe
diff --git a/3rd/yt-dlp/version b/3rd/yt-dlp/version
@@ -1 +1 @@
-2024.07.25
+2024.08.06
diff --git a/TRANSLATORS.md b/TRANSLATORS.md
@@ -15,6 +15,9 @@ To add the language 'xx' in country 'XX':
 
 2. Go to Transifex > Language > Add the language > Add xx_XX
 
+https://app.transifex.com/arrowdl/arrowdl/languages/
+
+
 3. Add following line to `qt_add_translations(...)` in `./src/CMakeLists.txt`:
 
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_xx_XX.ts

diff --git a/installer/windows/NSIS/i18n/sources/es_BO.json b/installer/windows/NSIS/i18n/sources/es_BO.json
@@ -0,0 +1,12 @@
+{
+    "DESC_SectionMainApplication": "The main application.",
+    "DESC_SectionLauncher": "The launcher, used for messaging with web browser.",
+    "DESC_SectionStartMenuShortcut": "Create Start Menu Shortcut.",
+    "DESC_SectionDesktopShortcut": "Create Desktop Shortcut.",
+    "DESC_UninstallIconDescription": "Uninstall ArrowDL",
+    "DESC_ApplicationSession": "Application (required)",
+    "DESC_LauncherSession": "Launcher (required)",
+    "DESC_StartMenuGroupSession": "Start Menu Shortcut",
+    "DESC_DesktopShortcutSession": "Desktop Shortcut",
+    "DESC_VisitWebSite": "Visit our website:"
+}
diff --git a/installer/windows/NSIS/i18n/sources/es_ES.json b/installer/windows/NSIS/i18n/sources/es_ES.json
@@ -0,0 +1,12 @@
+{
+    "DESC_SectionMainApplication": "La aplicación principal.",
+    "DESC_SectionLauncher": "El lanzador, utilizado para enviar mensajes con el navegador web.",
+    "DESC_SectionStartMenuShortcut": "Crear acceso directo al menú Inicio.",
+    "DESC_SectionDesktopShortcut": "Crear acceso directo del Escritorio.",
+    "DESC_UninstallIconDescription": "Desinstalar ArrowDL",
+    "DESC_ApplicationSession": "Solicitud (requerida)",
+    "DESC_LauncherSession": "Lanzador (requerido)",
+    "DESC_StartMenuGroupSession": "Acceso directo del menú Inicio",
+    "DESC_DesktopShortcutSession": "Acceso directo del Escritorio",
+    "DESC_VisitWebSite": "Visite nuestro sitio web:"
+}
diff --git a/installer/windows/NSIS/i18n/sources/es_US.json b/installer/windows/NSIS/i18n/sources/es_US.json
@@ -0,0 +1,12 @@
+{
+    "DESC_SectionMainApplication": "The main application.",
+    "DESC_SectionLauncher": "The launcher, used for messaging with web browser.",
+    "DESC_SectionStartMenuShortcut": "Create Start Menu Shortcut.",
+    "DESC_SectionDesktopShortcut": "Create Desktop Shortcut.",
+    "DESC_UninstallIconDescription": "Uninstall ArrowDL",
+    "DESC_ApplicationSession": "Application (required)",
+    "DESC_LauncherSession": "Launcher (required)",
+    "DESC_StartMenuGroupSession": "Start Menu Shortcut",
+    "DESC_DesktopShortcutSession": "Desktop Shortcut",
+    "DESC_VisitWebSite": "Visit our website:"
+}
diff --git a/installer/windows/NSIS/i18n/sources/ru.json b/installer/windows/NSIS/i18n/sources/ru.json
@@ -1,12 +1,12 @@
 {
     "DESC_SectionMainApplication": "Основное приложение.",
-    "DESC_SectionLauncher": "Программа запуска, используемая для обмена сообщениями с веб-браузером.",
-    "DESC_SectionStartMenuShortcut": "Создайте ярлык меню Пуск.",
+    "DESC_SectionLauncher": "Дополнительная программа, использующаяся для обмена сообщениями с веб-браузерами. Нужна для работы браузерных расширений.",
+    "DESC_SectionStartMenuShortcut": "Создать ярлыки в меню Пуск.",
     "DESC_SectionDesktopShortcut": "Создать ярлык на рабочем столе.",
     "DESC_UninstallIconDescription": "Удалить ArrowDL",
-    "DESC_ApplicationSession": "Заявление (обязательно)",
-    "DESC_LauncherSession": "Пусковая установка (обязательно)",
-    "DESC_StartMenuGroupSession": "Ярлык меню Пуск",
-    "DESC_DesktopShortcutSession": "Ярлык рабочего стола",
+    "DESC_ApplicationSession": "Программа (обязательно)",
+    "DESC_LauncherSession": "Лаунчер (обязательно)",
+    "DESC_StartMenuGroupSession": "Ярлык в меню Пуск",
+    "DESC_DesktopShortcutSession": "Ярлык на Рабочем столе",
     "DESC_VisitWebSite": "Посетите наш сайт:"
 }
diff --git a/installer/windows/NSIS/i18n/sources/zh_TW.json b/installer/windows/NSIS/i18n/sources/zh_TW.json
@@ -0,0 +1,12 @@
+{
+    "DESC_SectionMainApplication": "主要應應用程式。",
+    "DESC_SectionLauncher": "啟動器用於通過 Web 瀏覽器傳遞訊息。",
+    "DESC_SectionStartMenuShortcut": "建立開始選單捷徑。",
+    "DESC_SectionDesktopShortcut": "建立桌面捷徑。",
+    "DESC_UninstallIconDescription": "解除安裝 ArrowDL",
+    "DESC_ApplicationSession": "應用程式（必須）",
+    "DESC_LauncherSession": "啟動器（必須）",
+    "DESC_StartMenuGroupSession": "開始選單捷徑",
+    "DESC_DesktopShortcutSession": "桌面捷徑",
+    "DESC_VisitWebSite": "前往我們的網站："
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -74,10 +74,12 @@ target_compile_definitions(${TARGET_NAME}
 
 qt_add_translations(${TARGET_NAME}
     TS_FILES
-        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_ar_EG.ts  # Arabic
+        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_ar_EG.ts  # Arabic (Egypt)
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_de_DE.ts  # German
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_en_US.ts  # English (default)
-        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_ES.ts  # Spanish
+        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_BO.ts  # Spanish (Bolivia)
+        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_ES.ts  # Spanish (Spain)
+        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_US.ts  # Spanish (United States)
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_fr_FR.ts  # French
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_hu_HU.ts  # Hungarian
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_it_IT.ts  # Italian
@@ -90,6 +92,7 @@ qt_add_translations(${TARGET_NAME}
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_ru_RU.ts  # Russian
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_vi_VN.ts  # Vietnamese
         ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_zh_CN.ts  # Chinese (Simplified & Traditional)
+        ${CMAKE_SOURCE_DIR}/src/locale/arrowdl_zh_TW.ts  # Chinese (Taiwan)
     QM_FILES_OUTPUT_VARIABLE
         qm_files
 )

diff --git a/src/core/downloaditem.cpp b/src/core/downloaditem.cpp
@@ -309,7 +309,7 @@ QString DownloadItem::statusToHttp(QNetworkReply::NetworkError error)
     case QNetworkReply::InternalServerError:          return tr("500 Internal server error");
     case QNetworkReply::OperationNotImplementedError: return tr("501 Server does not support this functionality");
     case QNetworkReply::ServiceUnavailableError:      return tr("503 Service unavailable");
-    case QNetworkReply::UnknownServerError:           return tr("5xx Unknown serveur error");
+    case QNetworkReply::UnknownServerError:           return tr("5xx Unknown server error");
     }
     Q_UNREACHABLE();
 }

diff --git a/src/core/settings.cpp b/src/core/settings.cpp
@@ -155,7 +155,7 @@ Settings::Settings(QObject *parent) : AbstractSettings(parent)
 // Tab General
 ExistingFileOption Settings::existingFileOption() const
 {
-    int value = getSettingInt(REGISTRY_EXISTING_FILE);
+    auto value = getSettingInt(REGISTRY_EXISTING_FILE);
     return (value >= 0 && value < static_cast<int>(ExistingFileOption::LastOption))
             ? static_cast<ExistingFileOption>(value)
             : ExistingFileOption::Skip;
@@ -185,13 +185,13 @@ void Settings::setLanguage(const QString &language)
  */
 QMap<QString, QVariant> Settings::theme() const
 {
-    const QString str = getSettingString(REGISTRY_UI_THEME);
+    auto str = getSettingString(REGISTRY_UI_THEME);
     return deserialize(str);
 }
 
 void Settings::setTheme(const QMap<QString, QVariant> &map)
 {
-    const QString value = serialize(map);
+    auto value = serialize(map);
     setSettingString(REGISTRY_UI_THEME, value);
 }
 
@@ -736,13 +736,13 @@ void Settings::setTorrentPeers(const QString &value)
 /* Other (advanced) settings */
 QMap<QString, QVariant> Settings::torrentSettings() const
 {
-    const QString str = getSettingString(REGISTRY_TORRENT_ADVANCED);
+    auto str = getSettingString(REGISTRY_TORRENT_ADVANCED);
     return deserialize(str);
 }
 
 void Settings::setTorrentSettings(const QMap<QString, QVariant> &map)
 {
-    const QString value = serialize(map);
+    auto value = serialize(map);
     setSettingString(REGISTRY_TORRENT_ADVANCED, value);
 }
 

diff --git a/src/core/torrentcontext_p.cpp b/src/core/torrentcontext_p.cpp
@@ -65,8 +65,8 @@
 
 
 /* Show the thread, of which the debug message comes from */
-#define qDebug_1 qDebug() << " + | "
-#define qDebug_2 qDebug() << " | + "
+#define qDebug_1 qDebug() << " + | " // from TorrentContextPrivate
+#define qDebug_2 qDebug() << " | + " // from WorkerThread
 
 using namespace Qt::Literals::StringLiterals;
 

diff --git a/src/dialogs/batchrenamedialog.cpp b/src/dialogs/batchrenamedialog.cpp
@@ -127,8 +127,9 @@ void BatchRenameDialog::renameToEnumeration()
 
 void BatchRenameDialog::rename(DownloadItem *downloadItem, const QString &newName)
 {
-    if (!downloadItem)
+    if (!downloadItem) {
         return;
+    }
 
     if (ui->safeRenameCheckBox->isChecked()) {
         auto resource = downloadItem->resource();

diff --git a/src/io/filewriter.cpp b/src/io/filewriter.cpp
@@ -27,11 +27,13 @@
 FileWriter::FileWriter(QIODevice *device)
     : m_device(device)
 {
+    m_errorString = FileWriter::tr("Unknown error");
 }
 
 FileWriter::FileWriter(const QString &fileName)
     : m_device(new QFile(fileName))
 {
+    m_errorString = FileWriter::tr("Unknown error");
 }
 
 FileWriter::~FileWriter()

diff --git a/src/io/filewriter.h b/src/io/filewriter.h
@@ -59,7 +59,7 @@ class FileWriter
 
     /* Error */
     FileWriter::FileWriterError m_fileWriterError = UnknownError;
-    QString m_errorString = FileWriter::tr("Unknown error");
+    QString m_errorString = {};
 
     Q_DISABLE_COPY(FileWriter)
 };