-Upload manager ghost upload fix
This commit is contained in:
tonikelope 2020-12-31 18:24:10 +01:00
parent 973734881e
commit 73bbc710d7
4 changed files with 43 additions and 42 deletions

View File

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

View File

@ -60,7 +60,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
public static final String VERSION = "7.33";
public static final String VERSION = "7.34";
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;

View File

@ -754,6 +754,47 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
try {
bounded_executor.submitTask(() -> {
provision(transference);
synchronized (_transference_queue_sort_lock) {
if (getSort_wait_start_queue()) {
sortTransferenceQueue(getTransference_waitstart_aux_queue());
}
if (getTransference_waitstart_aux_queue().peek() != null && getTransference_waitstart_aux_queue().peek().isPriority()) {
ArrayList<Transference> trans_list = new ArrayList(getTransference_waitstart_queue());
trans_list.addAll(0, getTransference_waitstart_aux_queue());
getTransference_waitstart_queue().clear();
getTransference_waitstart_queue().addAll(trans_list);
} else {
getTransference_waitstart_queue().addAll(getTransference_waitstart_aux_queue());
}
getTransference_waitstart_aux_queue().clear();
getTransference_waitstart_queue().forEach((t) -> {
MiscTools.GUIRun(() -> {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
});
});
sortTransferenceQueue(getTransference_finished_queue());
getTransference_finished_queue().forEach((t) -> {
MiscTools.GUIRun(() -> {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
});
});
}
});
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, null, ex);
@ -781,46 +822,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
MiscTools.pausar(1000);
}
synchronized (_transference_queue_sort_lock) {
if (getSort_wait_start_queue()) {
sortTransferenceQueue(getTransference_waitstart_aux_queue());
}
if (getTransference_waitstart_aux_queue().peek() != null && getTransference_waitstart_aux_queue().peek().isPriority()) {
ArrayList<Transference> trans_list = new ArrayList(getTransference_waitstart_queue());
trans_list.addAll(0, getTransference_waitstart_aux_queue());
getTransference_waitstart_queue().clear();
getTransference_waitstart_queue().addAll(trans_list);
} else {
getTransference_waitstart_queue().addAll(getTransference_waitstart_aux_queue());
}
getTransference_waitstart_aux_queue().clear();
getTransference_waitstart_queue().forEach((t) -> {
MiscTools.GUIRun(() -> {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
});
});
sortTransferenceQueue(getTransference_finished_queue());
getTransference_finished_queue().forEach((t) -> {
MiscTools.GUIRun(() -> {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
});
});
}
_frozen = false;
setSort_wait_start_queue(true);
setProvisioning_transferences(false);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 180 KiB