!124 fix： 安装时可能出现的超时错误

Merge pull request !124 from Pluto/dev

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)
 

README.zh.md

@@ -10,6 +10,8 @@
 
 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
 
+在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board
+
 如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
 
 

debian/changelog

@@ -1,4 +1,13 @@
-spark-store (3.2.4) stable; urgency=medium
+spark-store (3.2.4~test2) stable; urgency=medium
+
+  * 客户端集成投稿器入口和支持
+  * 修复：安装依赖时间较长时错误地返回“安装完毕”结果
+
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.4~test1) stable; urgency=medium
 
   * 客户端更新时不关闭免密码登录
   * UOS合并正常aptss中

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)
             {

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<char*> fakeArgs(argc + 2);
     fakeArgs[0] = argv[0];

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);
@@ -1109,11 +1128,11 @@ void Widget::on_pushButton_uninstall_clicked()
 
         QProcess uninstall;
         uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower());
-        uninstall.waitForFinished();
+        uninstall.waitForFinished(-1); // 默认无限时长
 
         QProcess check;
         check.start("dpkg", QStringList() << "-s" << pkgName.toLower());
-        check.waitForFinished();
+        check.waitForFinished(180); // 默认超时 3 分钟
 
         if (check.readAllStandardOutput().isEmpty())
         {

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;

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.