Mirrors/megabasterd
1
0
Fork 0
mirror of https://github.com/tonikelope/megabasterd.git synced 2025-04-29 22:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

7.90 -> Fix 7.89 chunkdownloader smartproxy bug

Browse Source
This commit is contained in:
tonikelope 2023-10-18 22:52:59 +02:00
parent 618c1e671d
commit a65120415d
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId>
<version>7.89</version>
<version>7.90</version>
<packaging>jar</packaging>
<repositories>
<repository>

20
src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
View File

@ -152,8 +152,6 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
String worker_url = null;
long pause_init_time, paused = 0L;
byte[] buffer = new byte[DEFAULT_BYTE_BUFFER_SIZE];
SmartMegaProxyManager proxy_manager = MainPanel.getProxy_manager();
@ -164,12 +162,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
_download.pause_worker();
pause_init_time = System.currentTimeMillis();
secureWait();
paused += System.currentTimeMillis() - pause_init_time;
}
if (http_error == 509 && _509_timestamp == -1) {
@ -197,7 +190,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
MainPanel.LAST_EXTERNAL_COMMAND_TIMESTAMP = -1;
}
if (MainPanel.isUse_smart_proxy() && ((proxy_manager != null && proxy_manager.isForce_smart_proxy()) || _current_smart_proxy != null || http_error == 509 || (_509_timestamp != -1 && _509_timestamp + SMART_PROXY_RECHECK_509_TIME * 1000 < System.currentTimeMillis())) && !MainPanel.isUse_proxy()) {
if (MainPanel.isUse_smart_proxy() && ((proxy_manager != null && proxy_manager.isForce_smart_proxy()) || _current_smart_proxy != null || http_error == 509 || (_509_timestamp != -1 && _509_timestamp + SMART_PROXY_RECHECK_509_TIME * 1000 > System.currentTimeMillis())) && !MainPanel.isUse_proxy()) {
if (_current_smart_proxy != null && chunk_error) {
@ -309,8 +302,6 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
try (OutputStream tmp_chunk_file_os = new BufferedOutputStream(new FileOutputStream(tmp_chunk_file))) {
paused = 0L;
int reads = 0;
if (!_exit && !_download.isStopped() && !_download.getChunkmanager().isExit()) {
@ -328,12 +319,8 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
_download.pause_worker();
pause_init_time = System.currentTimeMillis();
secureWait();
paused += System.currentTimeMillis() - pause_init_time;
}
}
@ -374,7 +361,12 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
http_error = 0;
if (_current_smart_proxy != null && _509_timestamp != -1) {
_509_timestamp = -1;
if (_download.isTurbo()) {
_download.disableTurboMode();
}
}
_excluded_proxy_list.clear();

13
src/main/java/com/tonikelope/megabasterd/Download.java
View File

@ -250,6 +250,19 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
}
}
public void disableTurboMode() {
synchronized (_turbo_proxy_lock) {
if (_turbo) {
_turbo = false;
MiscTools.GUIRun(() -> {
getView().getSpeed_label().setForeground(Color.BLACK);
});
}
}
}
public void enableTurboMode() {
synchronized (_turbo_proxy_lock) {

2
src/main/java/com/tonikelope/megabasterd/MainPanel.java
View File

@ -69,7 +69,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
public static final String VERSION = "7.89";
public static final String VERSION = "7.90";
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;