diff --git a/pom.xml b/pom.xml
index fffe323b5..5e967d2a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 7.9
+ 7.10
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
index 4089b5827..b42d73800 100644
--- a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
+++ b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
@@ -203,7 +203,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
} else {
- LOG.log(Level.INFO, "{0} Worker [{1}] SmartProxy getFastestProxy returned NULL! {2}", new Object[]{Thread.currentThread().getName(), _id, _download.getFile_name()});
+ LOG.log(Level.INFO, "{0} Worker [{1}] SmartProxy getProxy returned NULL! {2}", new Object[]{Thread.currentThread().getName(), _id, _download.getFile_name()});
URL url = new URL(chunk_url);
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index ee5d0bb54..ccba2eb03 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -55,7 +55,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
- public static final String VERSION = "7.9";
+ public static final String VERSION = "7.10";
public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
@@ -347,9 +347,9 @@ public final class MainPanel {
});
} else {
- swingInvoke(() -> {
- getView().updateSmartProxyStatus("SmartProxy: OFF");
- });
+
+ getView().updateSmartProxyStatus("SmartProxy: OFF");
+
}
swingInvoke(() -> {
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
index 91accd0b6..d260256b4 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
@@ -153,53 +153,54 @@ public final class MainPanelView extends javax.swing.JFrame {
public void updateKissStreamServerStatus(final String status) {
- String old_status = getKiss_server_status().getText();
+ swingInvoke(() -> {
+ String old_status = getKiss_server_status().getText();
- if (!old_status.equals(status + " ")) {
- Dimension frame_size = this.getSize();
+ if (!old_status.equals(status + " ")) {
+ Dimension frame_size = this.getSize();
- swingInvoke(() -> {
getKiss_server_status().setText(status + " ");
pack();
setSize(frame_size);
- });
- }
+ }
+ });
}
public void updateSmartProxyStatus(final String status) {
- String old_status = getSmart_proxy_status().getText();
+ swingInvoke(() -> {
+ String old_status = getSmart_proxy_status().getText();
- if (!old_status.equals(status + " ")) {
- Dimension frame_size = this.getSize();
+ if (!old_status.equals(status + " ")) {
+ Dimension frame_size = this.getSize();
- swingInvoke(() -> {
getSmart_proxy_status().setText(status + " ");
pack();
setSize(frame_size);
- });
- }
+ }
+ });
}
public void updateMCReverseStatus(final String status) {
- String old_status = getMc_reverse_status().getText();
+ swingInvoke(() -> {
- if (!old_status.equals(status + " ")) {
- Dimension frame_size = this.getSize();
+ String old_status = getMc_reverse_status().getText();
+
+ if (!old_status.equals(status + " ")) {
+ Dimension frame_size = this.getSize();
- swingInvoke(() -> {
getMc_reverse_status().setText(status + " ");
pack();
setSize(frame_size);
- });
- }
+ }
+ });
}
private void _new_upload_dialog(FileGrabberDialog dialog) {
diff --git a/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java b/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java
index 1310c3196..f826b9c4c 100644
--- a/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java
+++ b/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java
@@ -1,6 +1,5 @@
package com.tonikelope.megabasterd;
-import static com.tonikelope.megabasterd.MiscTools.swingInvoke;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -21,7 +20,8 @@ import java.util.logging.Logger;
public final class SmartMegaProxyManager {
public static String DEFAULT_SMART_PROXY_URL = "https://raw.githubusercontent.com/tonikelope/megabasterd/proxy_list/proxy_list.txt";
- public static final int PROXY_BLOCK_TIME = 180;
+ public static final int PROXY_BLOCK_TIME = 300;
+ public static final int PROXY_AUTO_REFRESH_SLEEP_TIME = 15;
private static final Logger LOG = Logger.getLogger(SmartMegaProxyManager.class.getName());
private volatile String _proxy_list_url;
private final LinkedHashMap _proxy_list;
@@ -56,7 +56,13 @@ public final class SmartMegaProxyManager {
}
}
- LOG.log(Level.WARNING, "{0} Smart Proxy Manager: NO PROXYS AVAILABLE!! (Refreshing...)", new Object[]{Thread.currentThread().getName()});
+ LOG.log(Level.WARNING, "{0} Smart Proxy Manager: NO PROXYS AVAILABLE!! (Refreshing in " + String.valueOf(PROXY_AUTO_REFRESH_SLEEP_TIME) + " secs...)", new Object[]{Thread.currentThread().getName()});
+
+ try {
+ Thread.sleep(PROXY_AUTO_REFRESH_SLEEP_TIME * 1000);
+ } catch (InterruptedException ex) {
+ Logger.getLogger(SmartMegaProxyManager.class.getName()).log(Level.SEVERE, null, ex);
+ }
refreshProxyList();
@@ -69,7 +75,7 @@ public final class SmartMegaProxyManager {
_proxy_list.put(proxy, System.currentTimeMillis() + PROXY_BLOCK_TIME * 1000);
- LOG.log(Level.WARNING, "{0} Smart Proxy Manager: BLOCKING PROXY -> {1}", new Object[]{Thread.currentThread().getName(), proxy});
+ LOG.log(Level.WARNING, "{0} Smart Proxy Manager: BLOCKING PROXY -> {1} ({2} secs)", new Object[]{Thread.currentThread().getName(), proxy, PROXY_BLOCK_TIME});
}
}
@@ -150,16 +156,13 @@ public final class SmartMegaProxyManager {
}
}
- swingInvoke(() -> {
- _main_panel.getView().updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(getProxyCount()) + ")");
- });
+ _main_panel.getView().updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(getProxyCount()) + ")");
LOG.log(Level.INFO, "{0} Smart Proxy Manager: proxy list refreshed ({1})", new Object[]{Thread.currentThread().getName(), _proxy_list.size()});
} else if (!custom_clean_list.isEmpty()) {
- swingInvoke(() -> {
- _main_panel.getView().updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(getProxyCount()) + ")*");
- });
+
+ _main_panel.getView().updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(getProxyCount()) + ")*");
LOG.log(Level.INFO, "{0} Smart Proxy Manager: proxy list refreshed ({1})", new Object[]{Thread.currentThread().getName(), _proxy_list.size()});
}
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index 2108f9166..f45e73736 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ