适配spark-wine10

VM/qemu.py

@@ -28,8 +28,11 @@ class qemu:
         self.vboxVersion = subprocess.getoutput(self.qemuPath + " --version")
 
     def Create(self, type = "Windows7"):
-        if(not os.path.exists(self.name)):
+        try:
-            os.makedirs(self.name)
+            if(not os.path.exists(self.name)):
+                os.makedirs(self.name)
+        except:
+            pass
         return 0
 
     def CreateDisk(self, path: str, size: int):

deepin-wine-easy-packager.py

@@ -711,7 +711,23 @@ wineChooserList = [
     "使用 Spark Wine 打包应用"
 ]
 wineChooserIndex = 2
-wineList = ["deepin-wine-staging", "deepin-wine8-stable", "spark-wine9-wow", "spark-wine9", "spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine6-vannila", "spark-wine8-wow", "deepin-wine5-stable", "deepin-wine5", "deepin-wine", "spark-wine"]
+wineList = [
+    "deepin-wine-staging", 
+    "deepin-wine8-stable", 
+    "spark-wine10-wow", 
+    "spark-wine10", 
+    "spark-wine9-wow", 
+    "spark-wine9", 
+    "spark-wine8", 
+    "spark-wine7-devel", 
+    "deepin-wine6-stable", 
+    "deepin-wine6-vannila", 
+    "spark-wine8-wow", 
+    "deepin-wine5-stable", 
+    "deepin-wine5", 
+    "deepin-wine", 
+    "spark-wine"
+]
 for i in range(len(wineList)):
     if not os.system(f"which '{wineList[i]}'"):
         wineChooserIndex = i

deepin-wine-packager.py

@@ -1332,8 +1332,28 @@ bottleNameLock = False
 ###############
 programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 # 如果要添加其他 wine，请在字典添加其名称和执行路径
-wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine9": "spark-wine9", "spark-wine9-wow": "spark-wine9-wow", "spark-wine": "spark-wine", "deepin-wine-staging": "deepin-wine-staging"}
+wine = {
-wineValue = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5-stable": "deepin-wine5 stable", "deepin-wine6-stable": "deepin-wine6 stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine": "spark-wine", "deepin-wine-staging": "deepin-wine-staging"}
+    "deepin-wine": "deepin-wine", 
+    "deepin-wine5": "deepin-wine5", 
+    "wine": "wine", 
+    "wine64": "wine64", 
+    "deepin-wine5 stable": "deepin-wine5-stable", 
+    "deepin-wine6 stable": "deepin-wine6-stable", 
+    "spark-wine7-devel": "spark-wine7-devel", 
+    "ukylin-wine": "ukylin-wine", 
+    "okylin-wine": "okylin-wine", 
+    "spark-wine8": "spark-wine8", 
+    "spark-wine8-wow": "spark-wine8-wow", 
+    "deepin-wine6-vannila": "deepin-wine6-vannila", 
+    "deepin-wine8-stable": "deepin-wine8-stable", 
+    "spark-wine9": "spark-wine9", 
+    "spark-wine9-wow": "spark-wine9-wow", 
+    "spark-wine10": "spark-wine10", 
+    "spark-wine10-wow": "spark-wine10-wow", 
+    "spark-wine": "spark-wine", 
+    "deepin-wine-staging": "deepin-wine-staging"
+}
+wineValue = wine
 # 读取 wine 本地列表
 try:
     for i in os.listdir("/opt"):

mainwindow.py

@@ -2230,6 +2230,8 @@ def CheckWine():
             "spark-wine8-wow": "spark-wine8-wow",
             "spark-wine9": "spark-wine9",
             "spark-wine9-wow": "spark-wine9-wow",
+            "spark-wine10": "spark-wine10",
+            "spark-wine10-wow": "spark-wine10-wow",
             "deepin-wine": "deepin-wine", 
             "deepin-wine5": "deepin-wine5", 
             "wine": "wine",