设置默认不勾选打包器wine生态适配活动容器清理脚本选项

Signed-off-by: gfdgd_xi <3025613752@qq.com>

InstallMono.py

@@ -12,6 +12,7 @@
 #################
 import os
 import sys
+import requests
 import updatekiller
 import traceback
 try:
@@ -56,10 +57,16 @@ try:
     exitInputShow = int(os.getenv("ENTERNOTSHOW"))
 except:
     exitInputShow = True
+
+headers = {
+    'User-Agent': "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/130.0.0.0"
+}
 try:
     # 获取最新版本的版本号
-    programVersionList = pyquery.PyQuery(url=f"http://mirrors.ustc.edu.cn/wine/wine/wine-{sys.argv[3]}/")
+    data = requests.get(f"http://mirrors.ustc.edu.cn/wine/wine/wine-{sys.argv[3]}/", headers=headers)
+    programVersionList = pyquery.PyQuery(data.text)
 except:
+    traceback.print_exc()
     print("无法连接下载服务器，将使用本地缓存")
     if not os.path.exists(f"{homePath}/.cache/deepin-wine-runner/{sys.argv[3]}/install.msi") or not os.path.exists(f"{homePath}/.cache/deepin-wine-runner/{sys.argv[3]}/information.txt"):
         print("无本地缓存数据，无法进行、结束")
@@ -75,7 +82,8 @@ except:
     exit()
 programVersion = programVersionList("a:last-child").attr.href
 # 获取最新版本安装包的URL
-programUrl = pyquery.PyQuery(url=f"http://mirrors.ustc.edu.cn/wine/wine/wine-{sys.argv[3]}/{programVersion}")
+data = requests.get(f"http://mirrors.ustc.edu.cn/wine/wine/wine-{sys.argv[3]}/{programVersion}", headers=headers)
+programUrl = pyquery.PyQuery(data.text)
 programDownloadUrl = ""
 programFileName = ""
 for i in programUrl("a").items():

StartVM.sh

@@ -68,7 +68,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         ./VM/kvm-ok
         if [[ $? == 0 ]] && [[ `arch` == "x86_64" ]]; then
             echo X86 架构，使用 kvm 加速
-            $qemuMore qemu-system-x86_64 --enable-kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+            $qemuMore qemu-system-x86_64 --enable-kvm -name Wine运行器虚拟机工具 -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G  -display gtk -nic model=rtl8139 $qemuUEFI \
                 -device AC97 -device ES1370 -device intel-hda -device hda-duplex  \
@@ -120,7 +120,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         echo $qemuUEFI
         ./VM/kvm-ok
         if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
-            $qemuMore qemu-system-arm --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+            $qemuMore qemu-system-arm --enable-kvm -name Wine运行器虚拟机工具 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
                 -cpu max -M virt -device virtio-gpu-pci \
@@ -132,7 +132,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
                 > $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all 
             exit
         fi
-        $qemuMore qemu-system-arm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+        $qemuMore qemu-system-arm -name Wine运行器虚拟机工具 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
             -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
             -cpu max -M virt -device virtio-gpu-pci \
@@ -158,10 +158,10 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         echo $qemuUEFI
         ./VM/kvm-ok
         if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
-            $qemuMore qemu-system-aarch64 --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+            $qemuMore qemu-system-aarch64 --enable-kvm -name Wine运行器虚拟机工具 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-                -cpu max -M virt \
+                -cpu cortex-a76 -M virt \
                 -device virtio-gpu-pci \
                 -device nec-usb-xhci,id=xhci,addr=0x1b \
                 -device usb-tablet,id=tablet,bus=xhci.0,port=1 \
@@ -171,10 +171,10 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
                 > $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all 
             exit
         fi
-        $qemuMore qemu-system-aarch64 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+        $qemuMore qemu-system-aarch64 -name Wine运行器虚拟机工具 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
             -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-            -cpu max -M virt \
+            -cpu cortex-a76 -M virt \
             -device virtio-gpu-pci \
             -device nec-usb-xhci,id=xhci,addr=0x1b \
             -device usb-tablet,id=tablet,bus=xhci.0,port=1 \

VM/qemu.py

@@ -89,9 +89,9 @@ class qemu:
             # 如果存在拓展 Qemu，则调用此
             qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-arm"
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "aarch64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
-            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+            return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
     
-        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def StartAarch64(self):
         bootScreenLogo = ""
@@ -112,7 +112,7 @@ class qemu:
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "aarch64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
             return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
     
-        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu cortex-a76 -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def StartLoong64(self):
         return 1
@@ -137,8 +137,8 @@ class qemu:
             qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-x86_64"
         print(self.commandOption)
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "x86_64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
-            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
-        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -nic model=rtl8139 " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+            return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -nic model=rtl8139 " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def Stop(self):
         os.system("killall qemu-system-x86_64 -9")

deb/DEBIAN/control

@@ -42,7 +42,7 @@ Recommends: winbind,
  qemu,
  alien, 
  spark-deepin-wine-runner-qemu-system-extra, 
- deepin-wine-staging | deepin-wine8-stable | hangover-wine | spark-wine | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine | libwine, 
+ deepin-wine10-stable | deepin-wine-staging | deepin-wine8-stable | hangover-wine | spark-wine | spark-wine11 | spark-wine11-wow | spark-wine10 | spark-wine10-wow | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine | libwine, 
  spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin
 Section: utils
 Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner-termux, termux-exec

deepin-wine-easy-packager.py

@@ -713,7 +713,10 @@ wineChooserList = [
 wineChooserIndex = 2
 wineList = [
     "deepin-wine-staging", 
+    "deepin-wine10-stable", 
     "deepin-wine8-stable", 
+    "spark-wine11-wow", 
+    "spark-wine11", 
     "spark-wine10-wow", 
     "spark-wine10", 
     "spark-wine9-wow", 

deepin-wine-packager.py

@@ -1346,10 +1346,13 @@ wine = {
     "spark-wine8-wow": "spark-wine8-wow", 
     "deepin-wine6-vannila": "deepin-wine6-vannila", 
     "deepin-wine8-stable": "deepin-wine8-stable", 
+    "deepin-wine10-stable": "deepin-wine10-stable", 
     "spark-wine9": "spark-wine9", 
     "spark-wine9-wow": "spark-wine9-wow", 
     "spark-wine10": "spark-wine10", 
     "spark-wine10-wow": "spark-wine10-wow", 
+    "spark-wine11": "spark-wine11", 
+    "spark-wine11-wow": "spark-wine11-wow", 
     "spark-wine": "spark-wine", 
     "deepin-wine-staging": "deepin-wine-staging"
 }
@@ -1675,7 +1678,7 @@ except:
     pass
 rmBash.setChecked(True)
 disabledMono.setChecked(True)
-cleanBottonByUOS.setChecked(True)
+#cleanBottonByUOS.setChecked(True)
 chooseWineHelperValue.setChecked(True)
 e12_text.setText(f"{get_desktop_path()}/demo_1.0.0_all.deb")
 widget.setLayout(widgetLayout)

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.5",
+    "Version": "4.1.7",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

mainwindow.py

@@ -1984,7 +1984,7 @@ def getFileFolderSize(fileOrFolderPath):
 
 # 获取当前语言
 def get_now_lang()->"获取当前语言":
-    return os.getenv('LANG')
+    return os.getenv('LANG') or 'C'
 
 # 又需要修复多线程导致的控件问题
 def AddDockerMenu():
@@ -2220,6 +2220,7 @@ def CheckWine():
             "基于 UOS exagear 的 deepin-wine6-stable": f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib /opt/exagear/bin/ubt_x64a64_al --path-prefix {get_home()}/.deepinwine/debian-buster --utmp-paths-list {get_home()}/.deepinwine/debian-buster/.exagear/utmp-list --vpaths-list {get_home()}/.deepinwine/debian-buster/.exagear/vpaths-list --opaths-list {get_home()}/.deepinwine/debian-buster/.exagear/opaths-list --smo-mode fbase --smo-severity smart --fd-limit 8192 --foreign-ubt-binary /opt/exagear/bin/ubt_x32a64_al -- /opt/deepin-wine6-stable/bin/wine ",
             "使用 Flatpak 安装的 Wine": "flatpak run org.winehq.Wine",
             "deepin-wine-staging": "deepin-wine-staging",
+            "deepin-wine10-stable": "deepin-wine10-stable",
             "deepin-wine8-stable": "deepin-wine8-stable",
             "deepin-wine6 stable": "deepin-wine6-stable", 
             "deepin-wine6-vannila": "deepin-wine6-vannila",
@@ -2232,6 +2233,8 @@ def CheckWine():
             "spark-wine9-wow": "spark-wine9-wow",
             "spark-wine10": "spark-wine10",
             "spark-wine10-wow": "spark-wine10-wow",
+            "spark-wine11": "spark-wine11",
+            "spark-wine11-wow": "spark-wine11-wow",
             "deepin-wine": "deepin-wine", 
             "deepin-wine5": "deepin-wine5", 
             "wine": "wine", 

package-script/information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.5",
+    "Version": "4.1.7",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",