From 6c31ac0e891e83b396394990809085fb7423cccd Mon Sep 17 00:00:00 2001 From: BelPE Date: Thu, 27 Apr 2023 09:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D1=81=D0=B8;=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81=D0=B8=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20=D0=B2=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=BC=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- out/artifacts/proxy/config/config.json | 2 - out/artifacts/proxy/proxy.jar | Bin 60959 -> 62205 bytes out/production/proxy/org/proxy/Main.class | Bin 14571 -> 16946 bytes src/org/proxy/Main.java | 151 +++++++++++++++++----- 4 files changed, 118 insertions(+), 35 deletions(-) diff --git a/out/artifacts/proxy/config/config.json b/out/artifacts/proxy/config/config.json index b51fb44..5d42adc 100644 --- a/out/artifacts/proxy/config/config.json +++ b/out/artifacts/proxy/config/config.json @@ -1,8 +1,6 @@ { "port" : "7458", "proxyList" : [ - "https://notaproxy.ru", - "http://proxy.com", "http://ideco.mcs.br/wpad.dat", "http://proxy.mcs.br:8080/array.dll?Get.Routing.Script" ], diff --git a/out/artifacts/proxy/proxy.jar b/out/artifacts/proxy/proxy.jar index ad9f002e01e92ba4f87708c7b59129707a9c95e5..49113c8d372c46db07a81d2171b298640abef544 100644 GIT binary patch delta 9178 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

-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 G`2G(`IsS0~ diff --git a/out/production/proxy/org/proxy/Main.class b/out/production/proxy/org/proxy/Main.class index c98e9bcb873078aeea677f7c71c736729b6c17ae..1493a6d73e6b28698c3cd945ec48e57ef3703b61 100644 GIT binary patch literal 16946 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 QL3a>%r+AL^Or`LD1J!Q>IRF3v literal 14571 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 T|L5uec=BS+_tY=cugL#j4&bg@ diff --git a/src/org/proxy/Main.java b/src/org/proxy/Main.java index b3a315f..d9d08b5 100644 --- a/src/org/proxy/Main.java +++ b/src/org/proxy/Main.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Locale; import java.util.Scanner; +import static java.awt.Component.LEFT_ALIGNMENT; import static javax.swing.JOptionPane.showMessageDialog; import static org.dhaverdLogs.DhaverdLogs.*; import static org.proxy.loadConfig.*; @@ -98,38 +99,8 @@ public class Main { setLog(context,"System tray is unsupported!", true, false); return; } - - List proxyList = getProxyList(); - currentProxyList = proxyList; - PopupMenu trayMenu = new PopupMenu(); - MenuItem addButton = new MenuItem("Add proxy..."); - addButton.setFont(trayFont); - addButton.addActionListener(addListener()); - trayMenu.add(addButton); - for (String prox : proxyList){ - MenuItem proxy = new MenuItem(prox); - proxy.setFont(trayFont); - proxy.addActionListener(proxyListener(prox)); - trayMenu.add(proxy); - } - MenuItem stopButton = new MenuItem("Stop"); - stopButton.setFont(trayFont); - stopButton.addActionListener(stopListener()); - trayMenu.add(stopButton); - MenuItem trayExit = new MenuItem("Exit"); - trayExit.setFont(trayFont); - trayExit.addActionListener(trayExitListener()); - trayMenu.add(trayExit); - Image icon; - icon = Toolkit.getDefaultToolkit().getImage("res" + osSeparator + "icon off.png"); - trayIcon = new TrayIcon(icon, "Current proxy: " + currentProxyPub, trayMenu); - trayIcon.setImageAutoSize(!isLinux); tray = SystemTray.getSystemTray(); - try { - tray.add(trayIcon); - } catch (AWTException e) { - exeptionActions(context, e); - } + loadMenu(); setLog(context,"System tray launched", true, false); } @@ -179,8 +150,12 @@ public class Main { } public static void reloadMenu() throws IOException, ParseException { - String context = "Reload tray menu"; tray.remove(trayIcon); + loadMenu(); + } + + public static void loadMenu() throws IOException, ParseException { + String context = "Load tray menu"; List proxyList = getProxyList(); currentProxyList = proxyList; PopupMenu trayMenu = new PopupMenu(); @@ -188,12 +163,18 @@ public class Main { addButton.setFont(trayFont); addButton.addActionListener(addListener()); trayMenu.add(addButton); + Menu proxyMenu = new Menu("Proxy"); + trayMenu.add(proxyMenu); for (String prox : proxyList){ MenuItem proxy = new MenuItem(prox); proxy.setFont(trayFont); proxy.addActionListener(proxyListener(prox)); - trayMenu.add(proxy); + proxyMenu.add(proxy); } + MenuItem deleteButton = new MenuItem("Delete proxy..."); + deleteButton.setFont(trayFont); + deleteButton.addActionListener(deleteListener()); + trayMenu.add(deleteButton); MenuItem stopButton = new MenuItem("Stop"); stopButton.setFont(trayFont); stopButton.addActionListener(stopListener()); @@ -283,6 +264,110 @@ public class Main { frame.setVisible(true); }; } + + public static ActionListener deleteListener(){ + return e -> { + String context = "Delete Listener"; + //frame + JFrame frame = new JFrame("Add proxy"); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setSize(300,200); + frame.setLocationRelativeTo(null); + + //main panel + JPanel mainPanel = new JPanel(); + GridBagLayout layout = new GridBagLayout(); + mainPanel.setLayout(layout); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.anchor = GridBagConstraints.WEST; + gbc.insets = new Insets(5, 5, 5, 5); + + try { + List proxyList = getProxyList(); + List checkBoxList = new ArrayList<>(); + for (String proxy : proxyList){ + JCheckBox checkBox = new JCheckBox(proxy); + checkBoxList.add(checkBox); + mainPanel.add(checkBox, gbc); + gbc.gridy++; + } + gbc.anchor = GridBagConstraints.CENTER; + gbc.insets = new Insets(5, 10, 5, 10); + JButton deleteButton = new JButton("Delete"); + deleteButton.addActionListener(al ->{ + List proxyToDelete = new ArrayList<>(); + for (JCheckBox checkBox : checkBoxList){ + if (checkBox.isSelected()){ + proxyToDelete.add(checkBox.getText()); + } + } + try { + deleteProxy(proxyToDelete); + reloadMenu(); + } catch (IOException | ParseException ex) { + exeptionActions(context, ex); + } + frame.dispose(); + }); + gbc.weightx = 0.5; + mainPanel.add(deleteButton, gbc); + JButton closeButton = new JButton("Close"); + gbc.gridx = 1; + closeButton.addActionListener(al -> { + frame.dispose(); + }); + mainPanel.add(closeButton, gbc); + frame.getContentPane().add(mainPanel); + frame.pack(); + frame.setResizable(false); + frame.setVisible(true); + } catch (IOException | ParseException ex) { + exeptionActions(context, ex); + } + }; + } + + public static void deleteProxy(List proxyToDelete) throws IOException { + File config = getConfigFile(); + FileReader reader = new FileReader(config); + Scanner sc = new Scanner(reader); + List propsList = new ArrayList<>(); + while (sc.hasNext()){ + String line = sc.nextLine(); + propsList.add(line); + } + sc.close(); + reader.close(); + List newProps = new ArrayList<>(); + for (String prop : propsList){ + boolean isToDelete = false; + for (String deleteProxy : proxyToDelete){ + if (prop.contains(deleteProxy)){ + isToDelete = true; + setLog("Delete Proxy", "Proxy is deleted: " + deleteProxy, true, false); + break; + } + } + if (!isToDelete){ + newProps.add(prop); + } + } + /* + setLog("Add new proxy function", "New proxy list:", true, false); + for (String prop : newProps) { + setLog("Add new proxy function", prop, false, true); + } + */ + FileWriter writer = new FileWriter(config, false); + for (String prop : newProps) { + writer.write(prop + "\n"); + } + writer.close(); + } + public static ActionListener stopListener() { return e -> { closeThread();