#89

4ra1n · Jan 10, 2023 · 04b1dca · 04b1dca
1 parent c721290
commit 04b1dca
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -180,4 +180,5 @@ Others:
 
 更新内容：
 - [important] 支持xray 1.9.4版本 #91
-- [important] 指定多个POC #92
+- [important] 指定多个POC #92
+- [bug] 从下载面板得到的xray无法保存设置 #89
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![](https://img.shields.io/github/v/release/4ra1n/super-xray)](https://github.com/4ra1n/super-xray/releases/latest)
 ![](https://img.shields.io/github/downloads/4ra1n/super-xray/total)
 ![](https://img.shields.io/badge/build-JDK8-orange)
-![](https://img.shields.io/badge/Java%20Code%20Lines-5978-orange)
+![](https://img.shields.io/badge/Java%20Code%20Lines-5991-orange)
 
 [English Version](doc/README.md)
 

diff --git a/doc/README.md b/doc/README.md
@@ -2,7 +2,7 @@
 [![](https://img.shields.io/github/v/release/4ra1n/super-xray)](https://github.com/4ra1n/super-xray/releases/latest)
 ![](https://img.shields.io/github/downloads/4ra1n/super-xray/total)
 ![](https://img.shields.io/badge/build-JDK8-orange)
-![](https://img.shields.io/badge/Java%20Code%20Lines-5978-orange)
+![](https://img.shields.io/badge/Java%20Code%20Lines-5991-orange)
 
 ## Introduce
 

diff --git a/src/main/java/com/chaitin/xray/form/XrayDownForm.java b/src/main/java/com/chaitin/xray/form/XrayDownForm.java
@@ -1,5 +1,6 @@
 package com.chaitin.xray.form;
 
+import com.chaitin.xray.model.DB;
 import com.chaitin.xray.utils.ExecUtil;
 import com.chaitin.xray.utils.OSUtil;
 import com.chaitin.xray.utils.StringUtil;
@@ -42,7 +43,7 @@ public class XrayDownForm {
     private JButton saveButton;
     private static boolean finish = false;
     public static final String xrayDownBase = "https://download.xray.cool/xray";
-    private static String savePath = ".";
+    private static String savePath = "./xray-bin/";
     private static final String xrayVersion = "1.9.4";
     private static String osType = "xray_windows_amd64.exe.zip";
 
@@ -73,6 +74,11 @@ private void initLang() {
     }
 
     private void initSavePath() {
+        savePathText.setText(savePath);
+        try {
+            Files.createDirectories(Paths.get(savePath));
+        } catch (Exception ignored) {
+        }
         saveButton.addActionListener(e -> {
             JFileChooser fileChooser = new JFileChooser();
             fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
@@ -202,9 +208,9 @@ private void initUnzip() {
                     while ((len = in.read(buf)) > 0) {
                         out.write(buf, 0, len);
                     }
+                    outPath = Paths.get(outPath).toAbsolutePath().toString();
                     if (!OSUtil.isWindows()) {
-                        String absOutPath = Paths.get(outPath).toAbsolutePath().toString();
-                        ExecUtil.chmod(absOutPath);
+                        ExecUtil.chmod(outPath);
                     }
                     if (MainForm.LANG == MainForm.CHINESE) {
                         JOptionPane.showMessageDialog(xrayDownPanel, "文件位置：" + outPath);
@@ -225,6 +231,14 @@ private void initLoad() {
         loadButton.addActionListener(e -> {
             if (StringUtil.notEmpty(outPath)) {
                 MainForm.instance.loadXray(outPath);
+
+                DB data = new DB();
+                data.setLastXrayPath(outPath);
+                try {
+                    Files.write(Paths.get("super-xray.db"), data.getDB().getBytes());
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
             } else {
                 if (MainForm.LANG == MainForm.CHINESE) {
                     JOptionPane.showMessageDialog(xrayDownPanel, "文件不存在");