7.46

#358
tonikelope · Oct 17, 2021 · 43518ea · 43518ea
1 parent 9057c72
commit 43518ea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>7.45</version>
+    <version>7.46</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -60,7 +60,7 @@
  */
 public final class MainPanel {
 
-    public static final String VERSION = "7.45";
+    public static final String VERSION = "7.46";
     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/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
@@ -1402,16 +1402,19 @@ public static MegaAPI checkMegaAccountLoginAndShowMasterPassDialog(MainPanel mai
 
     public static String newMegaLinks2Legacy(String data) {
 
-        data = MiscTools.addHTTPSToMegaLinks(data);
+        data = MiscTools.addBackSlashToLinks(MiscTools.addHTTPSToMegaLinks(data));
 
-        String replace1 = data.replaceAll("(?:https://)?mega(?:\\.co)?\\.nz/folder/([^#]+)#(.+)", "https://mega.nz/#F!$1!$2");
-
-        return replace1.replaceAll("(?:https://)?mega(?:\\.co)?\\.nz/file/([^#]+)#(.+)", "https://mega.nz/#!$1!$2");
+        return data.replaceAll("(?:https://)?mega(?:\\.co)?\\.nz/folder/([^#]+)#([^\r\n]+)", "https://mega.nz/#F!$1!$2").replaceAll("(?:https://)?mega(?:\\.co)?\\.nz/file/([^#]+)#([^\r\n]+)", "https://mega.nz/#!$1!$2");
     }
 
     public static String addHTTPSToMegaLinks(String data) {
 
-        return data.replaceAll("(?<!http://|https://)mega(?:\\.co)?\\.nz", "https://mega.nz");
+        return data.replaceAll("(?<!https?://)mega(?:\\.co)?\\.nz", "https://mega.nz");
+    }
+
+    public static String addBackSlashToLinks(String data) {
+
+        return data.replaceAll("https?://", "\n$0");
     }
 
     /* This method changes the MEGA extension URL to a ordinary MEGA URL,

diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png