Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: log external command output #591

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: log external command output #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76cea10
feat: log output from external command
jogerj Oct 21, 2023
d5752b4
feat: log external commands output separately
jogerj Oct 22, 2023
84d4f38
Merge branch 'tonikelope:master' into feat/external-cmds
jogerj Nov 6, 2023
7abee19
Merge branch 'tonikelope:master' into feat/external-cmds
jogerj Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions src/main/java/com/tonikelope/megabasterd/MainPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import static java.util.concurrent.Executors.newCachedThreadPool;
Expand Down Expand Up @@ -94,6 +95,7 @@ public final class MainPanel {
private static boolean _use_smart_proxy;
private static boolean _run_command;
private static String _run_command_path;
private static boolean _run_command_log;
private static String _font;
private static SmartMegaProxyManager _proxy_manager;
private static String _language;
Expand Down Expand Up @@ -267,6 +269,7 @@ public MainPanel() {
loadUserSettings();

if (_debug_file) {
_run_command_log = true;

PrintStream fileOut;

Expand Down Expand Up @@ -864,9 +867,27 @@ public static synchronized void run_external_command() {

if (_run_command_path != null && !_run_command_path.equals("")) {
try {
Runtime.getRuntime().exec(_run_command_path);
} catch (IOException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
StringTokenizer st = new StringTokenizer(_run_command_path);
String[] cmdarray = new String[st.countTokens()];
for (int i = 0; st.hasMoreTokens(); i++)
cmdarray[i] = st.nextToken();

ProcessBuilder pb;

if (_run_command_log) {
File externalCmdLog = new File(MainPanel.MEGABASTERD_HOME_DIR + "/MEGABASTERD_EXTERNAL_CMD.log");
pb = new ProcessBuilder(cmdarray)
.redirectOutput(ProcessBuilder.Redirect.appendTo(externalCmdLog))
.redirectError(ProcessBuilder.Redirect.appendTo(externalCmdLog));
} else {
pb = new ProcessBuilder(cmdarray);
}
Process pr = pb.start();

pr.waitFor();
pr.destroy();
} catch (IOException | InterruptedException ex) {
LOG.log(Level.SEVERE, ex.getMessage());
}

LAST_EXTERNAL_COMMAND_TIMESTAMP = System.currentTimeMillis();
Expand Down
27 changes: 21 additions & 6 deletions src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
Expand All @@ -55,7 +56,6 @@
import javax.swing.RowSorter;
import javax.swing.SortOrder;
import javax.swing.SpinnerNumberModel;
import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.table.DefaultTableModel;

Expand Down Expand Up @@ -3044,13 +3044,28 @@ private void limit_upload_speed_checkboxStateChanged(javax.swing.event.ChangeEve

private void run_command_test_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_run_command_test_buttonActionPerformed
// TODO add your handling code here:

if (run_command_textbox.getText() != null && !"".equals(run_command_textbox.getText().trim())) {

try {
Runtime.getRuntime().exec(run_command_textbox.getText().trim());
} catch (IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
StringTokenizer st = new StringTokenizer(run_command_textbox.getText().trim());
String[] cmdarray = new String[st.countTokens()];
for (int i = 0; st.hasMoreTokens(); i++)
cmdarray[i] = st.nextToken();

ProcessBuilder pb;
if (debug_file_checkbox != null && debug_file_checkbox.isSelected()) {
File externalCmdLog = new File(MainPanel.MEGABASTERD_HOME_DIR + "/MEGABASTERD_EXTERNAL_CMD.log");
pb = new ProcessBuilder(cmdarray)
.redirectOutput(ProcessBuilder.Redirect.appendTo(externalCmdLog))
.redirectError(ProcessBuilder.Redirect.appendTo(externalCmdLog));
} else {
pb = new ProcessBuilder(cmdarray);
}
Process pr = pb.start();

pr.waitFor();
pr.destroy();
} catch (IOException | InterruptedException ex) {
LOG.log(Level.SEVERE, ex.getMessage());
JOptionPane.showMessageDialog(this, ex.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
}
}
Expand Down