diff --git a/pom.xml b/pom.xml index bad5537dc..9999ac91b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tonikelope MegaBasterd - 7.13 + 7.14 jar diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java index ef88199ee..a52b4f24c 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java @@ -885,10 +885,10 @@ public class FileGrabberDialog extends javax.swing.JDialog { for (Object p : object_path) { - path += "/" + p; + path += File.separator + p; } - path = path.replaceAll("^//", "/").trim().replaceAll(" \\[[0-9,.]+ [A-Z]+\\]$", ""); + path = path.replaceAll("^/+", "/").replaceAll("^\\+", "\\").trim().replaceAll(" \\[[0-9,.]+ [A-Z]+\\]$", ""); File file = new File(path); diff --git a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java index f6448a853..2460edce6 100644 --- a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java @@ -3,6 +3,7 @@ package com.tonikelope.megabasterd; import static com.tonikelope.megabasterd.MainPanel.*; import static com.tonikelope.megabasterd.MiscTools.*; import java.awt.Dialog; +import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; @@ -439,10 +440,10 @@ public class FolderLinkDialog extends javax.swing.JDialog { for (Object p : object_path) { - path += "/" + ((Map) p).get("name"); + path += File.separator + ((Map) p).get("name"); } - path = path.replaceAll("^/+", "").trim(); + path = path.replaceAll("^/+", "").replaceAll("^\\+", "").trim(); String url = "https://mega.nz/#N!" + ((Map) node.getUserObject()).get("h") + "!" + ((Map) node.getUserObject()).get("key") + "###n=" + folder_id; diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java index 30a77814c..1747c31f8 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.13"; + public static final String VERSION = "7.14"; 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; diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java index d260256b4..489671e9a 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java @@ -271,7 +271,9 @@ public final class MainPanelView extends javax.swing.JFrame { String file_path = f.getParentFile().getAbsolutePath().replace(base_path, ""); - String[] dirs = file_path.split("/"); + LOG.log(Level.INFO, "{0} FILE_PATH -> {1}", new Object[]{Thread.currentThread().getName(), file_path}); + + String[] dirs = file_path.split("\\" + File.separator); MegaDirNode current_node = file_paths; @@ -279,6 +281,8 @@ public final class MainPanelView extends javax.swing.JFrame { for (String d : dirs) { + LOG.log(Level.INFO, "{0} DIR -> {1}", new Object[]{Thread.currentThread().getName(), d}); + if (!d.isEmpty()) { if (current_node.getChildren().get(d) != null) { diff --git a/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java index 863ad814f..d045569c2 100644 --- a/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java +++ b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java @@ -687,6 +687,11 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea setPreprocessing_transferences(true); + if (isPaused_all()) { + + _paused_all = false; + } + THREAD_POOL.execute(() -> { Thread.currentThread().setPriority(Thread.MIN_PRIORITY); diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png index 752b793b9..f1d3d4c7a 100644 Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ