Merge remote-tracking branch 'upstream/Thunder' into Thunder

src/main.cpp

@@ -120,11 +120,6 @@ int main(int argc, char *argv[])
     
     //在cmakelist.txt中设置 buildDateTime
     QString buildDateTime = QString("%1-%2").arg(QString(BUILD_DATE)).arg(QString(BUILD_TIME));
-    Utils::writeLog("INFO", QString("Build datetime: %1").arg(buildDateTime));
-
-    // NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误
-    DApplication::setOrganizationName("spark-union");
-    DApplication::setApplicationName("spark-store");
     Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
 
     // 初始化 config.ini 配置文件

tool/apt-fast/ss-apt-fast

@@ -458,7 +458,17 @@ get_uris(){
     msg "Failed to create tmp dir" "warning"
     msg "无法创建临时目录" "warning"
     exit 1
+
+  
   }
+
+cleanup_tmpdir() {
+  if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then
+    rm -rf "$tmpdir"
+  fi
+}
+trap cleanup_tmpdir EXIT
+  
   ## --print-uris format is:
   # 'fileurl' filename filesize checksum_hint:filechecksum
   # 修改：process_package函数增加第二个参数表示当前线程的临时输出文件
@@ -580,6 +590,9 @@ get_uris(){
       rm -f "$thread_file"
     fi
   done
+   # 清理临时目录
+  cleanup_tmpdir
+  trap - EXIT  # 移除临时目录的陷阱
 
   # 合并显示信息
   if [ -f "$tmpdir/display" ]; then

translations/spark-store_zh_CN.ts

@@ -27,43 +27,37 @@
         <location filename="../src/pages/appintopage.ui" line="459"/>
         <location filename="../src/pages/appintopage.ui" line="462"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>兼容 Deepin 23</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>兼容 Deepin 23</translation>
     </message>
     <message>
         <location filename="../src/pages/appintopage.ui" line="509"/>
         <location filename="../src/pages/appintopage.ui" line="512"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app can only be installed natively&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>该应用只能在本机原生环境中安装</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>该应用只能在本机原生环境中安装</translation>
     </message>
     <message>
         <location filename="../src/pages/appintopage.ui" line="534"/>
         <location filename="../src/pages/appintopage.ui" line="537"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian12 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>此应用将会被安装到ACE Debian12兼容环境</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>此应用将会被安装到ACE Debian12兼容环境</translation>
     </message>
     <message>
         <location filename="../src/pages/appintopage.ui" line="559"/>
         <location filename="../src/pages/appintopage.ui" line="562"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian13 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>此应用将会被安装到ACE Debian13兼容环境</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>此应用将会被安装到ACE Debian13兼容环境</translation>
     </message>
     <message>
         <location filename="../src/pages/appintopage.ui" line="584"/>
         <location filename="../src/pages/appintopage.ui" line="587"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian SID ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>此应用将会被安装到ACE Debian SID兼容环境</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>此应用将会被安装到ACE Debian SID兼容环境</translation>
     </message>
     <message>
         <location filename="../src/pages/appintopage.ui" line="609"/>
         <location filename="../src/pages/appintopage.ui" line="612"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to deepin23 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>此应用将会被安装到ACE Deepin 23兼容环境</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>此应用将会被安装到ACE Deepin 23兼容环境</translation>
     </message>
     <message>
         <location filename="../src/pages/appintopage.ui" line="689"/>
@@ -539,8 +533,7 @@
     <message>
         <location filename="../src/application.cpp" line="40"/>
         <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;Sparky is our mascot, designed by &lt;a href=&apos;https://tai3.cn/&apos;&gt;Tyson Tan&lt;/a&gt;&lt;/span&gt;&lt;br/&gt;</source>
-        <translatorcomment>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;由社区打造的应用商店&lt;/span&gt;&lt;br/&gt;&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;Sparky 是我们的吉祥物。设计源于 &lt;a href=&apos;https://tai3.cn/&apos;&gt;Tyson Tan&lt;/a&gt;&lt;/span&gt;&lt;br/&gt;</translatorcomment>
+        <translation type="unfinished"></translation>
-        <translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;由社区打造的应用商店&lt;/span&gt;&lt;br/&gt;&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;Sparky 是我们的吉祥物。设计源于&lt;a href=&apos;https://tai3.cn/&apos;&gt;Tyson Tan&lt;/a&gt;&lt;/span&gt;&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../src/application.cpp" line="147"/>