7.8

- Ghost downloads resume fix 2 (Folder Links)

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>7.7</version>
+    <version>7.8</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

src/main/java/com/tonikelope/megabasterd/Download.java

@@ -976,6 +976,7 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
         try {
             if (_file_name == null) {
 
+                //New single file links
                 file_info = getMegaFileMetadata(_url, getMain_panel().getView(), retry);
 
                 if (file_info != null) {
@@ -1001,12 +1002,26 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
 
                     } catch (SQLException ex) {
 
-                        _status_error = "Error registering download: file is already downloading.";
+                        _status_error = "Error registering download: " + ex.getMessage() + " file is already downloading?";
                     }
 
                 }
             } else {
-                _provision_ok = true;
+
+                //Resuming single file links and new/resuming folder links
+                try {
+
+                    deleteDownload(_url); //If resuming
+
+                    insertDownload(_url, _ma.getFull_email(), _download_path, _file_name, _file_key, _file_size, _file_pass, _file_noexpire, _custom_chunks_dir);
+
+                    _provision_ok = true;
+
+                } catch (SQLException ex) {
+
+                    _status_error = "Error registering download: " + ex.getMessage();
+
+                }
             }
 
         } catch (APIException ex) {
@@ -1232,14 +1247,14 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
 
                         _finalizing = true;
 
-                        swingInvokeAndWait(() -> {
+                        swingInvoke(() -> {
                             getView().getSlots_spinner().setEnabled(false);
 
                             getView().getSlots_spinner().setValue((int) getView().getSlots_spinner().getValue() - 1);
                         });
 
                     } else if (!_finalizing) {
-                        swingInvokeAndWait(() -> {
+                        swingInvoke(() -> {
                             getView().getSlots_spinner().setEnabled(true);
                         });
                     }
@@ -1251,7 +1266,7 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
 
                     getView().printStatusNormal("Download paused!");
 
-                    swingInvokeAndWait(() -> {
+                    swingInvoke(() -> {
                         getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME DOWNLOAD"));
 
                         getView().getPause_button().setEnabled(true);

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.7";
+    public static final String VERSION = "7.8";
     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;

src/main/java/com/tonikelope/megabasterd/Upload.java

@@ -1134,14 +1134,14 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
 
                     _finalizing = true;
 
-                    swingInvokeAndWait(() -> {
+                    swingInvoke(() -> {
                         getView().getSlots_spinner().setEnabled(false);
 
                         getView().getSlots_spinner().setValue((int) getView().getSlots_spinner().getValue() - 1);
                     });
 
                 } else if (!_finalizing) {
-                    swingInvokeAndWait(() -> {
+                    swingInvoke(() -> {
                         getView().getSlots_spinner().setEnabled(true);
                     });
                 }
@@ -1150,7 +1150,7 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
 
                     getView().printStatusNormal("Upload paused!");
 
-                    swingInvokeAndWait(() -> {
+                    swingInvoke(() -> {
                         getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME UPLOAD"));
                         getView().getPause_button().setEnabled(true);
                     });