7.50

Trying to MITIGATE:

#394

#391 (NEW CANCEL ALL DOWNLOADS MENU ITEM)

Author: tonikelope

pom.xml

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

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

@@ -100,6 +100,11 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
     private volatile boolean _finalizing;
     private final Object _progress_watchdog_lock;
     private final boolean _priority;
+    private volatile boolean global_cancel = false;
+
+    public void setGlobal_cancel(boolean global_cancel) {
+        this.global_cancel = global_cancel;
+    }
 
     public String getStatus_error() {
         return _status_error;
@@ -204,7 +209,7 @@ public boolean isPriority() {
     }
 
     public boolean isCanceled() {
-        return _canceled;
+        return (_canceled && !global_cancel);
     }
 
     public boolean isTurbo() {
@@ -911,7 +916,7 @@ public void run() {
             }
         }
 
-        if (_status_error == null && !_canceled) {
+        if ((_status_error == null && !_canceled) || global_cancel || !_auto_retry_on_error) {
 
             try {
                 deleteDownload(_url);
@@ -936,11 +941,11 @@ public void run() {
         MiscTools.GUIRun(() -> {
             getView().getClose_button().setVisible(true);
 
-            if ((_status_error != null || _canceled) && isProvision_ok()) {
+            if ((_status_error != null || _canceled) && isProvision_ok() && !global_cancel) {
 
                 getView().getRestart_button().setVisible(true);
 
-            } else {
+            } else if (!global_cancel) {
 
                 getView().getClose_button().setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png")));
             }
@@ -968,6 +973,10 @@ public void run() {
 
         _exit = true;
 
+        if (_status_error != null && !_canceled && getMain_panel().getDownload_manager().no_transferences() && getMain_panel().getUpload_manager().no_transferences() && (!getMain_panel().getDownload_manager().getTransference_finished_queue().isEmpty() || !getMain_panel().getUpload_manager().getTransference_finished_queue().isEmpty()) && getMain_panel().getView().getAuto_close_menu().isSelected()) {
+            System.exit(0);
+        }
+
         synchronized (_progress_watchdog_lock) {
             _progress_watchdog_lock.notifyAll();
         }

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

@@ -24,7 +24,7 @@ public DownloadManager(MainPanel main_panel) {
     @Override
     public void closeAllFinished() {
 
-        _transference_finished_queue.stream().filter((t) -> ((!t.isStatusError() || ((Download) t).getStatus_error().equals("FILE WITH SAME NAME AND SIZE ALREADY EXISTS")) && !t.isCanceled())).map((t) -> {
+        _transference_finished_queue.stream().filter((t) -> (!t.isCanceled())).map((t) -> {
             _transference_finished_queue.remove(t);
             return t;
         }).forEachOrdered((t) -> {

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

@@ -38,8 +38,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import static java.util.concurrent.Executors.newCachedThreadPool;
@@ -60,7 +58,7 @@
  */
 public final class MainPanel {
 
-    public static final String VERSION = "7.49";
+    public static final String VERSION = "7.50";
     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;
@@ -302,43 +300,6 @@ public MainPanel() {
 
         THREAD_POOL.execute((_clipboardspy = new ClipboardSpy()));
 
-        THREAD_POOL.execute(() -> {
-            Object timer_lock = new Object();
-
-            Timer timer = new Timer();
-
-            TimerTask task = new TimerTask() {
-
-                @Override
-                public void run() {
-                    synchronized (timer_lock) {
-
-                        timer_lock.notify();
-                    }
-                }
-            };
-
-            timer.schedule(task, 0, 5000);
-
-            while (true) {
-
-                synchronized (timer_lock) {
-
-                    try {
-
-                        if (_download_manager.no_transferences() && _upload_manager.no_transferences() && (!_download_manager.getTransference_finished_queue().isEmpty() || !_upload_manager.getTransference_finished_queue().isEmpty()) && getView().getAuto_close_menu().isSelected()) {
-                            System.exit(0);
-                        }
-
-                        timer_lock.wait();
-                    } catch (InterruptedException ex) {
-                        LOG.log(Level.SEVERE, ex.getMessage());
-                    }
-                }
-
-            }
-        });
-
         try {
             _streamserver = new KissVideoStreamServer(this);
             _streamserver.start(STREAMER_PORT, "/video");

src/main/java/com/tonikelope/megabasterd/MainPanelView.form

@@ -115,6 +115,20 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="clean_all_up_menuActionPerformed"/>
               </Events>
             </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem1">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+                  <Font name="Dialog" size="18" style="0"/>
+                </Property>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/images/icons8-minus-30.png"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="CANCEL ALL DOWNLOADS"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem1ActionPerformed"/>
+              </Events>
+            </MenuItem>
             <MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator2">
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="hide_tray_menu">