!179 4.1.2 正式版

Merge pull request !179 from shenmo/dev
update debian/changelog.
2025-12-15 13:22:04 +08:00 · 2023-01-06 09:43:45 +00:00 · 2023-01-06 09:29:18 +00:00 · 2023-01-06 09:24:19 +00:00 · 2023-01-06 09:23:57 +00:00 · 2023-01-06 09:14:07 +00:00
8 changed files with 118 additions and 46 deletions
--- a/DOCS/spk-doc.md
+++ b/DOCS/spk-doc.md
@@ -2,6 +2,8 @@

 参数只有一个Url，该url应当遵循这种格式：`spk://<任意合法字符>/web分类/包名`

+目前第一字段不进行处理，以后可能会对此识别。在目前阶段，这个字段可以填写任意合法字符
+
 例如:

 [spk://abcdefg/games/store.spark-app.hmcl](spk://abcdefg/games/store.spark-app.hmcl)
@@ -15,11 +17,11 @@
 | 社交沟通 | chat           |
 | 音乐欣赏 | music          |
 | 视频播放 | video          |
-| 图形图像 | graphics       |
+| 图形图像 | image_graphics       |
 | 游戏娱乐 | games          |
 | 办公学习 | office         |
 | 阅读翻译 | reading        |
 | 编程开发 | development    |
 | 系统工具 | tools          |
-| 主题美化 | beautify       |
+| 主题美化 | themes       |
 | 其他应用 | others         |
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+spark-store (4.1.2) stable; urgency=medium
+
+  * feat: 初步的wayland支持
+  * fix: 首页的捐赠页面在中文环境下显示中文
+  * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
+  * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit
+  * fix: Ubuntu下下载列表无法关闭
+  * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题
+  * fix: 修复特定情况下的内存泄漏问题
+  * fix: 适配c11代码规范，消除qt编译警告
+  * fix: 默认服务器域名指向cdn域名
+  * fix: 消除内部函数的无用变量，限制作用域
+  * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取
+  * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用
+  * chore: 去除安装依赖:g++
+  * fix: 修复下载列表中进度提示文字显示不完整的问题
+  * feat: ssinstall支持从单独文件夹中校验软件包
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
+
+
+  * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
+  * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致
+  * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径
+  * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置
+  * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用
+  * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致）
+  * chore: 新增编译依赖，测试安装时不会出现报错
+  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
+  * chore: 更新翻译文件，去除已经不存在的翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (4.1.2~test2) stable; urgency=medium
+
+  * feat: ssinstall支持从单独文件夹中校验软件包
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (4.1.2~test1) stable; urgency=medium

  * feat: 初步的wayland支持
@@ -15,6 +56,7 @@ spark-store (4.1.2~test1) stable; urgency=medium
  * chore: 去除安装依赖:g++
  * fix: 修复下载列表中进度提示文字显示不完整的问题

+
  * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
  * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致
  * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径
--- a/debian/control
+++ b/debian/control
@@ -44,4 +44,3 @@ Depends:${shlibs:Depends}, ${misc:Depends},
 zenity
 Description: Spark Store
 A community powered app store, based on DTK.
-Recommends: apt-fast
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,7 @@ DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
    // Get build time
-    static const QString version = "4.1.2~test1";
+    static const QString version = "4.1.2";
    static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
    static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
    static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -52,16 +52,28 @@ fi

 DEBPATH=`realpath $1`

-if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then
+if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ] && [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then
 echo "接收星火仓库软件信息中..."
 aptss ssupdate
 fi

+### 选择包信息位置
+
+if [ -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then
+PACKAGES_DATA_PATH="/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是单目录仓库配置"
+else
+PACKAGES_DATA_PATH="/var/lib/apt/lists/d.store.deepinos.org.cn_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是根目录仓库配置"
+fi
+
+
+
 echo "正在计算hash并与星火仓库匹配..."

 DEB_MD5SUM=`md5sum "$DEBPATH" | cut -c -32`

-IS_MD5SUM_CHECKD=`cat /var/lib/apt/lists/d.store.deepinos.org.cn_Packages | grep $DEB_MD5SUM`
+IS_MD5SUM_CHECKD=`cat $PACKAGES_DATA_PATH | grep $DEB_MD5SUM`
 if [ ! -z "$IS_MD5SUM_CHECKD" ];then

 echo "校验成功，开始安装"
@@ -80,5 +92,4 @@ echo "如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核
 echo "如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall"


-
 fi
--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -293,59 +293,65 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="41"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="43"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="44"/>
        <source>Download Complete.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="159"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="167"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="101"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="104"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="105"/>
        <source>Installing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
        <source>Installation complete.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="145"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="149"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="150"/>
        <source>Finish</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="152"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="157"/>
        <source>Retry</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="159"/>
        <source>Error happened in dpkg progress , you can try it again.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="155"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="160"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
        <source>Error happened in dpkg progress , you can try it again</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="167"/>
        <source>dpkg progress had been aborted，you can retry installation.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="162"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="168"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="169"/>
        <source>dpkg progress had been aborted，you can retry installation</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="182"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="189"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="190"/>
        <source>Download canceled</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/spark-store_fr.ts
+++ b/translations/spark-store_fr.ts
@@ -293,59 +293,65 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="41"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="43"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="44"/>
        <source>Download Complete.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="159"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="167"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="101"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="104"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="105"/>
        <source>Installing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
        <source>Installation complete.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="145"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="149"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="150"/>
        <source>Finish</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="152"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="157"/>
        <source>Retry</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="159"/>
        <source>Error happened in dpkg progress , you can try it again.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="155"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="160"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
        <source>Error happened in dpkg progress , you can try it again</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="167"/>
        <source>dpkg progress had been aborted，you can retry installation.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="162"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="168"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="169"/>
        <source>dpkg progress had been aborted，you can retry installation</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="182"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="189"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="190"/>
        <source>Download canceled</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -293,59 +293,65 @@
        <translation>详情</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="41"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="43"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="44"/>
        <source>Download Complete.</source>
        <translation>下载完成.</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="159"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="167"/>
        <source>Spark Store</source>
        <translation>星火应用商店</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="101"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="104"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="105"/>
        <source>Installing</source>
        <translation>正在安装</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
        <source>Installation complete.</source>
        <translation>安装完成.</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="145"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="149"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="150"/>
        <source>Finish</source>
        <translation>完成</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="152"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="157"/>
        <source>Retry</source>
        <translation>重试</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="159"/>
        <source>Error happened in dpkg progress , you can try it again.</source>
        <translation>安装被中止，可重新安装。</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="155"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="160"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
        <source>Error happened in dpkg progress , you can try it again</source>
        <translation>dpkg出现错误，可重新安装</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="161"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="167"/>
        <source>dpkg progress had been aborted，you can retry installation.</source>
        <translation>dpkg进程被中断，您可重试安装。</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="162"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="168"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="169"/>
        <source>dpkg progress had been aborted，you can retry installation</source>
        <translation>安装被中止，可重新安装</translation>
    </message>
    <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="182"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="189"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="190"/>
        <source>Download canceled</source>
        <translation>下载已取消</translation>
    </message>
Author	SHA1	Message	Date
shenmo	36d273dd5e	!179 4.1.2 正式版 Merge pull request !179 from shenmo/dev	2023-01-06 09:43:45 +00:00
shenmo	6bdc1ee51c	update debian/changelog. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2023-01-06 09:29:18 +00:00
shenmo	ecfa9a166d	update src/main.cpp. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2023-01-06 09:24:19 +00:00
shenmo	199700495c	update debian/changelog. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2023-01-06 09:23:57 +00:00
shenmo	0bafab7f94	update DOCS/spk-doc.md. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2023-01-06 09:14:07 +00:00
shenmo	dd4deff19d	update DOCS/spk-doc.md. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2023-01-06 09:12:58 +00:00
shenmo	8b88573283	在ssinstall输出中指出根目录或者单目录	2023-01-05 14:54:57 +08:00
shenmo	2717cf695c	ssinstall不允许安装验证失败的软件包	2023-01-05 14:53:15 +08:00
shenmo	385803754f	区分版本号，新改动转给412t2	2023-01-05 14:49:23 +08:00
shenmo	8ba377cf0b	changelog	2023-01-05 14:47:29 +08:00
shenmo	c21d4dac96	支持store分类单独安装	2023-01-05 14:45:53 +08:00
shenmo	a85200338c	删除apt-fast推荐 Signed-off-by: shenmo <jifengshenmo@outlook.com>	2023-01-04 06:43:06 +00:00
shenmo	8850cfd4a3	update dtk-build-release-tag-20220425.yml	2022-12-25 07:45:19 +00:00
shenmo	bec8a14baf	!177 将默认的README改为英文 Merge pull request !177 from shenmo/dev	2022-12-25 04:46:51 +00:00
shenmo	8918e63484	!171 4.1.1-real Merge pull request !171 from shenmo/dev	2022-12-21 16:18:05 +00:00