diff --git a/pom.xml b/pom.xml index dae57fefe..468b306d8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tonikelope MegaBasterd - 6.65 + 6.66 jar diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java index d7892dc99..418524fb8 100644 --- a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java @@ -219,9 +219,11 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable { } if (_current_smart_proxy != null) { - con.setConnectTimeout(Download.HTTP_PROXY_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_PROXY_CONNECT_TIMEOUT); + con.setReadTimeout(Transference.HTTP_PROXY_READ_TIMEOUT); } else { - con.setConnectTimeout(Download.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); } con.setUseCaches(false); diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java index 4b39ac39c..a6fb55ea2 100644 --- a/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java @@ -81,7 +81,9 @@ public class ChunkDownloaderMono extends ChunkDownloader { con = (HttpURLConnection) url.openConnection(); } - con.setConnectTimeout(Download.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setUseCaches(false); diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java b/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java index aab29bb59..89ecf2305 100644 --- a/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java @@ -158,7 +158,9 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable { con.setFixedLengthStreamingMode(chunk_size); - con.setConnectTimeout(Upload.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Upload.HTTP_READ_TIMEOUT); con.setRequestProperty("User-Agent", MainPanel.DEFAULT_USER_AGENT); diff --git a/src/main/java/com/tonikelope/megabasterd/CryptTools.java b/src/main/java/com/tonikelope/megabasterd/CryptTools.java index 82bbc13b7..5b2ece57a 100644 --- a/src/main/java/com/tonikelope/megabasterd/CryptTools.java +++ b/src/main/java/com/tonikelope/megabasterd/CryptTools.java @@ -354,7 +354,9 @@ public class CryptTools { con.setUseCaches(false); - con.setConnectTimeout(Upload.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setRequestProperty("User-Agent", MainPanel.DEFAULT_USER_AGENT); @@ -529,7 +531,9 @@ public class CryptTools { con.setUseCaches(false); - con.setConnectTimeout(Upload.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setRequestProperty("User-Agent", "Mozilla/5.0 (X11; U; Linux amd64; rv:44.0) Gecko/20100101 Firefox/44.0"); diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java index 7118d5f23..2182319aa 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java @@ -53,7 +53,7 @@ import javax.swing.UIManager; */ public final class MainPanel { - public static final String VERSION = "6.65"; + public static final String VERSION = "6.66"; public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int STREAMER_PORT = 1337; diff --git a/src/main/java/com/tonikelope/megabasterd/MegaAPI.java b/src/main/java/com/tonikelope/megabasterd/MegaAPI.java index 3fda9071e..d7efbbd3c 100644 --- a/src/main/java/com/tonikelope/megabasterd/MegaAPI.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaAPI.java @@ -414,7 +414,9 @@ public class MegaAPI implements Serializable { con.setRequestProperty("Content-type", "text/plain;charset=UTF-8"); - con.setConnectTimeout(Transference.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setRequestProperty("User-Agent", MainPanel.DEFAULT_USER_AGENT); diff --git a/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java b/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java index a70680736..dc72bc144 100644 --- a/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java @@ -55,7 +55,9 @@ public class MegaCrypterAPI { con.setRequestProperty("Content-type", "application/json"); - con.setConnectTimeout(Transference.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setUseCaches(false); diff --git a/src/main/java/com/tonikelope/megabasterd/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java index c69296288..ca2dbcc4f 100644 --- a/src/main/java/com/tonikelope/megabasterd/MiscTools.java +++ b/src/main/java/com/tonikelope/megabasterd/MiscTools.java @@ -904,7 +904,9 @@ public class MiscTools { } - con.setConnectTimeout(Transference.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setUseCaches(false); diff --git a/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java b/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java index c39300924..cf3603dc4 100644 --- a/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java +++ b/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java @@ -80,7 +80,9 @@ public final class SmartMegaProxyManager { con = (HttpURLConnection) url.openConnection(); - con.setConnectTimeout(Transference.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setUseCaches(false); diff --git a/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java index d5f4c2949..c0fabe191 100644 --- a/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java @@ -128,7 +128,9 @@ public class StreamChunkDownloader implements Runnable { } } - con.setConnectTimeout(Transference.HTTP_TIMEOUT); + con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT); + + con.setReadTimeout(Transference.HTTP_READ_TIMEOUT); con.setUseCaches(false); diff --git a/src/main/java/com/tonikelope/megabasterd/Transference.java b/src/main/java/com/tonikelope/megabasterd/Transference.java index b1274e2e7..20b2b5687 100644 --- a/src/main/java/com/tonikelope/megabasterd/Transference.java +++ b/src/main/java/com/tonikelope/megabasterd/Transference.java @@ -10,8 +10,10 @@ public interface Transference { int MIN_WORKERS = 1; int MAX_WORKERS = 20; - int HTTP_TIMEOUT = 15000; - int HTTP_PROXY_TIMEOUT = 15000; + int HTTP_CONNECT_TIMEOUT = 15000; + int HTTP_PROXY_CONNECT_TIMEOUT = 15000; + int HTTP_READ_TIMEOUT = 15000; + int HTTP_PROXY_READ_TIMEOUT = 15000; int MAX_SIM_TRANSFERENCES = 20; int SIM_TRANSFERENCES_DEFAULT = 4; boolean LIMIT_TRANSFERENCE_SPEED_DEFAULT = false; diff --git a/src/main/java/com/tonikelope/megabasterd/Upload.java b/src/main/java/com/tonikelope/megabasterd/Upload.java index e0408de0d..af45e7259 100644 --- a/src/main/java/com/tonikelope/megabasterd/Upload.java +++ b/src/main/java/com/tonikelope/megabasterd/Upload.java @@ -26,6 +26,7 @@ import javax.swing.JComponent; */ public class Upload implements Transference, Runnable, SecureSingleThreadNotifiable { + public static final int HTTP_READ_TIMEOUT = 30000; public static final int WORKERS_DEFAULT = 6; public static final int CHUNK_SIZE_MULTI = 1; //Otra cosa da errores al reanudar una subida (investigar) private static final Logger LOG = Logger.getLogger(Upload.class.getName()); diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png index 5a9477bbe..8f30237d7 100644 Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ