From 2df5363c2c86425a9d8b21989ec0c1cb728ded27 Mon Sep 17 00:00:00 2001 From: lizhiyuan Date: Thu, 1 Sep 2022 01:39:09 +0800 Subject: [PATCH 01/27] =?UTF-8?q?feat:=20=E6=98=9F=E7=81=AB=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=95=86=E5=BA=97=E6=A3=80=E6=B5=8B=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget.cpp | 31 +++---------------------------- src/widget.ui | 4 ++-- translations/spark-store_en.ts | 4 ++-- translations/spark-store_fr.ts | 10 +++++----- translations/spark-store_zh_CN.ts | 10 +++++----- 5 files changed, 17 insertions(+), 42 deletions(-) diff --git a/src/widget.cpp b/src/widget.cpp index 3a40641..594315b 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1090,34 +1090,9 @@ void Widget::on_pushButton_updateApt_clicked() ui->pushButton_updateApt->setEnabled(false); ui->label_aptserver->setText(tr("Updating, please wait...")); - QProcess runupdate; - runupdate.start("pkexec" , QStringList() << "aptss" << "ssupdate"); - runupdate.waitForFinished(); - QString error = runupdate.readAllStandardError(); - - QStringList everyError = error.split("\n"); - bool haveError = false; - for(int i = 0; i < everyError.size(); i++) - { - if(everyError[i].left(2) == "E:") - { - haveError = true; - } - } - - if(!haveError) - { - ui->label_aptserver->setText(tr("Update finished")); - } - else - { - ui->label_aptserver->setText(tr("Apt has reported an error. Please use apt update in terminal to locate the problem.")); - } - - - - - + QString storeSpk = "spk://store/tools/spark-store"; + openUrl(storeSpk); + ui->label_aptserver->setText(tr("")); ui->pushButton_updateApt->setEnabled(true); }); diff --git a/src/widget.ui b/src/widget.ui index a31e9c5..b5c53c0 100644 --- a/src/widget.ui +++ b/src/widget.ui @@ -1220,7 +1220,7 @@ color:#808080 - <html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html> + <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> true @@ -1237,7 +1237,7 @@ - Source Server + Spark Store Update diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index bde37e6..29c1e46 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -349,7 +349,7 @@ - <html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html> + <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> @@ -359,7 +359,7 @@ - Source Server + Spark Store Update diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 3f3caa7..4364f9a 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -370,7 +370,7 @@ Nous sommes nés pour le changement. - <html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html> + <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> @@ -380,7 +380,7 @@ Nous sommes nés pour le changement. - Source Server + Spark Store Update @@ -557,15 +557,15 @@ Nous sommes nés pour le changement. Redémarrez pour prendre effet - <html><head/><body><p>源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。</p></body></html> + <html><head/><body><p>跳转到星火应用商店主页检测更新。</p></body></html> <html><head/><body><p>Le rôle du serveur source est de s'assurer que le logiciel est mis à jour et prend en charge l'utilisation de l'outil apt pour obtenir le logiciel. Nous préférons généralement que vous utilisiez la première ligne comme source de mise à jour, qui est généralement la plus stable. </p></body></html> - 更新源 + 跳转更新 Mettre à jour la source APT - 更新源服务器： + 星火应用商店更新检测： Source APT: diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 1b619df..b7db738 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -380,18 +380,18 @@ - <html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html> - <html><head/><body><p>源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。</p></body></html> + <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> + <html><head/><body><p>跳转到星火应用商店主页检测更新。</p></body></html> Update - 更新源 + 跳转更新 - Source Server - 更新源服务器 + Spark Store Update + 星火应用商店更新检测 From afee0966c8fc6b02b1393028631a3f29f37ff8f9 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 31 Aug 2022 17:44:46 +0000 Subject: [PATCH 02/27] update src/widget.ui. Signed-off-by: shenmo --- src/widget.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget.ui b/src/widget.ui index b5c53c0..2b25684 100644 --- a/src/widget.ui +++ b/src/widget.ui @@ -1220,7 +1220,7 @@ color:#808080 - <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> + <html><head/><body><p>Check update for Spark Store. </p></body></html> true From c93c221cf18baf6d004355c54ca1bd4d25c9e32d Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 1 Sep 2022 01:47:38 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- translations/spark-store_en.ts | 28 +++++++++------------------- translations/spark-store_fr.ts | 20 +++++--------------- translations/spark-store_zh_CN.ts | 22 ++++++++++++---------- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 29c1e46..823177f 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -150,7 +150,7 @@ - + Install @@ -347,11 +347,6 @@ Refresh - - - <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> - - Update @@ -427,6 +422,11 @@ Take effect when restart + + + <html><head/><body><p>Check update for Spark Store. </p></body></html> + + 0B @@ -493,12 +493,7 @@ - - Apt has reported an error. Please use apt update in terminal to locate the problem. - - - - + Uninstall succeeded @@ -513,17 +508,12 @@ - - Update finished - - - - + Temporary cache was cleaned - + The URL has been copied to the clipboard diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 4364f9a..2529c5f 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -211,7 +211,7 @@ Nous sommes nés pour le changement. - + Install @@ -370,7 +370,7 @@ Nous sommes nés pour le changement. - <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> + <html><head/><body><p>Check update for Spark Store. </p></body></html> @@ -650,11 +650,6 @@ Nous sommes nés pour le changement. Reinstall - - - Update finished - - Failed to get the name to the file to be downloaded. @@ -681,22 +676,17 @@ Nous sommes nés pour le changement. - - Apt has reported an error. Please use apt update in terminal to locate the problem. - - - - + Uninstall succeeded - + Temporary cache was cleaned - + The URL has been copied to the clipboard diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index b7db738..5545f8c 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -205,7 +205,7 @@ - + Install 安装 @@ -379,9 +379,8 @@ 重启商店后生效 - <html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html> - <html><head/><body><p>跳转到星火应用商店主页检测更新。</p></body></html> + <html><head/><body><p>跳转到星火应用商店主页检测更新。</p></body></html> @@ -483,6 +482,11 @@ Take effect when restart 重启商店后生效 + + + <html><head/><body><p>Check update for Spark Store. </p></body></html> + 检查星火应用商店更新 + 0B @@ -519,9 +523,8 @@ 不存在 - Update finished - 更新完毕 + 更新完毕 @@ -604,9 +607,8 @@ 正在更新，请稍候…… - Apt has reported an error. Please use apt update in terminal to locate the problem. - 更新中发生错误，请在终端使用apt update来查看错误原因。 + 更新中发生错误，请在终端使用apt update来查看错误原因。 Unknown error! @@ -660,17 +662,17 @@ Click yes to continue. 服务器未知错误 - + Uninstall succeeded 卸载成功 - + Temporary cache was cleaned 缓存目录已清空 - + The URL has been copied to the clipboard 链接已复制到剪贴板 From 5d5fbfbad452acfac7f662bc74d74aa2d727794c Mon Sep 17 00:00:00 2001 From: lizhiyuan Date: Fri, 2 Sep 2022 19:24:45 +0800 Subject: [PATCH 04/27] =?UTF-8?q?feat:=20=E6=B8=85=E9=99=A4=E7=BD=91?= =?UTF-8?q?=E9=A1=B5=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget.cpp | 10 +++++++++ src/widget.h | 1 + src/widget.ui | 61 ++++++++++++++++++++++++++++---------------------- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/src/widget.cpp b/src/widget.cpp index 594315b..f0bb212 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1148,6 +1148,16 @@ void Widget::on_pushButton_clear_clicked() // 清空临时缓存目录 }); } +void Widget::on_pushButton_clearWebCache_clicked() +{ + QtConcurrent::run([=]() + { + + QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); + QDir cacheDir(dataLocal ); + cacheDir.removeRecursively(); }); +} + quint64 Widget::dirFileSize(const QString &path) { QDir dir(path); diff --git a/src/widget.h b/src/widget.h index 254b26c..f9faad9 100644 --- a/src/widget.h +++ b/src/widget.h @@ -91,6 +91,7 @@ private slots: void on_pushButton_updateApt_clicked(); void on_pushButton_uninstall_clicked(); void on_pushButton_clear_clicked(); + void on_pushButton_clearWebCache_clicked(); void on_pushButton_website_clicked(); void on_pushButton_clicked(); void on_btn_openDir_clicked(); diff --git a/src/widget.ui b/src/widget.ui index b5c53c0..087c66e 100644 --- a/src/widget.ui +++ b/src/widget.ui @@ -345,7 +345,7 @@ 0 - 2 + 3 @@ -489,7 +489,7 @@ 0 0 - 903 + 889 849 @@ -993,8 +993,8 @@ 0 0 - 869 - 325 + 851 + 324 @@ -1123,8 +1123,8 @@ 0 0 - 738 - 886 + 889 + 716 @@ -1285,7 +1285,31 @@ - + + + + color:#808080 + + + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. + + + + + + + 0B + + + + + + + Location：/tmp/spark-store + + + + Qt::Horizontal @@ -1305,16 +1329,6 @@ - - - - color:#808080 - - - Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - - - @@ -1328,17 +1342,10 @@ - - + + - 0B - - - - - - - Location：/tmp/spark-store + Clear Web Cache From 63b28adaf834d248a738ccc64156f6ec4ca6a7ab Mon Sep 17 00:00:00 2001 From: lizhiyuan Date: Tue, 20 Sep 2022 11:55:36 +0800 Subject: [PATCH 05/27] feat: enable GPU --- src/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 7b29aeb..6badb00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,6 +13,10 @@ int main(int argc, char *argv[]) DApplication::loadDXcbPlugin(); // 已废弃，但是对于非deepin桌面可以正常使用标题栏 DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持 // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题 + + // 浏览器开启 GPU 支持 + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); + QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; fakeArgs[1] = "-platformtheme"; From c65d7b86dfdc265f47eebb3cca690d35fe4d9ed1 Mon Sep 17 00:00:00 2001 From: lizhiyuan Date: Mon, 26 Sep 2022 23:46:25 +0800 Subject: [PATCH 06/27] fix: high CPU usage because futex is still waiting for queue after illegal exit --- src/widget.cpp | 42 ++++++++++++++++++++++-------------------- src/widget.h | 1 + 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/widget.cpp b/src/widget.cpp index f0bb212..d815c36 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -18,6 +18,7 @@ #include #include #include // 并发 +#include // close event #include #include @@ -572,14 +573,14 @@ void Widget::chooseLeftMenu(int index) updateUI(); - if(index <= 12) + if (index <= 12) { - if(themeIsDark) + if (themeIsDark) { QString darkurl = menuUrl[index].toString(); QStringList list = darkurl.split("/"); darkurl.clear(); - for(int i = 0; i < list.size() - 1; i++) + for (int i = 0; i < list.size() - 1; i++) { darkurl += list[i] + "/"; } @@ -687,22 +688,18 @@ void Widget::searchApp(QString text) } else { - // sendNotification(tr("Spark store could only process spk:// links for now. The search feature is coming soon!")); - // ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text)); // 这东西对接百度 - // ui->stackedWidget->setCurrentIndex(0); - // 禁止同时进行多次搜索 - if(!mutex.tryLock()) + if (!mutex.tryLock()) { return; } // 关键字搜索处理 httpClient->get("https://search.deepinos.org.cn/appinfo/search") - .header("content-type", "application/json") - .queryParam("keyword", text) - .onResponse([this](QByteArray result) - { + .header("content-type", "application/json") + .queryParam("keyword", text) + .onResponse([this](QByteArray result) + { auto json = QJsonDocument::fromJson(result).array(); if (json.empty()) { @@ -711,18 +708,23 @@ void Widget::searchApp(QString text) mutex.unlock(); return; } - displaySearchApp(json); - }) - .onError([this](QString errorStr) - { + displaySearchApp(json); }) + .onError([this](QString errorStr) + { qDebug() << "请求出错：" << errorStr; sendNotification(QString(tr("Request Error: %1")).arg(errorStr)); mutex.unlock(); - return; - }) - .timeout(10 * 1000) - .exec(); + return; }) + .timeout(10 * 1000) + .exec(); } + httpClient->deleteLater(); +} + +void Widget::closeEvent(QCloseEvent *event) +{ + mutex.unlock(); + httpClient->deleteLater(); } /** diff --git a/src/widget.h b/src/widget.h index f9faad9..9ec716e 100644 --- a/src/widget.h +++ b/src/widget.h @@ -128,6 +128,7 @@ private: void setfoot(int); void updatefoot(); void updateUI(); + void closeEvent(QCloseEvent *event); quint64 dirFileSize(const QString &path); From 0ad4b6c82cf12b3048cc39c0579328d75edeb05a Mon Sep 17 00:00:00 2001 From: lizhiyuan Date: Mon, 26 Sep 2022 23:53:28 +0800 Subject: [PATCH 07/27] fix --- src/widget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/widget.cpp b/src/widget.cpp index d815c36..8e7d2eb 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -718,7 +718,6 @@ void Widget::searchApp(QString text) .timeout(10 * 1000) .exec(); } - httpClient->deleteLater(); } void Widget::closeEvent(QCloseEvent *event) From 30860802dd9446fdc257a508ffeb57531e0d7baa Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 30 Sep 2022 11:27:22 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=B8=85=E9=99=A4=E5=85=8D=E5=AF=86=E7=A0=81=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++++++ debian/spark-store.prerm | 6 ++++++ src/main.cpp | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7381de5..069025f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (3.2.4) stable; urgency=medium + + * 客户端更新时不关闭免密码登录 + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.3) stable; urgency=medium * 客户端异常退出时仍然占用资源问题修复 diff --git a/debian/spark-store.prerm b/debian/spark-store.prerm index 6c0d052..8c44924 100755 --- a/debian/spark-store.prerm +++ b/debian/spark-store.prerm @@ -1,5 +1,6 @@ #!/bin/sh +if [ "$1" = "remove" ] || [ "$1" = "purge" ];then # Remove residual symbol links rm /usr/local/bin/spark-store rm /usr/local/bin/ssinstall @@ -39,3 +40,8 @@ fi apt-key del '9D9A A859 F750 24B1 A1EC E16E 0E41 D354 A29A 440C' +else + +echo "非卸载操作，不进行配置清理" + +fi diff --git a/src/main.cpp b/src/main.cpp index bb74f29..e0f07f8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.2.3")); + dialog.setVersion(DApplication::buildVersion("Version 3.2.4")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.2.3")); + a.setApplicationVersion(DApplication::buildVersion("3.2.4")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( From 085eddd66f5194cf0eb95d7243ad40a666bf3391 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 7 Oct 2022 22:31:24 +0800 Subject: [PATCH 09/27] =?UTF-8?q?UOS=20=E8=B5=B0=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=9A=84aptss=EF=BC=8Captss=E6=94=AF=E6=8C=81UOS=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + tool/apt-fast-conf/apt-fast.conf | 22 ++++++++++++++-------- tool/ssinstall | 18 ++---------------- tool/update-upgrade/ss-do-upgrade.sh | 28 ---------------------------- 4 files changed, 17 insertions(+), 52 deletions(-) diff --git a/debian/changelog b/debian/changelog index 069025f..332d487 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ spark-store (3.2.4) stable; urgency=medium * 客户端更新时不关闭免密码登录 + * UOS合并正常aptss中 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf index 0139d67..47f2576 100644 --- a/tool/apt-fast-conf/apt-fast.conf +++ b/tool/apt-fast-conf/apt-fast.conf @@ -14,6 +14,15 @@ _APTMGR=apt +#### +# +# UOS sources auth config +# +# +if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then +AUTH_UOS_USER="uos-https://license.chinauos.com-apt" +AUTH_UOS_PASSWD="a=SHEDW8U8E8SDHP5A&aa=&ab=v1&ad=8c584d561897bb0cfaed06448d2c00db&ae=4d06bb476c4b49299bf61131adf74d9e&af=4&ag=UNKNOW:ec529f04c7dffb7bd5859f561259aebc&ah=000C292C00DB&b=v2&c=62b2b266c66f30000167448b&d=N7AADCAAYHAKM54KZJQKMPEBV&e=8aa2da8715ffe6f0b01c4a6bba1d8c91&f=7568a02ccfda9af6a3a4b73094daf161&g=AA2SAA&h=21.3.1&i=101&j=422f2415ea7d14119aae28d80aad4695&k=245f-5674-f133-2b01&l=93a6-0ba8-5d84-a21a&m=245f-5674-f133-2b01&n=,|&o=VMwareVirtualS|VMwareVirtualS&p=ec529f04c7dffb7bd5859f561259aebc&q=19e1fe0a654af0eccca498848d024e64&r=000C292C00DB&s=1&t=2&v=5.6.30&w=&x=6&y=-1&z=v3/vm" +fi # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download # packages directly. # @@ -54,7 +63,7 @@ DOWNLOADBEFORE=true # # Default: disabled # -MIRRORS=( 'https://d.store.deepinos.org.cn/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d3.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/,http://cdn.dl.uniartisan.com:9000/deepinos/' ) +MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) # Maximum number of connections @@ -68,14 +77,10 @@ _MAXNUM=5 # Maximum number of connections per server # Default: 10 # -_MAXCONPERSRV=10 +_MAXCONPERSRV=1 + -# Download file using given number of connections -# If more than N URIs are given, first N URIs are used and remaining URIs are used for backup. -# If less than N URIs are given, those URIs are used more than once so that N connections total are made simultaneously. -# -_SPLITCON=8 # Split size i.e. size of each piece @@ -93,6 +98,7 @@ _MINSPLITSZ=1M _PIECEALGO=default + # Downloadmanager listfile # You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} # @@ -118,7 +124,7 @@ DLLIST='/tmp/apt-fast.list' # # Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' # -_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' +_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' # Download temp folder for Downloadmanager diff --git a/tool/ssinstall b/tool/ssinstall index 749d336..d361c71 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -40,8 +40,6 @@ fi ##################apt-fast/metalink测试 DEPEND="这里一定会安装所以放弃处理" -isuos=`cat /etc/os-release | grep UnionTech` - ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码 if [ "$(id -u)" != "0" ];then @@ -54,15 +52,8 @@ echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bi fi -if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then -echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast" -echo ---------------------------------------------------------------------------------- -echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf - -fi - -if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then +if [ "$DEPEND" != "" ]; then echo "检测到apt-fast，使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf @@ -81,13 +72,8 @@ echo "未安装依赖：apt-fast 开始安装" aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y fi -if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then -echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast" -echo ---------------------------------------------------------------------------------- -dpkg -i $1 || aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf -fi -if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then +if [ "$DEPEND" != "" ]; then echo "检测到apt-fast，使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- dpkg -i $1 || aptss install -yf diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index be5a580..990a0c8 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -8,33 +8,6 @@ echo "获取更新列表..." PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" -isuos=`cat /etc/os-release | grep UnionTech` -if [ "$isuos" != "" ]; then ###这是确定是否为UOS 如果是 -echo "UOS中系统依赖无法使用第三方下载工具，使用apt-fast下载本体" - - cd /var/cache/apt/archives - for PKG_NAME in $PKG_LIST; - do - echo "$PKG_NAME 正在下载..." - sudo aptss download "$PKG_NAME" -y >/dev/null 2>&1; - done - - echo "----开始安装" - for PKG_NAME in $PKG_LIST; - do - echo "$PKG_NAME 正在更新..." - if sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install "$PKG_NAME" -y >/dev/null 2>&1; - then - echo "$PKG_NAME 已更新" - else - echo "WARNING: $PKG_NAME 无法更新" - fi - done - - - -else ###这是确定是否为UOS,如果不是 - for PKG_NAME in $PKG_LIST; do echo "$PKG_NAME 正在更新..." @@ -47,6 +20,5 @@ else ###这是确定是否为UOS,如果不是 done -fi ###这是确定是否为UOS fi ###这是确定是否同意 \ No newline at end of file From fec604b481666c7f01e82e42f04a30e4483be1eb Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 03:22:12 +0000 Subject: [PATCH 10/27] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 332d487..aa5a836 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -spark-store (3.2.4) stable; urgency=medium +spark-store (3.2.4~test1) stable; urgency=medium * 客户端更新时不关闭免密码登录 * UOS合并正常aptss中 From a13f0ddcb786576616cdc00ec0aedb68db2f0463 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 13:47:00 +0000 Subject: [PATCH 11/27] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=AF=BB=E5=8F=96/etc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- tool/apt-fast-conf/apt-fast.conf | 315 ++++++++++++++++++++++++++++++- 1 file changed, 314 insertions(+), 1 deletion(-) diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf index 47f2576..92d555f 100644 --- a/tool/apt-fast-conf/apt-fast.conf +++ b/tool/apt-fast-conf/apt-fast.conf @@ -21,7 +21,9 @@ _APTMGR=apt # if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then AUTH_UOS_USER="uos-https://license.chinauos.com-apt" -AUTH_UOS_PASSWD="a=SHEDW8U8E8SDHP5A&aa=&ab=v1&ad=8c584d561897bb0cfaed06448d2c00db&ae=4d06bb476c4b49299bf61131adf74d9e&af=4&ag=UNKNOW:ec529f04c7dffb7bd5859f561259aebc&ah=000C292C00DB&b=v2&c=62b2b266c66f30000167448b&d=N7AADCAAYHAKM54KZJQKMPEBV&e=8aa2da8715ffe6f0b01c4a6bba1d8c91&f=7568a02ccfda9af6a3a4b73094daf161&g=AA2SAA&h=21.3.1&i=101&j=422f2415ea7d14119aae28d80aad4695&k=245f-5674-f133-2b01&l=93a6-0ba8-5d84-a21a&m=245f-5674-f133-2b01&n=,|&o=VMwareVirtualS|VMwareVirtualS&p=ec529f04c7dffb7bd5859f561259aebc&q=19e1fe0a654af0eccca498848d024e64&r=000C292C00DB&s=1&t=2&v=5.6.30&w=&x=6&y=-1&z=v3/vm" +AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" +AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` + fi # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download # packages directly. @@ -151,3 +153,314 @@ APTCACHE='/var/cache/apt/archives' # cRed='\e[0;31m' # cBlue='\e[0;34m' # endColor='\e[0m' +################################################################### +# CONFIGURATION OPTIONS +################################################################### +# Every item has a default value besides MIRRORS (which is unset). + +# Use aptitude, apt-get, or apt? +# Note that apt-get is used as a fallback for outputting the +# package URI list for e.g. aptitude, which can't do this +# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude +# e.g. /usr/bin/aptitude +# +# Default: apt-get +# +_APTMGR=apt + + +#### +# +# UOS sources auth config +# +# +if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then +AUTH_UOS_USER="uos-https://license.chinauos.com-apt" +AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" +AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` + +fi +# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download +# packages directly. +# +# Default: dialog enabled +# +DOWNLOADBEFORE=true + + +# Choose mirror list to speed up downloads from same archive. To select some +# mirrors take a look at your distribution's archive mirror lists. +# Debian: http://www.debian.org/mirror/list +# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors +# +# It is required to add mirrors in the sources.list to this array as well, so +# apt-fast can destinguish between different distributions. +# +# Examples: +# +# Different distributions (as in operating systems): +# +# sources.list: +# deb http://deb.debian.org/debian/ unstable main non-free contrib +# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe +# +# apt-fast.conf: +# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' +# 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) +# +# +# Single distribution: +# +# sources.list: +# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main +# deb http://fr.archive.ubuntu.com/ubuntu/ artful main +# +# apt-fast.conf: +# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) +# +# Default: disabled +# +MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) + + +# Maximum number of connections +# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM} +# +# Default: 5 +# +_MAXNUM=5 + + +# Maximum number of connections per server +# Default: 10 +# +_MAXCONPERSRV=1 + + + + + +# Split size i.e. size of each piece +# Possible Values: 1M-1024M +# +_MINSPLITSZ=1M + + +# Piece selection algorithm to use +# Available values are: default, inorder, geom +# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases +# inorder: selects pieces in sequential order starting from first piece +# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces +# +_PIECEALGO=default + + + +# Downloadmanager listfile +# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} +# +# Default: /tmp/apt-fast.list +# +DLLIST='/tmp/apt-fast.list' + + +# Download command to use. Temporary download list is designed for aria2. But +# you can choose another download command or download manager. It has to +# support following input file syntax (\t is tab character): +# +# # Comment +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME1 +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME2 +# ... +# +# Examples: +# aria2c with a proxy (set username, proxy, ip and password!) +# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' +# +# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' +# +_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' + + +# Download temp folder for Downloadmanager +# example /tmp/apt-fast. Standard is /var/cache/apt-fast +# +# Default: /var/cache/apt/apt-fast +# +DLDIR='/var/cache/apt/apt-fast' + + +# APT archives cache directory +# +# Default /var/cache/apt/archives +# (APT configuration items Dir::Cache and Dir::Cache::archives) +# +APTCACHE='/var/cache/apt/archives' + + +# apt-fast colors +# Colors are disabled when not using a terminal. +# +# Default colors are: +# cGreen='\e[0;32m' +# cRed='\e[0;31m' +# cBlue='\e[0;34m' +# endColor='\e[0m' +################################################################### +# CONFIGURATION OPTIONS +################################################################### +# Every item has a default value besides MIRRORS (which is unset). + +# Use aptitude, apt-get, or apt? +# Note that apt-get is used as a fallback for outputting the +# package URI list for e.g. aptitude, which can't do this +# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude +# e.g. /usr/bin/aptitude +# +# Default: apt-get +# +_APTMGR=apt + + +#### +# +# UOS sources auth config +# +# +if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then +AUTH_UOS_USER="uos-https://license.chinauos.com-apt" +AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" +AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` + +fi +# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download +# packages directly. +# +# Default: dialog enabled +# +DOWNLOADBEFORE=true + + +# Choose mirror list to speed up downloads from same archive. To select some +# mirrors take a look at your distribution's archive mirror lists. +# Debian: http://www.debian.org/mirror/list +# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors +# +# It is required to add mirrors in the sources.list to this array as well, so +# apt-fast can destinguish between different distributions. +# +# Examples: +# +# Different distributions (as in operating systems): +# +# sources.list: +# deb http://deb.debian.org/debian/ unstable main non-free contrib +# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe +# +# apt-fast.conf: +# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' +# 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) +# +# +# Single distribution: +# +# sources.list: +# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main +# deb http://fr.archive.ubuntu.com/ubuntu/ artful main +# +# apt-fast.conf: +# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) +# +# Default: disabled +# +MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) + + +# Maximum number of connections +# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM} +# +# Default: 5 +# +_MAXNUM=5 + + +# Maximum number of connections per server +# Default: 10 +# +_MAXCONPERSRV=1 + + + + + +# Split size i.e. size of each piece +# Possible Values: 1M-1024M +# +_MINSPLITSZ=1M + + +# Piece selection algorithm to use +# Available values are: default, inorder, geom +# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases +# inorder: selects pieces in sequential order starting from first piece +# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces +# +_PIECEALGO=default + + + +# Downloadmanager listfile +# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} +# +# Default: /tmp/apt-fast.list +# +DLLIST='/tmp/apt-fast.list' + + +# Download command to use. Temporary download list is designed for aria2. But +# you can choose another download command or download manager. It has to +# support following input file syntax (\t is tab character): +# +# # Comment +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME1 +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME2 +# ... +# +# Examples: +# aria2c with a proxy (set username, proxy, ip and password!) +# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' +# +# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' +# +_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' + + +# Download temp folder for Downloadmanager +# example /tmp/apt-fast. Standard is /var/cache/apt-fast +# +# Default: /var/cache/apt/apt-fast +# +DLDIR='/var/cache/apt/apt-fast' + + +# APT archives cache directory +# +# Default /var/cache/apt/archives +# (APT configuration items Dir::Cache and Dir::Cache::archives) +# +APTCACHE='/var/cache/apt/archives' + + +# apt-fast colors +# Colors are disabled when not using a terminal. +# +# Default colors are: +# cGreen='\e[0;32m' +# cRed='\e[0;31m' +# cBlue='\e[0;34m' +# endColor='\e[0m' +]]]]]]]] \ No newline at end of file From 59607f6b34a6cd89a6d002e26f0e6c902ba3703d Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 14:08:30 +0000 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- tool/apt-fast-conf/apt-fast.conf | 311 ------------------------------- 1 file changed, 311 deletions(-) diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf index 92d555f..eb93e80 100644 --- a/tool/apt-fast-conf/apt-fast.conf +++ b/tool/apt-fast-conf/apt-fast.conf @@ -153,314 +153,3 @@ APTCACHE='/var/cache/apt/archives' # cRed='\e[0;31m' # cBlue='\e[0;34m' # endColor='\e[0m' -################################################################### -# CONFIGURATION OPTIONS -################################################################### -# Every item has a default value besides MIRRORS (which is unset). - -# Use aptitude, apt-get, or apt? -# Note that apt-get is used as a fallback for outputting the -# package URI list for e.g. aptitude, which can't do this -# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude -# e.g. /usr/bin/aptitude -# -# Default: apt-get -# -_APTMGR=apt - - -#### -# -# UOS sources auth config -# -# -if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then -AUTH_UOS_USER="uos-https://license.chinauos.com-apt" -AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" -AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` - -fi -# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download -# packages directly. -# -# Default: dialog enabled -# -DOWNLOADBEFORE=true - - -# Choose mirror list to speed up downloads from same archive. To select some -# mirrors take a look at your distribution's archive mirror lists. -# Debian: http://www.debian.org/mirror/list -# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors -# -# It is required to add mirrors in the sources.list to this array as well, so -# apt-fast can destinguish between different distributions. -# -# Examples: -# -# Different distributions (as in operating systems): -# -# sources.list: -# deb http://deb.debian.org/debian/ unstable main non-free contrib -# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe -# -# apt-fast.conf: -# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' -# 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) -# -# -# Single distribution: -# -# sources.list: -# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main -# deb http://fr.archive.ubuntu.com/ubuntu/ artful main -# -# apt-fast.conf: -# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) -# -# Default: disabled -# -MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) - - -# Maximum number of connections -# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM} -# -# Default: 5 -# -_MAXNUM=5 - - -# Maximum number of connections per server -# Default: 10 -# -_MAXCONPERSRV=1 - - - - - -# Split size i.e. size of each piece -# Possible Values: 1M-1024M -# -_MINSPLITSZ=1M - - -# Piece selection algorithm to use -# Available values are: default, inorder, geom -# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases -# inorder: selects pieces in sequential order starting from first piece -# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces -# -_PIECEALGO=default - - - -# Downloadmanager listfile -# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} -# -# Default: /tmp/apt-fast.list -# -DLLIST='/tmp/apt-fast.list' - - -# Download command to use. Temporary download list is designed for aria2. But -# you can choose another download command or download manager. It has to -# support following input file syntax (\t is tab character): -# -# # Comment -# MIRROR1\tMIRROR2\tMIRROR3... -# out=FILENAME1 -# MIRROR1\tMIRROR2\tMIRROR3... -# out=FILENAME2 -# ... -# -# Examples: -# aria2c with a proxy (set username, proxy, ip and password!) -# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' -# -# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' -# -_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' - - -# Download temp folder for Downloadmanager -# example /tmp/apt-fast. Standard is /var/cache/apt-fast -# -# Default: /var/cache/apt/apt-fast -# -DLDIR='/var/cache/apt/apt-fast' - - -# APT archives cache directory -# -# Default /var/cache/apt/archives -# (APT configuration items Dir::Cache and Dir::Cache::archives) -# -APTCACHE='/var/cache/apt/archives' - - -# apt-fast colors -# Colors are disabled when not using a terminal. -# -# Default colors are: -# cGreen='\e[0;32m' -# cRed='\e[0;31m' -# cBlue='\e[0;34m' -# endColor='\e[0m' -################################################################### -# CONFIGURATION OPTIONS -################################################################### -# Every item has a default value besides MIRRORS (which is unset). - -# Use aptitude, apt-get, or apt? -# Note that apt-get is used as a fallback for outputting the -# package URI list for e.g. aptitude, which can't do this -# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude -# e.g. /usr/bin/aptitude -# -# Default: apt-get -# -_APTMGR=apt - - -#### -# -# UOS sources auth config -# -# -if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then -AUTH_UOS_USER="uos-https://license.chinauos.com-apt" -AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" -AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` - -fi -# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download -# packages directly. -# -# Default: dialog enabled -# -DOWNLOADBEFORE=true - - -# Choose mirror list to speed up downloads from same archive. To select some -# mirrors take a look at your distribution's archive mirror lists. -# Debian: http://www.debian.org/mirror/list -# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors -# -# It is required to add mirrors in the sources.list to this array as well, so -# apt-fast can destinguish between different distributions. -# -# Examples: -# -# Different distributions (as in operating systems): -# -# sources.list: -# deb http://deb.debian.org/debian/ unstable main non-free contrib -# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe -# -# apt-fast.conf: -# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' -# 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) -# -# -# Single distribution: -# -# sources.list: -# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main -# deb http://fr.archive.ubuntu.com/ubuntu/ artful main -# -# apt-fast.conf: -# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) -# -# Default: disabled -# -MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) - - -# Maximum number of connections -# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM} -# -# Default: 5 -# -_MAXNUM=5 - - -# Maximum number of connections per server -# Default: 10 -# -_MAXCONPERSRV=1 - - - - - -# Split size i.e. size of each piece -# Possible Values: 1M-1024M -# -_MINSPLITSZ=1M - - -# Piece selection algorithm to use -# Available values are: default, inorder, geom -# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases -# inorder: selects pieces in sequential order starting from first piece -# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces -# -_PIECEALGO=default - - - -# Downloadmanager listfile -# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} -# -# Default: /tmp/apt-fast.list -# -DLLIST='/tmp/apt-fast.list' - - -# Download command to use. Temporary download list is designed for aria2. But -# you can choose another download command or download manager. It has to -# support following input file syntax (\t is tab character): -# -# # Comment -# MIRROR1\tMIRROR2\tMIRROR3... -# out=FILENAME1 -# MIRROR1\tMIRROR2\tMIRROR3... -# out=FILENAME2 -# ... -# -# Examples: -# aria2c with a proxy (set username, proxy, ip and password!) -# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' -# -# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' -# -_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' - - -# Download temp folder for Downloadmanager -# example /tmp/apt-fast. Standard is /var/cache/apt-fast -# -# Default: /var/cache/apt/apt-fast -# -DLDIR='/var/cache/apt/apt-fast' - - -# APT archives cache directory -# -# Default /var/cache/apt/archives -# (APT configuration items Dir::Cache and Dir::Cache::archives) -# -APTCACHE='/var/cache/apt/archives' - - -# apt-fast colors -# Colors are disabled when not using a terminal. -# -# Default colors are: -# cGreen='\e[0;32m' -# cRed='\e[0;31m' -# cBlue='\e[0;34m' -# endColor='\e[0m' -]]]]]]]] \ No newline at end of file From e554aec98dd02929bc63123c6c94cffa4ae9f0b7 Mon Sep 17 00:00:00 2001 From: uniartisann Date: Sat, 8 Oct 2022 22:24:16 +0800 Subject: [PATCH 13/27] =?UTF-8?q?fix:=20chrome=20GPU=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index e0f07f8..54f042b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题 // 浏览器开启 GPU 支持 - qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; From 5e501b9d178c3126b90d73b53890008498bfa46b Mon Sep 17 00:00:00 2001 From: uniartisann Date: Sat, 8 Oct 2022 23:27:35 +0800 Subject: [PATCH 14/27] =?UTF-8?q?feat:=20=E6=8A=95=E7=A8=BF=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/widget.cpp b/src/widget.cpp index 8e7d2eb..c54c3db 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -193,6 +193,7 @@ void Widget::initUI() // 添加菜单项 QAction *actionSubmission = new QAction(tr("Submit App"), this); + QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this); QAction *setting = new QAction(tr("Settings")); QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings")); @@ -200,6 +201,7 @@ void Widget::initUI() menu->addAction(setting); menu->addAction(upgrade); menu->addAction(actionSubmission); + menu->addAction(actionSubmissionWithClient); titlebar->setMenu(menu); @@ -207,6 +209,23 @@ void Widget::initUI() connect(setting, &QAction::triggered, this, &Widget::opensetting); connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");}); + // 投稿器 + connect(actionSubmissionWithClient, &QAction::triggered, this, [=] + { + QString submitterSpk = "spk://store/tools/spark-store-submitter"; + QFile actionSubmissionClientStatus("/opt/spark-store-submitter/bin/spark-store-submitter"); + if (actionSubmissionClientStatus.exists()) + { + qDebug() << "投稿器存在"; + QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter"); + } + else{ + qDebug() << "投稿器不存在，跳转页面"; + openUrl(submitterSpk); + } + + }); + // 载入自定义字体 int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf"); QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID); From 04047c1e4434f70f5cfa9a72d5d6434237ba63f6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 8 Oct 2022 15:38:55 +0000 Subject: [PATCH 15/27] =?UTF-8?q?!123=20feat:=20=E6=8A=95=E7=A8=BF?= =?UTF-8?q?=E5=99=A8=20*=20feat:=20=E6=8A=95=E7=A8=BF=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/widget.cpp b/src/widget.cpp index 8e7d2eb..c54c3db 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -193,6 +193,7 @@ void Widget::initUI() // 添加菜单项 QAction *actionSubmission = new QAction(tr("Submit App"), this); + QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this); QAction *setting = new QAction(tr("Settings")); QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings")); @@ -200,6 +201,7 @@ void Widget::initUI() menu->addAction(setting); menu->addAction(upgrade); menu->addAction(actionSubmission); + menu->addAction(actionSubmissionWithClient); titlebar->setMenu(menu); @@ -207,6 +209,23 @@ void Widget::initUI() connect(setting, &QAction::triggered, this, &Widget::opensetting); connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");}); + // 投稿器 + connect(actionSubmissionWithClient, &QAction::triggered, this, [=] + { + QString submitterSpk = "spk://store/tools/spark-store-submitter"; + QFile actionSubmissionClientStatus("/opt/spark-store-submitter/bin/spark-store-submitter"); + if (actionSubmissionClientStatus.exists()) + { + qDebug() << "投稿器存在"; + QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter"); + } + else{ + qDebug() << "投稿器不存在，跳转页面"; + openUrl(submitterSpk); + } + + }); + // 载入自定义字体 int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf"); QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID); From 0534c39ee537e7559754d48bff542be097cbd67e Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 15:45:37 +0000 Subject: [PATCH 16/27] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa5a836..0201a78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +spark-store (3.2.4~test2) stable; urgency=medium + + * 客户端集成投稿器入口和支持 + * 更新和安装设置入口转移到左列列表 + + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.4~test1) stable; urgency=medium * 客户端更新时不关闭免密码登录 From 330ae3eeb8baac92317a8409e83246e76b01ee2c Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 16:12:00 +0000 Subject: [PATCH 17/27] update README.zh.md. Signed-off-by: shenmo --- README.zh.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.zh.md b/README.zh.md index 66f300c..d14b34f 100644 --- a/README.zh.md +++ b/README.zh.md @@ -10,6 +10,8 @@ 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态 +在这里查看我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board + 如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index) From 66a4563b5161052d3a2b8cfe9bb197bdb29978f2 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 16:12:59 +0000 Subject: [PATCH 18/27] update README.md. Signed-off-by: shenmo --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fb8576..4021d78 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,10 @@ All packages will be shared in our repository for users to get freely. Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21 +You can track our Issue resoving progress here https://gitee.com/deepin-community-store/spark-store/board -I hope people who see here can also join our team，development help or submit applications are welcomed + +We hope people who see here can also join our team，development help or submit applications are welcomed If you want to submit an APP to share with others，Please [Click here](https://upload.deepinos.org/index) From e8ae0325e0838801db36253941a68a7c6a35a568 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 8 Oct 2022 16:13:33 +0000 Subject: [PATCH 19/27] update README.zh.md. Signed-off-by: shenmo --- README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh.md b/README.zh.md index d14b34f..6efbb91 100644 --- a/README.zh.md +++ b/README.zh.md @@ -10,7 +10,7 @@ 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态 -在这里查看我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board +在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board 如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index) From 967f62f82510dcd97b220826c9aefbe38be85f4f Mon Sep 17 00:00:00 2001 From: uniartisann Date: Sun, 9 Oct 2022 18:36:22 +0800 Subject: [PATCH 20/27] =?UTF-8?q?fix:=20=E8=B6=85=E6=97=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/downloadlist.cpp | 4 ++-- src/widget.cpp | 4 ++-- src/workerthreads.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp index 799a9ce..8e6c7dc 100644 --- a/src/downloadlist.cpp +++ b/src/downloadlist.cpp @@ -151,7 +151,7 @@ void downloadlist::install(int t) bool haveError = false; bool notRoot = false; - installer.waitForFinished(); + installer.waitForFinished(-1); // 不设置超时 out = installer.readAllStandardOutput(); QStringList everyOut = out.split("\n"); @@ -169,7 +169,7 @@ void downloadlist::install(int t) QProcess isInstall; isInstall.start("dpkg -s " + pkgName); - isInstall.waitForFinished(); + isInstall.waitForFinished(180); // 默认超时 3 分钟 int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); if(error == 0) { diff --git a/src/widget.cpp b/src/widget.cpp index c54c3db..910615d 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1128,11 +1128,11 @@ void Widget::on_pushButton_uninstall_clicked() QProcess uninstall; uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower()); - uninstall.waitForFinished(); + uninstall.waitForFinished(180); // 默认超时 3 分钟 QProcess check; check.start("dpkg", QStringList() << "-s" << pkgName.toLower()); - check.waitForFinished(); + check.waitForFinished(180); // 默认超时 3 分钟 if (check.readAllStandardOutput().isEmpty()) { diff --git a/src/workerthreads.cpp b/src/workerthreads.cpp index 86ac7cb..99d40c7 100644 --- a/src/workerthreads.cpp +++ b/src/workerthreads.cpp @@ -92,7 +92,7 @@ void SpkAppInfoLoaderThread::run() QProcess isInstall; packagename = json["Pkgname"].toString(); isInstall.start("dpkg -s " + json["Pkgname"].toString()); - isInstall.waitForFinished(); + isInstall.waitForFinished(180); // 默认超时 3 分钟 int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); if(error == 0) { @@ -100,12 +100,12 @@ void SpkAppInfoLoaderThread::run() QProcess isUpdate; isUpdate.start("dpkg-query --showformat='${Version}' --show " + json["Pkgname"].toString()); - isUpdate.waitForFinished(); + isUpdate.waitForFinished(180); // 默认超时 3 分钟 QString localVersion = isUpdate.readAllStandardOutput(); localVersion.replace("'", ""); isUpdate.start("dpkg --compare-versions " + localVersion + " ge " + json["Version"].toString()); - isUpdate.waitForFinished(); + isUpdate.waitForFinished(180); // 默认超时 3 分钟 if(!isUpdate.exitCode()) { isUpdated = true; From 09115c396162828ea5b8b82c6215a92d02a0a279 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Oct 2022 10:36:31 +0000 Subject: [PATCH 21/27] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 0201a78..be440ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ spark-store (3.2.4~test2) stable; urgency=medium * 客户端集成投稿器入口和支持 * 更新和安装设置入口转移到左列列表 + * 修复：安装依赖时间较长时错误地返回“安装完毕”结果 From 8c08b7e995935a999ca463bf026568bde3c6e0a8 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Oct 2022 10:41:48 +0000 Subject: [PATCH 22/27] update src/widget.cpp. Signed-off-by: shenmo --- src/widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget.cpp b/src/widget.cpp index 910615d..ed8846e 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1128,7 +1128,7 @@ void Widget::on_pushButton_uninstall_clicked() QProcess uninstall; uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower()); - uninstall.waitForFinished(180); // 默认超时 3 分钟 + uninstall.waitForFinished(-1); // 默认无限时长 QProcess check; check.start("dpkg", QStringList() << "-s" << pkgName.toLower()); From c0ffb64a86b0755a6c1eedb3d92462016c85f7dc Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Oct 2022 11:01:55 +0000 Subject: [PATCH 23/27] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index be440ca..428bfa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ spark-store (3.2.4~test2) stable; urgency=medium * 客户端集成投稿器入口和支持 - * 更新和安装设置入口转移到左列列表 * 修复：安装依赖时间较长时错误地返回“安装完毕”结果 From d7f0ee983b9d07c07fdcff7d824418ed4155fc1a Mon Sep 17 00:00:00 2001 From: uniartisan Date: Wed, 12 Oct 2022 09:31:23 +0800 Subject: [PATCH 24/27] =?UTF-8?q?fix:=20=E5=AF=B9oss=E8=BF=9B=E8=A1=8CURL?= =?UTF-8?q?=E8=BD=AC=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/downloadworker.cpp | 2 +- src/widget.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/downloadworker.cpp b/src/downloadworker.cpp index a2069aa..95c9ef6 100644 --- a/src/downloadworker.cpp +++ b/src/downloadworker.cpp @@ -116,7 +116,7 @@ void DownloadController::startDownload(const QString &url) else{ for (int i = 0; i < domains.size(); i++) { - command.append(replaceDomain(url, domains.at(i)).toUtf8()); + command.append(replaceDomain(url, domains.at(i)).replace("+","%2B").toUtf8()); //对+进行转译，避免oss出错 } } diff --git a/src/widget.cpp b/src/widget.cpp index 910615d..c5150ca 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1303,6 +1303,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1) ui->stackedWidget->setCurrentIndex(2); qDebug() << "程序跳转链接地址：" << arg1; + QString url = arg1.toString(); /* load.cancel(); // 打开并发加载线程前关闭正在执行的线程 @@ -1313,7 +1314,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1) */ appinfoLoadThread.requestInterruption(); appinfoLoadThread.wait(100); - appinfoLoadThread.setUrl(arg1); + appinfoLoadThread.setUrl(url.replace("+","%2B")); //对+进行转译，避免oss出错 appinfoLoadThread.start(); } } From ba29c4171c87b6eabcda09e3e5a2bbcc2506a46d Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 12 Oct 2022 22:06:30 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20?= =?UTF-8?q?=20=20debian/changelog=20=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20?= =?UTF-8?q?=20=20=20translations/spark-store=5Fen.ts=20=09=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=20=20=20=20=20translations/spark-store=5Ffr.?= =?UTF-8?q?ts=20=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20translations/?= =?UTF-8?q?spark-store=5Fzh=5FCN.ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 10 ++++ translations/spark-store_en.ts | 82 +++++++++++++++++-------------- translations/spark-store_fr.ts | 82 +++++++++++++++++-------------- translations/spark-store_zh_CN.ts | 82 +++++++++++++++++-------------- 4 files changed, 148 insertions(+), 108 deletions(-) diff --git a/debian/changelog b/debian/changelog index 428bfa1..2004cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +spark-store (3.2.4~test3) stable; urgency=medium + + * 发版，合入到master + * 翻译完毕 + * 合入先前的各项改动，为：客户端集成投稿器入口和支持，修复：安装依赖时间较长时错误地返回“安装完毕”结果，现在客户端版本更新时不关闭免密码登录，UOS安装进程合并正常aptss中 + + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.4~test2) stable; urgency=medium * 客户端集成投稿器入口和支持 diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 823177f..9794e45 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -12,9 +12,9 @@ QLabel - - - + + + Spark Store @@ -22,22 +22,22 @@ QObject - + We publish this program under GPL V3 - + <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> - + The Spark Project - + <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin 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><br/><br/>Published under GPL V3 @@ -149,8 +149,8 @@ - - + + Install @@ -368,32 +368,37 @@ - + Clean - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - + Size: - + Location：/tmp/spark-store - - About us + + Clear Web Cache + About us + + + + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us &lt;jifengshenmo@outlook.com&gt; we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p>QQ group:872690351<br/></p></body></html> @@ -428,92 +433,97 @@ - + 0B 0B - + Spark Store - + Search or enter spk:// - + Submit App - + + Submit App with client(Recommanded) + + + + Settings - + APP Upgrade and Install Settings - + Not Exist - - - - + + + + Spark\ Store - - + + Reinstall - + Failed to get the name to the file to be downloaded. - + Upgrade - + Updating, please wait... - + Uninstall succeeded - + Relative apps Not Found! - + Request Error: %1 - + Temporary cache was cleaned - + The URL has been copied to the clipboard diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 2529c5f..6070d1a 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -23,9 +23,9 @@ Spark Store est publié sous licence GPL V3 Nous sommes nés pour le changement. - - - + + + Spark Store @@ -33,22 +33,22 @@ Nous sommes nés pour le changement. QObject - + We publish this program under GPL V3 - + <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> - + The Spark Project - + <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin 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><br/><br/>Published under GPL V3 @@ -210,8 +210,8 @@ Nous sommes nés pour le changement. - - + + Install @@ -394,32 +394,37 @@ Nous sommes nés pour le changement. - + Clean - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - + Size: - + Location：/tmp/spark-store - - About us + + Clear Web Cache + About us + + + + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us &lt;jifengshenmo@outlook.com&gt; we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p>QQ group:872690351<br/></p></body></html> @@ -589,7 +594,7 @@ Nous sommes nés pour le changement. Taille: - + 0B 0B @@ -606,87 +611,92 @@ Nous sommes nés pour le changement. <html><head/><body><p>Nous ne sommes pas l'équipe officielle, tout comme vous, nous ne sommes qu'un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le "Spark Store"! ", est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. </p><p> Nous n'en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d'énergie se soucier du financement. </p><p>Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n'a rien à voir avec nous. </p><p>Si une partie du magasin enfreint vos droits, veuillez nous en informer &lt;jifengshenmo@outlook.com&gt; nous retirerons le contenu en infraction dès que possible. </p><p>Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. </p><p>QQ group:872690351<br/></p></body></html> - - - - + + + + Spark\ Store - + Spark Store - + Search or enter spk:// - + Submit App - + + Submit App with client(Recommanded) + + + + Settings - + APP Upgrade and Install Settings - + Not Exist - - + + Reinstall - + Failed to get the name to the file to be downloaded. - + Relative apps Not Found! - + Request Error: %1 - + Upgrade - + Updating, please wait... - + Uninstall succeeded - + Temporary cache was cleaned - + The URL has been copied to the clipboard diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 5545f8c..3117674 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -12,9 +12,9 @@ QLabel - - - + + + Spark Store Spark 应用商店 @@ -22,12 +22,12 @@ QObject - + We publish this program under GPL V3 本程序按GPL V3开源 - + <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> <span style=' font-size:10pt;font-weight:60;'>一款社区维护的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> @@ -40,7 +40,7 @@ <span style=' font-size:10pt;font-weight:60;'>deepin 社区驱动的一款第三方应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - + The Spark Project 星火计划 The Spark Project @@ -49,7 +49,7 @@ <span style=' font-size:10pt;font-weight:60;'>一款由 深度社区 出品的应用商店</span><br/>""<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>""<span style=' font-size:12pt;'>星火开发者联盟</span><br/>本程序遵循 GPL V3 协议发布 - + <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin 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><br/><br/>Published under GPL V3 <span style='font-size:10pt;font-weight:60;'>由 Deepin 社区出品的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>星火商店开发组</span><br/><br/>遵循 GPL V3 协议发布 @@ -204,8 +204,8 @@ - - + + Install 安装 @@ -403,32 +403,37 @@ 缓存目录 - + Clean 清空 - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. 因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。 - + Size: 目录大小： - + Location：/tmp/spark-store 目录位置：/tmp/spark-store - + + Clear Web Cache + 清理网页缓存 + + + About us 关于我们 - + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us &lt;jifengshenmo@outlook.com&gt; we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p>QQ group:872690351<br/></p></body></html> <html><head/><body><p>我们并<span style=" font-weight:600;">不是</span>官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。</p><p>我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。</p><p>我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。</p><p>如果商店中任何一部分有侵犯您权益的行为，请告知我们 &lt;jifengshenmo@outlook.com&gt;，我们会第一时间删除侵权内容。</p><p>如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。</p><p>QQ 群：872690351<br/></p></body></html> @@ -488,37 +493,42 @@ 检查星火应用商店更新 - + 0B - + Spark Store Spark 应用商店 - + Search or enter spk:// 搜索或打开链接 - + Submit App 投递应用 - + + Submit App with client(Recommanded) + 使用本地投稿器投递应用（推荐） + + + Settings 设置 - + APP Upgrade and Install Settings 应用更新和安装设置 - + Not Exist 不存在 @@ -527,11 +537,11 @@ 更新完毕 - - - - + + + + Spark\ Store 星火应用商店 @@ -568,8 +578,8 @@ 大小： - - + + Reinstall 重新安装 @@ -578,17 +588,17 @@ 加载应用程序图标失败。 - + Failed to get the name to the file to be downloaded. 获取安装包文件名失败。 - + Relative apps Not Found! 相关应用未找到！ - + Request Error: %1 请求错误：%1 @@ -597,12 +607,12 @@ 目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！ - + Upgrade 升级 - + Updating, please wait... 正在更新，请稍候…… @@ -662,17 +672,17 @@ Click yes to continue. 服务器未知错误 - + Uninstall succeeded 卸载成功 - + Temporary cache was cleaned 缓存目录已清空 - + The URL has been copied to the clipboard 链接已复制到剪贴板 From 09a1c9f71061bb126352b5c5c398f21a149a1634 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 12 Oct 2022 22:08:08 +0800 Subject: [PATCH 26/27] 3.2.4~test3 --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 54f042b..29ed8f9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.2.4")); + dialog.setVersion(DApplication::buildVersion("Version 3.2.4~test3")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.2.4")); + a.setApplicationVersion(DApplication::buildVersion("3.2.4~test3")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( From 8ca0035107bfb0b16eee16a848254cf13c3dc14c Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 13 Oct 2022 16:03:40 +0000 Subject: [PATCH 27/27] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=20https://www.deepinos?= =?UTF-8?q?.org/d/1076-ubuntu2204/3=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 3917216..5111194 100644 --- a/debian/control +++ b/debian/control @@ -35,6 +35,7 @@ Depends:${shlibs:Depends}, ${misc:Depends}, libnotify4, curl, openssl, + libssl-dev, dde-qt5integration, bubblewrap, aria2,