!216 4262

Merge pull request !216 from shenmo/dev

debian/changelog

@@ -1,3 +1,15 @@
+spark-store (4.2.6.2) stable; urgency=medium
+  * 新增：支持arm架构搜索
+  
+ -- shenmo <shenmo@spark-app.store> 
+
+
+spark-store (4.2.6.1) stable; urgency=medium
+  * 修复：mint下更新检测不正常
+  
+ -- shenmo <shenmo@spark-app.store> 
+
+
 spark-store (4.2.6) stable; urgency=medium
   * 修复：截图加载失败时点击闪退
   

src/backend/sparkapi.cpp

@@ -7,6 +7,7 @@
 QString SparkAPI::serverUrl = "";
 #ifdef __x86_64__
     QString SparkAPI::serverUrlDir = "store";
+
 #elif __aarch64__
     QString SparkAPI::serverUrlDir = "aarch64-store";
 #endif

src/pages/applistpage.cpp

@@ -40,30 +40,24 @@ void AppListPage::getAppList(QString type)
     if (isDark)
     {
         theme = "theme=dark";
-    #ifdef __aarch64__
-        theme = "dark";
-    #endif
     }
     else
     {
         theme = "theme=light";
-    #ifdef __aarch64__
-        theme = "";
-    #endif
     }
     if (type == "")
     {
-        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme;
+        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=x86";
-    #ifdef __aarch64__
+        #ifdef __aarch64__
-        url = api->getServerUrl() + "aarch64-store/#/"+ theme;
+        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=aarch64";
-    #endif
+        #endif
     }
     else
     {
-        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme;
+        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=x86";
-    #ifdef __aarch64__
+        #ifdef __aarch64__
-        url = api->getServerUrl() + "aarch64-store/#/"+ theme + type;
+        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=aarch64";
-    #endif
+        #endif
     }
 
     ui->webEngineView->setUrl(url);
@@ -85,7 +79,11 @@ void AppListPage::getSearchList(const QString &keyword)
     {
         theme = "theme=light";
     }
-    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme;
+
+    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=x86";
+    #ifdef __aarch64__
+    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=aarch64";
+    #endif
     ui->webEngineView->setUrl(url);
     delete api;
 }

tool/update-upgrade/ss-do-upgrade-worker.sh

@@ -12,7 +12,7 @@ case $1 in
 	;;
 
 	upgradable-list)
-		output=$(env LANGUAGE=en_US apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1)
+		output=$(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1)
 
 		IFS_OLD="$IFS"
 		IFS=$'\n'