spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-12-13 04:12:03 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

!216 4262

Browse Source 
Merge pull request !216 from shenmo/dev
This commit is contained in:
shenmo
2023-04-25 14:07:41 +00:00
committed by Gitee
parent fd4b52e384 cb66f5e903
commit 9ac0c67a25
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@@ -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
* 修复：截图加载失败时点击闪退

1
src/backend/sparkapi.cpp
View File

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

28
src/pages/applistpage.cpp
View File

@@ -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;
#ifdef __aarch64__
url = api->getServerUrl() + "aarch64-store/#/"+ theme;
#endif
url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=x86";
#ifdef __aarch64__
url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=aarch64";
#endif
}
else
{
url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme;
#ifdef __aarch64__
url = api->getServerUrl() + "aarch64-store/#/"+ theme + type;
#endif
url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=x86";
#ifdef __aarch64__
url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=aarch64";
#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;
}

2
tool/update-upgrade/ss-do-upgrade-worker.sh
View File

@@ -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'