!266 LICENSE sync

Merge pull request !266 from shenmo/dev

LICENSE

@@ -12,7 +12,9 @@
 6. 仓库版权条款：为了更好的提供持续性服务，星火仅对个人用户免费开放服务仓库，如您或您的组织需要提供商业服务或者您的组织为盈利性组织，请联系星火社区获取商业授权。
 7. 禁止恶意行为和批量爬取： 用户或组织在使用本软件时，严禁进行任何形式的恶意行为，包括但不限于恶意攻击、滥用、破坏、批量爬取软件仓库等。恶意行为的定义由星火社区自行判断，违反者将被追究法律责任。
 8. 分发与再分发权利： 星火社区保留对其制作的软件包的分发权利。未经明确授权，禁止任何个人或组织将星火社区软件包用于商业目的或在未获得星火社区许可的情况下进行再分发。此条款旨在确保开源精神的同时，维护星火社区的知识产权。
-9. 其他条款：除上述约定外，若您使用了星火商店的主程序或其部分代码，您应遵守 GPL v3 的所有其他条款和要求。
+9. 商业应用限制：您不得使用本软件的代码开发商业应用，也不得在商业应用中使用本软件的代码，除非获得星火社区和火穗（沈阳）计算机软件开发有限公司的书面许可。
+10. 其他条款：除上述约定外，若您使用了星火商店的主程序或其部分代码，您应遵守 GPL v3 的所有其他条款和要求。
+11. 其他约定：本许可以简体中文版本为最准确释义
 
 GPLV3许可证的完整文本可以在以下链接找到：https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -32,6 +34,8 @@ This software is free software; you can modify and redistribute it under the ter
 6. Warehouse copyright terms: In order to better provide continuous services, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact Spark community to obtain commercial authorization.
 7. Prohibited malicious behavior and mass crawling: Users or organizations are strictly prohibited to engage in any form of malicious behavior when using the software, including but not limited to malicious attacks, abuse, destruction, and mass crawling of software warehouses. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible.
 8. Distribution and redistribution rights: Spark Community reserves the right to distribute the software packages it produces. Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community.
-9. Other Terms: In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of GPL v3.
+9. Business Application Restriction: You are not permitted to utilize the code of this software for developing commercial applications, nor are you allowed to integrate the code of this software into commercial applications without obtaining written consent from both the Spark Community and Flamescion (Shenyang) Computer Software Development Co., Ltd.
+10. Other Terms: In addition to the above provisions, if you use the main program or any part of the code of Spark Store, you must comply with all other terms and requirements of GPL v3. In case of any inconsistency between the terms of this agreement and those of GPL v3, the terms of this agreement shall prevail.
+11. Additional Agreements: This license shall be interpreted most accurately in its Simplified Chinese version.
 
 You can find the full text of GPLV3 license at: https://www.gnu.org/licenses/gpl-3.0.html

src/application.cpp

@@ -36,13 +36,13 @@ Application::Application(int &argc, char **argv)
     setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏)
     setProductName(QObject::tr("Spark Store"));
     setProductIcon(QIcon::fromTheme("spark-store"));
-    setApplicationHomePage("https://gitee.com/deepin-community-store");
+    setApplicationHomePage("https://gitee.com/spark-store-project");
     setApplicationDescription(
         QObject::tr(
             "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/>"
             "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
             "<span style=' font-size:12pt;'>Spark developers</span>"));
-    setApplicationLicense(" <a href='https://gitee.com/deepin-community-store/spark-store/blob/Flamescion/LICENSE'>GPLv3</a> ");
+    setApplicationLicense(" <a href='https://gitee.com/spark-store-project/spark-store/blob/Flamescion/LICENSE'>Spark Opensource License</a> ");
 
     // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
     checkAppConfigLocation();

src/backend/downloadworker.cpp

@@ -120,7 +120,8 @@ void DownloadController::startDownload(const QString &url)
         QString downloadDir = "/tmp/spark-store/"; //下载目录
         QString aria2ConnectionPerServer = "--max-connection-per-server=1"; //每个服务器最大连接数
         QString aria2ConnectionMax = "--max-concurrent-downloads=16"; //最大同时下载数
-        QString aria2ConnectionTimeout = "--connect-timeout=5"; // 1 秒服务器连接超时(像 spark1.uniartisan.com、cdn.dl.uniartisan.com、momen.d.store.deepinos.org.cn 等服务器失效时不影响即时下载)
+        QString aria2ConnectionTimeout = "--connect-timeout=5"; // 5 秒服务器连接超时
+        QString aria2MaxRetry = "--max-tries=1"; //设置最大重试次数
 
 
         if (useMetalink) //如果是metalink
@@ -149,6 +150,7 @@ void DownloadController::startDownload(const QString &url)
         command.append(aria2ConnectionPerServer.toUtf8());
         command.append(aria2ConnectionMax.toUtf8());
         command.append(aria2ConnectionTimeout.toUtf8());
+        command.append(aria2MaxRetry.toUtf8());
 
         if (useMetalink)
         {

tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell

@@ -4,7 +4,7 @@ TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="Spark Store APP Upgrade module"
 TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured in checking for update! Press Confirm to get the error log (Can be useful when feedback)"
 TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="I already copied the log in the text box and I will attach it when feeding back. You can find feedback entry in the settings which is located in the top right of the store."
 TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="Feedback entry in the settings which is located in the top right of the store"
-TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="All APPs are up to date.\nBut you are not at the top of the world"
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="All APPs are up to date."
 TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（Unable to upgrade: Being marked as hold）"
 TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="Choose the app you want to upgrade"
 TRANSHELL_CONTENT_CHOOSE="Choose"
@@ -12,7 +12,7 @@ TRANSHELL_CONTENT_APP_NAME="APP name"
 TRANSHELL_CONTENT_PKG_NAME="Package Name"
 TRANSHELL_CONTENT_NEW_VERSION="New version"
 TRANSHELL_CONTENT_UPGRADE_FROM="Upgrade from"
-TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen\nBut you are not at the top of the world"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen"
 TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Upgrading $APP_UPGRADE , please wait..."
 TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="The chosen app is upgraded"
 TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured when upgrading! Press Confirm to get the error log (Can be useful when feedback)"

tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell

@@ -4,7 +4,7 @@ TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="星火商店更新模块"
 TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="检查更新进程出现错误！按确定查看报错，可用于反馈"
 TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="我已复制了此文本框中的日志，且将会在反馈时附上。反馈渠道可以在右上角菜单的设置中找到"
 TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="反馈渠道在商店右上角的设置里"
-TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="没有软件需要更新\n但是你并没有站在世界之巅"
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="没有软件需要更新"
 TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）"
 TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用"
 TRANSHELL_CONTENT_CHOOSE="选择"
@@ -12,7 +12,7 @@ TRANSHELL_CONTENT_APP_NAME="应用名"
 TRANSHELL_CONTENT_PKG_NAME="包名"
 TRANSHELL_CONTENT_NEW_VERSION="新版本"
 TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新"
-TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何软件\n但是你并没有站在世界之巅"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何软件"
 TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_UPGRADE ，请稍候..."
 TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的软件已经更新完毕"
 TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈"

tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell

@@ -4,7 +4,7 @@ TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="星火商店更新模塊"
 TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="檢查更新行程出現錯誤！ 按確定查看報錯，可用於回報"
 TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="我已複製了此文字方塊中的日誌，且將會在回報時附上。 迴響通路可以在右上角選單的設定中找到 "
 TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="回報入口在商店右上角的設定裏"
-TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="沒有軟體需要更新\n但是你並沒有站在世界之巔"
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="沒有軟體需要更新"
 TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）"
 TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用"
 TRANSHELL_CONTENT_CHOOSE="选择"
@@ -12,7 +12,7 @@ TRANSHELL_CONTENT_APP_NAME="应用名"
 TRANSHELL_CONTENT_PKG_NAME="包名"
 TRANSHELL_CONTENT_NEW_VERSION="新版本"
 TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新"
-TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何軟體\n但是你並沒有站在世界之巔"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何軟體"
 TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_UPGRADE ，请稍候..."
 TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的軟體已经更新完毕"
 TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈"