Mirrors/megabasterd
1
0
Fork 0
mirror of https://github.com/tonikelope/megabasterd.git synced 2025-05-21 00:37:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

6.58

Browse Source 
-GUI bug fix and optimization
-JDK 8 rafactorization
This commit is contained in:
tonikelope 2019-10-06 12:33:53 +02:00
parent 9dc17db836
commit d4eb03f81f
24 changed files with 1772 additions and 2899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

14
src/main/java/com/tonikelope/megabasterd/AboutDialog.java
View File

@ -252,16 +252,10 @@ public class AboutDialog extends javax.swing.JDialog {
final Dialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
final String new_version = checkNewVersion(MEGABASTERD_URL);
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
if (new_version != null) {
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("MegaBasterd NEW VERSION is available! -> ") + new_version);
@ -280,11 +274,7 @@ public class AboutDialog extends javax.swing.JDialog {
check_version_button.setEnabled(true);
pack();
}
});
}
});
}//GEN-LAST:event_check_version_buttonActionPerformed

206
src/main/java/com/tonikelope/megabasterd/Download.java
View File

@ -216,15 +216,10 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
Download tthis = this;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_label().setForeground(Color.BLUE);
getView().getSlots_spinner().setEnabled(false);
}
});
synchronized (_workers_lock) {
@ -240,15 +235,10 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setValue(Transference.MAX_WORKERS);
getView().getSlots_spinner().setEnabled(true);
}
});
}
@ -505,16 +495,12 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
@Override
public void run() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getQueue_down_button().setVisible(false);
getView().getQueue_up_button().setVisible(false);
getView().getClose_button().setVisible(false);
getView().getCopy_link_button().setVisible(true);
getView().getOpen_folder_button().setVisible(true);
}
});
getView().printStatusNormal("Starting download, please wait...");
@ -541,8 +527,6 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
if (!_exit) {
_progress_bar_rate = MAX_VALUE / (double) _file_size;
String temp_filename = (getCustom_chunks_dir() != null ? getCustom_chunks_dir() : _download_path) + "/" + _file_name + ".mctemp";
_file = new File(temp_filename);
@ -603,16 +587,11 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_thread_pool.execute(c);
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{getView().getSlots_label(), getView().getSlots_spinner(), getView().getSlot_status_label()}) {
c.setVisible(true);
}
}
});
} else {
@ -623,15 +602,9 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_thread_pool.execute(c);
swingInvoke(
new Runnable() {
@Override
public void run() {
for (JComponent c : new JComponent[]{getView().getSlots_label(), getView().getSlots_spinner(), getView().getSlot_status_label()}) {
c.setVisible(false);
}
swingInvoke(() -> {
for (JComponent c1 : new JComponent[]{getView().getSlots_label(), getView().getSlots_spinner(), getView().getSlot_status_label()}) {
c1.setVisible(false);
}
});
}
@ -639,16 +612,11 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusNormal(LabelTranslatorSingleton.getInstance().translate("Downloading file from mega ") + (_ma.getFull_email() != null ? "(" + _ma.getFull_email() + ")" : "") + " ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{getView().getPause_button(), getView().getProgress_pbar()}) {
c.setVisible(true);
}
}
});
secureWait();
@ -684,16 +652,11 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_output_stream.close();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{getView().getSpeed_label(), getView().getPause_button(), getView().getStop_button(), getView().getSlots_label(), getView().getSlots_spinner(), getView().getKeep_temp_checkbox()}) {
c.setVisible(false);
}
}
});
if (_progress == _file_size) {
@ -726,15 +689,10 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusNormal("Checking file integrity, please wait...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStop_button().setVisible(true);
getView().getStop_button().setText(LabelTranslatorSingleton.getInstance().translate("CANCEL CHECK"));
}
});
getMain_panel().getDownload_manager().getTransference_running_list().remove(this);
@ -757,13 +715,8 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStop_button().setVisible(false);
}
});
} else {
@ -878,24 +831,15 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getMain_panel().getDownload_manager().getTransference_finished_queue().add(this);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getMain_panel().getDownload_manager().getScroll_panel().remove(getView());
getMain_panel().getDownload_manager().getScroll_panel().add(getView());
}
});
getMain_panel().getDownload_manager().secureNotify();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getClose_button().setVisible(true);
if (_status_error != null || _canceled) {
@ -906,7 +850,6 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().getClose_button().setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png")));
}
}
});
LOG.log(Level.INFO, "{0}{1} Downloader: bye bye", new Object[]{Thread.currentThread().getName(), _file_name});
@ -916,14 +859,9 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusNormal("Provisioning download, please wait...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getCopy_link_button().setVisible(true);
getView().getOpen_folder_button().setVisible(true);
}
});
String[] file_info;
@ -996,11 +934,7 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_status_error = "PROVISION FAILED";
if (_file_name != null) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getFile_name_label().setVisible(true);
getView().getFile_name_label().setText(truncateText(_download_path + "/" + _file_name, 100));
@ -1010,7 +944,6 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().getFile_size_label().setVisible(true);
getView().getFile_size_label().setText(formatBytes(_file_size));
}
});
}
@ -1018,24 +951,17 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusError(_status_error);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getRestart_button().setVisible(true);
}
});
} else {
_progress_bar_rate = MAX_VALUE / (double) _file_size;
getView().printStatusNormal(_frozen ? "(FROZEN) Waiting to start..." : "Waiting to start...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getFile_name_label().setVisible(true);
getView().getFile_name_label().setText(truncateText(_download_path + "/" + _file_name, 100));
@ -1045,19 +971,13 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().getFile_size_label().setVisible(true);
getView().getFile_size_label().setText(formatBytes(_file_size));
}
});
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getClose_button().setVisible(true);
getView().getQueue_up_button().setVisible(true);
getView().getQueue_down_button().setVisible(true);
}
});
}
@ -1070,14 +990,9 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusNormal("Download paused!");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME DOWNLOAD"));
getView().getPause_button().setEnabled(true);
}
});
}
@ -1088,14 +1003,9 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusNormal("Download paused!");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME DOWNLOAD"));
getView().getPause_button().setEnabled(true);
}
});
}
@ -1186,13 +1096,8 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
if (!_chunkworkers.isEmpty()) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setEnabled(false);
}
});
int i = _chunkworkers.size() - 1;
@ -1233,28 +1138,18 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
if (_use_slots) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setEnabled(false);
getView().getSlots_spinner().setValue((int) getView().getSlots_spinner().getValue() - 1);
}
});
}
} else if (!_finishing_download && _use_slots) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setEnabled(true);
}
});
}
@ -1263,15 +1158,10 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
getView().printStatusNormal("Download paused!");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME DOWNLOAD"));
getView().getPause_button().setEnabled(true);
}
});
}
@ -1466,17 +1356,12 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_retrying_request = true;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getMain_panel().getView().getNew_download_menu().setEnabled(true);
getView().getStop_button().setVisible(true);
getView().getStop_button().setText(LabelTranslatorSingleton.getInstance().translate("CANCEL RETRY"));
}
});
for (long i = getWaitTimeExpBackOff(retry++); i > 0 && !_exit; i--) {
@ -1504,14 +1389,9 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
if (!_exit && !error) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStop_button().setText(LabelTranslatorSingleton.getInstance().translate("CANCEL DOWNLOAD"));
getView().getStop_button().setVisible(false);
}
});
}
@ -1553,15 +1433,10 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_retrying_request = true;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStop_button().setVisible(true);
getView().getStop_button().setText(LabelTranslatorSingleton.getInstance().translate("CANCEL RETRY"));
}
});
for (long i = getWaitTimeExpBackOff(retry++); i > 0 && !_exit; i--) {
@ -1583,14 +1458,9 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
if (!error) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStop_button().setText(LabelTranslatorSingleton.getInstance().translate("CANCEL DOWNLOAD"));
getView().getStop_button().setVisible(false);
}
});
}
@ -1660,19 +1530,15 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
_progress = progress;
swingInvoke(
new Runnable() {
@Override
public void run() {
getMain_panel().getUpload_manager().increment_total_progress(_progress - old_progress);
int old_percent_progress = (int) Math.floor(((double) old_progress / _file_size) * 100);
int new_percent_progress = (int) Math.floor(((double) progress / _file_size) * 100);
if (new_percent_progress > old_percent_progress) {
getView().updateProgressBar(_progress, _progress_bar_rate);
}
});
if (!isChecking_cbc()) {
getMain_panel().getDownload_manager().increment_total_progress(_progress - old_progress);
}
}
}

31
src/main/java/com/tonikelope/megabasterd/DownloadManager.java
View File

@ -31,12 +31,8 @@ public class DownloadManager extends TransferenceManager {
for (final Transference d : downloads) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove(((Download) d).getView());
}
});
getTransference_waitstart_queue().remove(d);
@ -70,12 +66,8 @@ public class DownloadManager extends TransferenceManager {
@Override
public void provision(final Transference download) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().add(((Download) download).getView());
}
});
try {
@ -88,10 +80,7 @@ public class DownloadManager extends TransferenceManager {
LOG.log(Level.INFO, "{0} Provision failed! Retrying in separated thread...", Thread.currentThread().getName());
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
try {
_provision((Download) download, true);
@ -102,8 +91,6 @@ public class DownloadManager extends TransferenceManager {
}
secureNotify();
}
});
}
@ -132,23 +119,15 @@ public class DownloadManager extends TransferenceManager {
getTransference_waitstart_queue().addAll(aux);
getTransference_waitstart_queue().forEach((t1) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
}
});
});
getTransference_finished_queue().forEach((t2) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t2.getView());
getScroll_panel().add((Component) t2.getView());
}
});
});

136
src/main/java/com/tonikelope/megabasterd/DownloadView.java
View File

@ -123,11 +123,7 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
public void hideAllExceptStatus() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{speed_label, slots_spinner, slots_label, slot_status_label, slot_status_label, pause_button, stop_button, progress_pbar, keep_temp_checkbox}) {
c.setVisible(false);
@ -137,7 +133,6 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
c.setVisible(true);
}
}
});
}
@ -381,16 +376,10 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
private void slots_spinnerStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_slots_spinnerStateChanged
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
if (_download.isUse_slots()) {
_download.checkSlotsAndWorkers();
}
}
});
}//GEN-LAST:event_slots_spinnerStateChanged
@ -439,23 +428,11 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
queue_up_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_download.upWaitQueue();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
queue_up_button.setEnabled(true);
}
});
}
});
}//GEN-LAST:event_queue_up_buttonActionPerformed
@ -464,23 +441,11 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
queue_down_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_download.downWaitQueue();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
queue_down_button.setEnabled(true);
}
});
}
});
}//GEN-LAST:event_queue_down_buttonActionPerformed
@ -489,11 +454,7 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
printStatusNormal("Pausing download ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{pause_button, speed_label, slots_label, slots_spinner, progress_pbar, file_name_label, file_size_label}) {
c.setEnabled(false);
@ -503,7 +464,6 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
c.setVisible(true);
}
}
});
}
@ -512,11 +472,7 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
printStatusNormal("Downloading file from mega ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{pause_button, speed_label, slots_label, slots_spinner, progress_pbar, file_name_label, file_size_label}) {
c.setEnabled(true);
@ -529,7 +485,6 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
pause_button.setText(LabelTranslatorSingleton.getInstance().translate("PAUSE DOWNLOAD"));
_download.getMain_panel().getView().getPause_all_down_button().setVisible(true);
}
});
}
@ -539,17 +494,11 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
printStatusNormal(status);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{pause_button, keep_temp_checkbox, stop_button, speed_label, slots_label, slots_spinner, progress_pbar, file_name_label, file_size_label}) {
c.setEnabled(false);
}
}
});
}
@ -557,11 +506,7 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
@Override
public void updateSpeed(final String speed, final Boolean visible) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
if (speed != null) {
speed_label.setText(speed);
}
@ -569,74 +514,48 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
if (visible != null) {
speed_label.setVisible(visible);
}
}
});
}
@Override
public void updateProgressBar(final long progress, final double bar_rate) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
progress_pbar.setValue((int) Math.floor(bar_rate * progress));
}
});
}
@Override
public void updateProgressBar(final int value) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
progress_pbar.setValue(value);
}
});
}
@Override
public void printStatusError(final String message) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setForeground(Color.red);
status_label.setText(LabelTranslatorSingleton.getInstance().translate(message));
}
});
}
@Override
public void printStatusOK(final String message) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setForeground(new Color(0, 170, 0));
status_label.setText(LabelTranslatorSingleton.getInstance().translate(message));
}
});
}
@Override
public void printStatusNormal(final String message) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setForeground(new Color(102, 102, 102));
status_label.setText(LabelTranslatorSingleton.getInstance().translate(message));
}
});
}
@ -658,40 +577,21 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
final String status = (conta_exit > 0 ? "Tot removing: " + conta_exit : "") + (conta_error > 0 ? ((conta_exit > 0 ? " / " : "") + "Tot error: " + conta_error) : "");
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
slot_status_label.setForeground(status_color);
slot_status_label.setText(LabelTranslatorSingleton.getInstance().translate(status));
}
});
}
}
@Override
public int getSlots() {
return (int) swingInvokeAndWaitForReturn(new Callable() {
@Override
public Object call() throws Exception {
return getSlots_spinner().getValue();
}
});
return (int) swingInvokeAndWaitForReturn((Callable) getSlots_spinner()::getValue);
}
public boolean isKeepTempFileSelected() {
return (boolean) swingInvokeAndWaitForReturn(new Callable() {
@Override
public Object call() throws Exception {
return getKeep_temp_checkbox().isSelected();
}
});
return (boolean) swingInvokeAndWaitForReturn((Callable) getKeep_temp_checkbox()::isSelected);
}
// Variables declaration - do not modify//GEN-BEGIN:variables

5
src/main/java/com/tonikelope/megabasterd/FileDropHandler.java
View File

@ -69,11 +69,8 @@ class FileDropHandler extends TransferHandler {
return false;
}
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_notifiable.file_drop_notify(files);
}
});
return true;

151
src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
View File

@ -99,21 +99,13 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
pack();
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
if (_drag_drop_files != null) {
file_drop_notify(_drag_drop_files);
}
if (_main_panel.getMega_accounts().size() > 0) {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
if (!_main_panel.getMega_active_accounts().isEmpty()) {
_inserting_mega_accounts = true;
@ -140,24 +132,14 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
}
pack();
}
});
} else {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
used_space_label.setForeground(Color.red);
used_space_label.setEnabled(true);
used_space_label.setText(LabelTranslatorSingleton.getInstance().translate("No MEGA accounts available (Go to Settings > Accounts)"));
}
});
}
}
});
}
@ -455,15 +437,9 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
file_tree.setModel(tree_model);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_genFileList();
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
add_files_button.setEnabled(true);
add_folder_button.setEnabled(true);
@ -480,11 +456,7 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
skip_button.setEnabled(root_childs);
skip_rest_button.setEnabled(root_childs);
upload_log_checkbox.setEnabled(root_childs);
}
});
}
});
} else {
@ -539,13 +511,8 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
if (filechooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION && filechooser.getSelectedFile().canRead()) {
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
swingInvoke(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
swingInvoke(() -> {
total_file_size_label.setText("[0 B]");
_base_path = filechooser.getSelectedFile().getAbsolutePath();
@ -555,29 +522,15 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
dir_name_textfield.setEnabled(true);
dir_name_label.setEnabled(true);
}
});
DefaultMutableTreeNode root = new DefaultMutableTreeNode(filechooser.getSelectedFile().getAbsolutePath());
_genFileTree(filechooser.getSelectedFile().getAbsolutePath(), root, null);
DefaultTreeModel tree_model = new DefaultTreeModel(sortTree(root));
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
file_tree.setModel(tree_model);
}
});
_genFileList();
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
add_files_button.setEnabled(true);
add_folder_button.setEnabled(true);
@ -594,11 +547,7 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
skip_button.setEnabled(root_childs);
skip_rest_button.setEnabled(root_childs);
upload_log_checkbox.setEnabled(root_childs);
}
});
}
});
} else {
@ -664,24 +613,15 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
warning_label.setEnabled(false);
file_tree.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
MegaAPI ma = null;
try {
_quota_ok = false;
ma = checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, email);
Long[] quota = ma.getQuota();
if (isDisplayable()) {
if (quota != null) {
final Color used_space_color;
if (quota[0] <= Math.round((double) quota[1] / 2)) {
used_space_color = new Color(0, 170, 0);
@ -694,14 +634,9 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
used_space_color = Color.red;
}
final String quota_m = LabelTranslatorSingleton.getInstance().translate("Quota used: ") + formatBytes(quota[0]) + "/" + formatBytes(quota[1]);
_quota_ok = true;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
boolean root_childs = ((TreeNode) file_tree.getModel().getRoot()).getChildCount() > 0;
used_space_label.setText(quota_m);
@ -717,15 +652,9 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
c.setEnabled(root_childs);
}
}
});
} else {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
account_combobox.setEnabled(true);
account_label.setEnabled(true);
account_combobox.setSelectedIndex(-1);
@ -744,18 +673,11 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
upload_log_checkbox.setEnabled(false);
dir_name_textfield.setEnabled(false);
dir_name_label.setEnabled(false);
}
});
}
}
} catch (Exception ex) {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
account_combobox.setEnabled(true);
account_label.setEnabled(true);
account_combobox.setSelectedIndex(-1);
@ -774,11 +696,7 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
upload_log_checkbox.setEnabled(false);
dir_name_textfield.setEnabled(false);
dir_name_label.setEnabled(false);
}
});
}
}
});
@ -866,12 +784,7 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
_total_space = 0L;
DefaultTreeModel tree_model = (DefaultTreeModel) swingInvokeAndWaitForReturn(new Callable() {
@Override
public Object call() {
return file_tree.getModel();
}
});
DefaultTreeModel tree_model = (DefaultTreeModel) swingInvokeAndWaitForReturn((Callable) file_tree::getModel);
DefaultMutableTreeNode root = (DefaultMutableTreeNode) tree_model.getRoot();
@ -905,11 +818,8 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
}
}
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
total_file_size_label.setText("[" + formatBytes(_total_space) + "]");
}
});
}
@ -938,9 +848,7 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
@Override
public void file_drop_notify(List<File> files) {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
add_files_button.setEnabled(false);
add_folder_button.setEnabled(false);
warning_label.setEnabled(false);
@ -951,52 +859,35 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
dir_name_label.setEnabled(false);
upload_log_checkbox.setEnabled(false);
total_file_size_label.setText("[0 B]");
}
});
_base_path = (files.size() == 1 && files.get(0).isDirectory()) ? files.get(0).getAbsolutePath() : files.get(0).getParentFile().getAbsolutePath();
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
dir_name_textfield.setText(((files.size() == 1 && files.get(0).isDirectory()) ? files.get(0).getName() : files.get(0).getParentFile().getName()) + "_" + genID(10));
dir_name_textfield.setEnabled(true);
dir_name_label.setEnabled(true);
}
});
DefaultMutableTreeNode root = new DefaultMutableTreeNode(_base_path);
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
dance_button.setText(LabelTranslatorSingleton.getInstance().translate("Loading files, please wait..."));
}
});
_genFileTree(_base_path, root, files.toArray(new File[files.size()]));
DefaultTreeModel tree_model = new DefaultTreeModel(sortTree(root));
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
file_tree.setModel(tree_model);
}
});
_genFileList();
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
dance_button.setText(LabelTranslatorSingleton.getInstance().translate("Let's dance baby"));
if (_last_selected_index != -1 && _quota_ok) {
@ -1013,8 +904,6 @@ public class FileGrabberDialog extends javax.swing.JDialog implements FileDropHa
dir_name_label.setEnabled(true);
upload_log_checkbox.setEnabled(true);
}
}
});
}
}

31
src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java
View File

@ -82,13 +82,8 @@ public class FileMergerDialog extends javax.swing.JDialog {
_progress += rfile.length();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
jProgressBar2.setValue((int) Math.floor((MAX_VALUE / (double) _file_size) * _progress));
}
});
}
}
@ -358,20 +353,13 @@ public class FileMergerDialog extends javax.swing.JDialog {
Dialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
try {
if (_mergeFile()) {
if (delete_parts_checkbox.isSelected()) {
_deleteParts();
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("File successfully merged!"));
if (Desktop.isDesktopSupported()) {
@ -385,17 +373,10 @@ public class FileMergerDialog extends javax.swing.JDialog {
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(false);
}
});
} else {
_file_parts.clear();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
file_name_label.setText("");
file_size_label.setText("");
@ -429,15 +410,11 @@ public class FileMergerDialog extends javax.swing.JDialog {
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
pack();
}
});
}
} catch (IOException ex) {
Logger.getLogger(FileMergerDialog.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
});
}

32
src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java
View File

@ -113,13 +113,8 @@ public class FileSplitterDialog extends javax.swing.JDialog {
_progress += byteSize;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
jProgressBar2.setValue((int) Math.floor((MAX_VALUE / (double) _file.length()) * _progress));
}
});
}
@ -358,17 +353,10 @@ public class FileSplitterDialog extends javax.swing.JDialog {
Dialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
try {
if (_splitFile()) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("File successfully splitted!"));
if (Desktop.isDesktopSupported()) {
@ -382,20 +370,11 @@ public class FileSplitterDialog extends javax.swing.JDialog {
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(false);
}
});
} else {
_file = null;
_output_dir = null;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
file_name_label.setText("");
output_folder_label.setText("");
@ -425,14 +404,11 @@ public class FileSplitterDialog extends javax.swing.JDialog {
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
pack();
}
});
}
} catch (IOException ex) {
Logger.getLogger(FileSplitterDialog.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
});
}

56
src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java
View File

@ -75,11 +75,7 @@ public class FolderLinkDialog extends javax.swing.JDialog {
final Dialog tthis = this;
THREAD_POOL.execute(
new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_loadMegaDirTree();
if (!_mega_error) {
@ -95,7 +91,6 @@ public class FolderLinkDialog extends javax.swing.JDialog {
setVisible(false);
}
}
});
pack();
@ -302,20 +297,10 @@ public class FolderLinkDialog extends javax.swing.JDialog {
dance_button.setEnabled(false);
THREAD_POOL.execute(
new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_loadMegaDirTree();
_genDownloadLiks();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
restore_button.setVisible(false);
restore_button.setText(LabelTranslatorSingleton.getInstance().translate("Restore folder data"));
boolean root_childs = ((TreeNode) file_tree.getModel().getRoot()).getChildCount() > 0;
@ -324,25 +309,16 @@ public class FolderLinkDialog extends javax.swing.JDialog {
c.setEnabled(root_childs);
}
}
});
}
}
);
});
}//GEN-LAST:event_restore_buttonActionPerformed
private void _loadMegaDirTree() {
try {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
}
});
HashMap<String, Object> folder_nodes;
@ -415,18 +391,12 @@ public class FolderLinkDialog extends javax.swing.JDialog {
final MegaMutableTreeNode roott = root;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
ftree.setModel(new DefaultTreeModel(sortTree(roott)));
ftree.setRootVisible(roott != null ? roott.getChildCount() > 0 : false);
ftree.setEnabled(true);
}
});
} catch (Exception ex) {
@ -436,23 +406,15 @@ public class FolderLinkDialog extends javax.swing.JDialog {
_mega_error = true;
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
}
});
}
private void _genDownloadLiks() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
String folder_id = findFirstRegex("#F!([^!]+)", _link, 1);
@ -508,8 +470,6 @@ public class FolderLinkDialog extends javax.swing.JDialog {
}
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
}
});
}

16
src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
View File

@ -204,19 +204,11 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog {
final Dialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
try {
byte[] pass = CryptTools.PBKDF2HMACSHA256(new String(current_pass_textfield.getPassword()), BASE642Bin(_salt), CryptTools.MASTER_PASSWORD_PBKDF2_ITERATIONS, CryptTools.MASTER_PASSWORD_PBKDF2_OUTPUT_BIT_LENGTH);
String pass_hash = Bin2BASE64(HashBin("SHA-1", pass));
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
if (!pass_hash.equals(_current_pass_hash)) {
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("BAD PASSWORD!"), "Error", JOptionPane.ERROR_MESSAGE);
@ -239,14 +231,10 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog {
tthis.setVisible(false);
}
}
});
} catch (HeadlessException | NoSuchAlgorithmException | InvalidKeySpecException ex) {
LOG.log(Level.SEVERE, ex.getMessage());
}
}
});
}//GEN-LAST:event_ok_buttonActionPerformed

71
src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java
View File

@ -79,14 +79,8 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
if (_main_panel.isUse_mega_account_down() && _main_panel.getMega_accounts().size() > 0) {
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
swingInvoke(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
swingInvoke(() -> {
String mega_default_down = _main_panel.getMega_account_down();
use_mega_account_down_combobox.addItem(mega_default_down);
@ -97,10 +91,7 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
use_mega_account_down_combobox.addItem("");
use_mega_account_down_combobox.setSelectedIndex(0);
}
});
}
});
} else {
@ -312,25 +303,16 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
final File file = filechooser.getSelectedFile();
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
try (InputStream is = new BufferedInputStream(new FileInputStream(file)); ByteArrayOutputStream out = new ByteArrayOutputStream()) {
THREAD_POOL.execute(() -> {
try (final InputStream is = new BufferedInputStream(new FileInputStream(file)); final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
int reads;
while ((reads = is.read(buffer)) != -1) {
out.write(buffer, 0, reads);
}
String dlc = new String(out.toByteArray(), "UTF-8");
Set<String> links = CryptTools.decryptDLC(dlc, ((MainPanelView) getParent()).getMain_panel());
for (Iterator<String> i = links.iterator(); i.hasNext();) {
String link = i.next();
@ -340,12 +322,8 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
i.remove();
}
}
if (!links.isEmpty()) {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
links_textarea.setText("");
for (Iterator<String> i = links.iterator(); i.hasNext();) {
@ -357,20 +335,14 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
links_textarea.append("\r\n");
}
}
}
});
}
} catch (FileNotFoundException ex) {
LOG.log(Level.SEVERE, ex.getMessage());
} catch (IOException ex) {
LOG.log(Level.SEVERE, ex.getMessage());
}
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
dlc_button.setText(LabelTranslatorSingleton.getInstance().translate("Load DLC container"));
dlc_button.setEnabled(true);
@ -380,10 +352,7 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
dance_button.setEnabled(true);
pack();
}
});
}
});
} else {
@ -418,12 +387,8 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
final LinkGrabberDialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
boolean use_account = true;
try {
if (checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item) == null) {
@ -434,20 +399,12 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
use_account = false;
}
if (!use_account) {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
use_mega_account_down_combobox.setSelectedIndex(_main_panel.getMega_accounts().size());
}
});
}
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getUse_mega_account_down_combobox().setEnabled(true);
getDance_button().setText(LabelTranslatorSingleton.getInstance().translate("Let's dance, baby"));
@ -455,11 +412,7 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
getDance_button().setEnabled(true);
pack();
}
});
}
});
}
@ -482,14 +435,10 @@ public class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardC
@Override
public void notifyClipboardChange() {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
String current_text = links_textarea.getText();
links_textarea.append((current_text.length() > 0 ? "\n\n" : "") + extractMegaLinksFromString(extractStringFromClipboardContents(_clipboardspy.getContents())));
}
});
}
private static final Logger LOG = Logger.getLogger(LinkGrabberDialog.class.getName());

236
src/main/java/com/tonikelope/megabasterd/MainPanel.java
View File

@ -53,7 +53,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
public static final String VERSION = "6.57";
public static final String VERSION = "6.58";
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;
@ -106,11 +106,8 @@ public final class MainPanel {
final MainPanel main_panel = new MainPanel();
invokeLater(new Runnable() {
@Override
public void run() {
invokeLater(() -> {
main_panel.getView().setVisible(true);
}
});
}
@ -188,7 +185,6 @@ public final class MainPanel {
private boolean _megacrypter_reverse;
private float _zoom_factor;
private volatile boolean _exit;
private volatile boolean _forcing_gc;
public MainPanel() {
@ -263,10 +259,7 @@ public final class MainPanel {
THREAD_POOL.execute((_clipboardspy = new ClipboardSpy()));
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
Object timer_lock = new Object();
Timer timer = new Timer();
@ -301,8 +294,6 @@ public final class MainPanel {
}
}
}
});
try {
@ -314,17 +305,13 @@ public final class MainPanel {
check_old_version();
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_new_version = checkNewVersion(AboutDialog.MEGABASTERD_URL);
if (_new_version != null) {
JOptionPane.showMessageDialog(getView(), LabelTranslatorSingleton.getInstance().translate("MegaBasterd NEW VERSION is available! -> ") + _new_version);
}
}
});
if (_megacrypter_reverse) {
@ -336,12 +323,8 @@ public final class MainPanel {
} else {
_mega_proxy_server = null;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().updateMCReverseStatus("MC reverse mode: OFF");
}
});
}
@ -350,65 +333,36 @@ public final class MainPanel {
MainPanel tthis = this;
THREAD_POOL.execute(
new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_proxy_manager = new SmartMegaProxyManager(null, tthis);
}
});
} else {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().updateSmartProxyStatus("SmartProxy: OFF");
}
});
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getGlobal_speed_down_label().setForeground(_limit_download_speed ? new Color(255, 0, 0) : new Color(0, 128, 255));
getView().getGlobal_speed_up_label().setForeground(_limit_upload_speed ? new Color(255, 0, 0) : new Color(0, 128, 255));
}
});
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
Runtime instance = Runtime.getRuntime();
_forcing_gc = false;
while (true) {
long used_memory = instance.totalMemory() - instance.freeMemory();
long max_memory = instance.maxMemory();
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
_view.getMemory_status().setText(MiscTools.formatBytes(used_memory) + " / " + MiscTools.formatBytes(max_memory));
}
});
try {
Thread.sleep(2000);
} catch (InterruptedException ex) {
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
}
});
resumeDownloads();
@ -1018,34 +972,19 @@ public final class MainPanel {
if (!_download_manager.getTransference_running_list().isEmpty() || !_upload_manager.getTransference_running_list().isEmpty()) {
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
boolean wait;
do {
wait = false;
if (!_download_manager.getTransference_running_list().isEmpty()) {
for (Transference trans : _download_manager.getTransference_running_list()) {
Download download = (Download) trans;
if (download.isPaused()) {
download.pause();
}
if (!download.getChunkworkers().isEmpty()) {
wait = true;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
download.getView().printStatusNormal("Stopping download safely before exit MegaBasterd, please wait...");
download.getView().getSlots_spinner().setEnabled(false);
download.getView().getPause_button().setEnabled(false);
@ -1056,35 +995,20 @@ public final class MainPanel {
download.getView().getSpeed_label().setEnabled(false);
download.getView().getSlots_label().setEnabled(false);
download.getView().getProgress_pbar().setEnabled(false);
}
});
}
}
}
if (!_upload_manager.getTransference_running_list().isEmpty()) {
for (Transference trans : _upload_manager.getTransference_running_list()) {
Upload upload = (Upload) trans;
upload.getMac_generator().secureNotify();
if (upload.isPaused()) {
upload.pause();
}
if (!upload.getChunkworkers().isEmpty()) {
wait = true;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
upload.getView().printStatusNormal("Stopping upload safely before exit MegaBasterd, please wait...");
upload.getView().getSlots_spinner().setEnabled(false);
upload.getView().getPause_button().setEnabled(false);
@ -1095,8 +1019,6 @@ public final class MainPanel {
upload.getView().getSpeed_label().setEnabled(false);
upload.getView().getSlots_label().setEnabled(false);
upload.getView().getProgress_pbar().setEnabled(false);
}
});
} else {
try {
@ -1105,10 +1027,8 @@ public final class MainPanel {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
}
}
if (wait) {
try {
@ -1117,11 +1037,8 @@ public final class MainPanel {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
} while (wait);
byebyenow(restart);
}
});
WarningExitMessage exit_message = new WarningExitMessage(getView(), true, this, restart);
@ -1153,34 +1070,20 @@ public final class MainPanel {
final ServerSocket serverSocket = new ServerSocket(WATCHDOG_PORT, 0, InetAddress.getLoopbackAddress());
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
final ServerSocket socket = serverSocket;
while (true) {
try {
socket.accept();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().setExtendedState(NORMAL);
getView().setVisible(true);
}
});
} catch (Exception ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
} catch (Exception ex1) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex1.getMessage());
}
}
}
});
} catch (Exception ex2) {
@ -1195,23 +1098,14 @@ public final class MainPanel {
private void resumeDownloads() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStatus_down_label().setText(LabelTranslatorSingleton.getInstance().translate("Checking if there are previous downloads, please wait..."));
}
});
final MainPanel tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
int conta_downloads = 0;
try {
ArrayList<HashMap<String, Object>> res = selectDownloads();
@ -1242,30 +1136,15 @@ public final class MainPanel {
Logger.getLogger(MainPanel.class.getName()).log(SEVERE, null, ex);
}
if (conta_downloads > 0) {
getDownload_manager().secureNotify();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getjTabbedPane1().setSelectedIndex(0);
}
});
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStatus_down_label().setText("");
}
});
}
});
}
@ -1282,16 +1161,8 @@ public final class MainPanel {
MenuItem messageItem = new MenuItem(LabelTranslatorSingleton.getInstance().translate("Restore window"));
messageItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
swingInvoke(
new Runnable() {
@Override
public void run() {
messageItem.addActionListener((ActionEvent e) -> {
swingInvoke(() -> {
getView().setExtendedState(NORMAL);
getView().setVisible(true);
@ -1299,21 +1170,14 @@ public final class MainPanel {
getView().revalidate();
getView().repaint();
}
});
}
});
menu.add(messageItem);
MenuItem closeItem = new MenuItem(LabelTranslatorSingleton.getInstance().translate("EXIT"));
closeItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
closeItem.addActionListener((ActionEvent e) -> {
if (!getView().isVisible()) {
getView().setExtendedState(NORMAL);
@ -1324,23 +1188,12 @@ public final class MainPanel {
}
byebye(false);
}
});
menu.add(closeItem);
ActionListener actionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
swingInvoke(
new Runnable() {
@Override
public void run() {
ActionListener actionListener = (ActionEvent e) -> {
swingInvoke(() -> {
if (!getView().isVisible()) {
getView().setExtendedState(NORMAL);
getView().setVisible(true);
@ -1351,10 +1204,7 @@ public final class MainPanel {
getView().dispatchEvent(new WindowEvent(getView(), WINDOW_CLOSING));
}
}
});
}
};
_trayicon = new TrayIcon(getDefaultToolkit().getImage(getClass().getResource(ICON_FILE)), "MegaBasterd", menu);
@ -1373,26 +1223,16 @@ public final class MainPanel {
private void resumeUploads() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStatus_up_label().setText(LabelTranslatorSingleton.getInstance().translate("Checking if there are previous uploads, please wait..."));
}
});
final MainPanel tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
try {
int conta_uploads = 0;
ArrayList<HashMap<String, Object>> res = selectUploads();
for (HashMap<String, Object> o : res) {
try {
@ -1421,34 +1261,18 @@ public final class MainPanel {
Logger.getLogger(MainPanel.class.getName()).log(SEVERE, null, ex);
}
}
if (conta_uploads > 0) {
getUpload_manager().secureNotify();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getjTabbedPane1().setSelectedIndex(1);
}
});
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getStatus_up_label().setText("");
}
});
} catch (SQLException ex) {
Logger.getLogger(MainPanel.class.getName()).log(SEVERE, null, ex);
}
}
});
}

65
src/main/java/com/tonikelope/megabasterd/MainPanelView.java
View File

@ -150,16 +150,11 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
if (!old_status.equals(status + " ")) {
Dimension frame_size = this.getSize();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getKiss_server_status().setText(status + " ");
pack();
setSize(frame_size);
}
});
}
@ -172,16 +167,11 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
if (!old_status.equals(status + " ")) {
Dimension frame_size = this.getSize();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getSmart_proxy_status().setText(status + " ");
pack();
setSize(frame_size);
}
});
}
@ -194,16 +184,11 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
if (!old_status.equals(status + " ")) {
Dimension frame_size = this.getSize();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getMc_reverse_status().setText(status + " ");
pack();
setSize(frame_size);
}
});
}
@ -231,9 +216,9 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
jTabbedPane1.setSelectedIndex(1);
Runnable run = new Runnable() {
@Override
public void run() {
Runnable run = () -> {
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
MegaAPI ma = getMain_panel().getMega_active_accounts().get(mega_account);
@ -331,8 +316,6 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
LOG.log(SEVERE, null, ex);
}
}
};
getMain_panel().getUpload_manager().getTransference_preprocess_queue().add(run);
@ -358,10 +341,7 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
final MainPanelView tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
int n;
if (files.size() > 1) {
@ -398,9 +378,6 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
_new_upload_dialog(dialog);
}
}
});
}
@ -898,9 +875,9 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
final MainPanelView tthis = this;
Runnable run = new Runnable() {
@Override
public void run() {
Runnable run = () -> {
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
Set<String> urls = new HashSet(findAllRegex("(?:https?|mega)://[^/\r\n]+/(#[^\r\n!]*?)?![^\r\n!]+![^\r\n]+", dialog.getLinks_textarea().getText(), 0));
@ -1034,8 +1011,6 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
}
}
}
};
getMain_panel().getDownload_manager().getTransference_preprocess_queue().add(run);
@ -1315,25 +1290,9 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
unfreeze_transferences_button.setVisible(false);
THREAD_POOL.execute(new Runnable() {
THREAD_POOL.execute(_main_panel.getDownload_manager()::unfreezeTransferenceWaitStartQueue);
@Override
public void run() {
_main_panel.getDownload_manager().unfreezeTransferenceWaitStartQueue();
}
});
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_main_panel.getUpload_manager().unfreezeTransferenceWaitStartQueue();
}
});
THREAD_POOL.execute(_main_panel.getUpload_manager()::unfreezeTransferenceWaitStartQueue);
}//GEN-LAST:event_unfreeze_transferences_buttonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables

7
src/main/java/com/tonikelope/megabasterd/MiscTools.java
View File

@ -87,11 +87,7 @@ public class MiscTools {
public static final int EXP_BACKOFF_MAX_WAIT_TIME = 8;
public static final Object PASS_LOCK = new Object();
public static final int HTTP_TIMEOUT = 30;
private static final Comparator<DefaultMutableTreeNode> TREE_NODE_COMPARATOR = new Comparator< DefaultMutableTreeNode>() {
@Override
public int compare(DefaultMutableTreeNode a, DefaultMutableTreeNode b) {
private static final Comparator<DefaultMutableTreeNode> TREE_NODE_COMPARATOR = (DefaultMutableTreeNode a, DefaultMutableTreeNode b) -> {
if (a.isLeaf() && !b.isLeaf()) {
return 1;
} else if (!a.isLeaf() && b.isLeaf()) {
@ -101,7 +97,6 @@ public class MiscTools {
String sb = b.getUserObject().toString();
return sa.compareToIgnoreCase(sb);
}
}
};
private static final Logger LOG = Logger.getLogger(MiscTools.class.getName());

35
src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
View File

@ -216,47 +216,24 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog {
final Dialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
try {
if (Arrays.equals(new_pass_textfield.getPassword(), confirm_pass_textfield.getPassword())) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setText(LabelTranslatorSingleton.getInstance().translate("Processing your password, please wait..."));
}
});
if (new_pass_textfield.getPassword().length > 0) {
_new_pass = CryptTools.PBKDF2HMACSHA256(new String(new_pass_textfield.getPassword()), BASE642Bin(_salt), CryptTools.MASTER_PASSWORD_PBKDF2_ITERATIONS, CryptTools.MASTER_PASSWORD_PBKDF2_OUTPUT_BIT_LENGTH);
_new_pass_hash = Bin2BASE64(HashBin("SHA-1", _new_pass));
}
_pass_ok = true;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
tthis.setVisible(false);
}
});
} else {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("Passwords does not match!"), "Error", JOptionPane.ERROR_MESSAGE);
status_label.setText("");
@ -266,15 +243,11 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog {
confirm_pass_textfield.setText("");
new_pass_textfield.grabFocus();
}
});
}
} catch (Exception ex) {
LOG.log(Level.SEVERE, ex.getMessage());
}
}
});
}//GEN-LAST:event_ok_buttonActionPerformed

42
src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
View File

@ -1823,14 +1823,9 @@ public class SettingsDialog extends javax.swing.JDialog {
final Dialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
ArrayList<String> email_error = new ArrayList<>();
ArrayList<String> new_valid_mega_accounts = new ArrayList<>();
for (int i = 0; i < model_row_count; i++) {
String email = (String) model.getValueAt(i, 0);
@ -2001,19 +1996,11 @@ public class SettingsDialog extends javax.swing.JDialog {
}
}
}
if (email_error.size() > 0) {
String email_error_s = "";
email_error_s = email_error.stream().map((s) -> s + "\n").reduce(email_error_s, String::concat);
final String final_email_error = email_error_s;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status.setText("");
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("There were errors with some accounts (email and/or password are/is wrong). Please, check them:\n\n") + final_email_error, "Mega Account Check Error", JOptionPane.ERROR_MESSAGE);
@ -2039,28 +2026,19 @@ public class SettingsDialog extends javax.swing.JDialog {
encrypt_pass_checkbox.setEnabled(true);
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
}
});
} else {
_main_panel.getMega_accounts().entrySet().stream().map((entry) -> entry.getKey()).filter((email) -> (!new_valid_mega_accounts.contains(email))).forEachOrdered((email) -> {
_deleted_mega_accounts.add(email);
});
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status.setText("");
JOptionPane.showMessageDialog(tthis, LabelTranslatorSingleton.getInstance().translate("Settings successfully saved!"), LabelTranslatorSingleton.getInstance().translate("Settings saved"), JOptionPane.INFORMATION_MESSAGE);
_settings_ok = true;
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(false);
}
});
}
}
});
} else {
@ -2251,10 +2229,7 @@ public class SettingsDialog extends javax.swing.JDialog {
final Dialog tthis = this;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
GetMasterPasswordDialog dialog = new GetMasterPasswordDialog((Frame) getParent(), true, _main_panel.getMaster_pass_hash(), _main_panel.getMaster_pass_salt(), _main_panel);
dialog.setLocationRelativeTo(tthis);
@ -2351,8 +2326,6 @@ public class SettingsDialog extends javax.swing.JDialog {
dialog.dispose();
unlock_accounts_button.setEnabled(true);
}
});
}//GEN-LAST:event_unlock_accounts_buttonActionPerformed
@ -2433,10 +2406,7 @@ public class SettingsDialog extends javax.swing.JDialog {
final Dialog tthis = this;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
SetMasterPasswordDialog dialog = new SetMasterPasswordDialog((Frame) getParent(), true, _main_panel.getMaster_pass_salt(), _main_panel);
dialog.setLocationRelativeTo(tthis);
@ -2567,8 +2537,6 @@ public class SettingsDialog extends javax.swing.JDialog {
dialog.dispose();
encrypt_pass_checkbox.setEnabled(true);
}
});
}//GEN-LAST:event_encrypt_pass_checkboxActionPerformed

6
src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java
View File

@ -118,12 +118,8 @@ public final class SmartMegaProxyManager {
}
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
_main_panel.getView().updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(getProxyCount()) + ")");
}
});
LOG.log(Level.INFO, "{0} Smart Proxy Manager: proxy list refreshed ({1})", new Object[]{Thread.currentThread().getName(), _proxy_list.size()});

48
src/main/java/com/tonikelope/megabasterd/StreamerDialog.java
View File

@ -62,13 +62,8 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
if (_main_panel.isUse_mega_account_down() && _main_panel.getMega_accounts().size() > 0) {
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
swingInvoke(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
swingInvoke(() -> {
String mega_default_down = _main_panel.getMega_account_down();
use_mega_account_down_combobox.addItem(mega_default_down);
@ -78,10 +73,7 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
});
use_mega_account_down_combobox.addItem("");
use_mega_account_down_combobox.setSelectedIndex(0);
}
});
}
});
} else {
@ -187,10 +179,7 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
final Dialog tthis = this;
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
try {
boolean error = false;
@ -264,8 +253,6 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
} catch (UnsupportedEncodingException ex) {
LOG.log(Level.SEVERE, ex.getMessage());
}
}
});
}//GEN-LAST:event_dance_buttonActionPerformed
@ -286,12 +273,8 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
final StreamerDialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
boolean use_account = true;
try {
if (checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item) == null) {
@ -302,20 +285,12 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
use_account = false;
}
if (!use_account) {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
use_mega_account_down_combobox.setSelectedIndex(_main_panel.getMega_accounts().size());
}
});
}
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getUse_mega_account_down_combobox().setEnabled(true);
getDance_button().setText(LabelTranslatorSingleton.getInstance().translate("Let's dance, baby"));
@ -323,11 +298,7 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
getDance_button().setEnabled(true);
pack();
}
});
}
});
}
@ -337,18 +308,13 @@ public class StreamerDialog extends javax.swing.JDialog implements ClipboardChan
@Override
public void notifyClipboardChange() {
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
String link = extractFirstMegaLinkFromString(extractStringFromClipboardContents(_clipboardspy.getContents()));
if (!link.contains("/#F!")) {
original_link_textfield.setText(link);
}
}
});
}

98
src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
View File

@ -6,7 +6,6 @@ import java.awt.Component;
import java.awt.TrayIcon;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Level;
import static java.util.logging.Level.SEVERE;
@ -312,23 +311,15 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
getTransference_waitstart_queue().addAll(wait_array);
getTransference_waitstart_queue().forEach((t1) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
}
});
});
getTransference_finished_queue().forEach((t1) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
}
});
});
@ -365,23 +356,15 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
getTransference_waitstart_queue().addAll(wait_array);
getTransference_waitstart_queue().forEach((t1) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
}
});
});
getTransference_finished_queue().forEach((t2) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t2.getView());
getScroll_panel().add((Component) t2.getView());
}
});
});
@ -415,14 +398,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
ArrayList<Transference> trans_list = new ArrayList(getTransference_waitstart_queue());
trans_list.sort(new Comparator<Transference>() {
@Override
public int compare(Transference o1, Transference o2) {
return o1.getFile_name().compareToIgnoreCase(o2.getFile_name());
}
});
trans_list.sort((Transference o1, Transference o2) -> o1.getFile_name().compareToIgnoreCase(o2.getFile_name()));
getTransference_waitstart_queue().clear();
@ -452,11 +428,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
private void _updateView() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
if (_paused_all) {
_pause_all_button.setText("RESUME ALL");
} else {
@ -485,7 +457,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
_main_panel.getView().revalidate();
_main_panel.getView().repaint();
}
});
}
@ -528,9 +499,9 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
setRemoving_transferences(true);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
if (!getTransference_remove_queue().isEmpty()) {
@ -544,7 +515,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
setRemoving_transferences(false);
secureNotify();
}
});
}
@ -552,9 +522,9 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
setPreprocessing_transferences(true);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
while (!getTransference_preprocess_queue().isEmpty()) {
Runnable run = getTransference_preprocess_queue().poll();
@ -579,8 +549,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
setPreprocessing_transferences(false);
secureNotify();
}
});
}
@ -590,9 +558,8 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
_tray_icon_finish = false;
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
while (!getTransference_provision_queue().isEmpty()) {
Transference transference = getTransference_provision_queue().poll();
@ -603,46 +570,26 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
}
}
synchronized (getQueue_sort_lock()) {
if (!isPreprocessing_transferences() && !isProvisioning_transferences()) {
sortTransferenceWaitStartQueue();
getTransference_waitstart_queue().forEach((up) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) up.getView());
getScroll_panel().add((Component) up.getView());
}
});
});
getTransference_finished_queue().forEach((up) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) up.getView());
getScroll_panel().add((Component) up.getView());
}
});
});
}
}
_frozen = false;
setProvisioning_transferences(false);
secureNotify();
}
});
}
@ -651,9 +598,9 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
setStarting_transferences(true);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
while (!_frozen && !_main_panel.isExit() && !_paused_all && !getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) {
@ -665,12 +612,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
start(transference);
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, ex.getMessage());
}
} else {
_frozen = true;
@ -685,7 +626,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
setStarting_transferences(false);
secureNotify();
}
});
}

163
src/main/java/com/tonikelope/megabasterd/Upload.java
View File

@ -281,6 +281,7 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
return _folder_link;
}
@Override
public boolean isRestart() {
return _restart;
}
@ -370,6 +371,8 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
try {
_file_size = the_file.length();
_progress_bar_rate = Integer.MAX_VALUE / (double) _file_size;
HashMap upload_progress = DBTools.selectUploadProgress(getFile_name(), getMa().getFull_email());
if (upload_progress == null) {
@ -404,11 +407,7 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
_status_error = "PROVISION FAILED";
if (_file_name != null) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getFile_name_label().setVisible(true);
getView().getFile_name_label().setText(_file_name);
@ -420,7 +419,6 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().getFile_size_label().setVisible(true);
getView().getFile_size_label().setText(formatBytes(_file_size));
}
});
}
@ -428,24 +426,15 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().printStatusError(_status_error);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getRestart_button().setVisible(true);
}
});
} else {
getView().printStatusNormal(LabelTranslatorSingleton.getInstance().translate(_frozen ? "(FROZEN) Waiting to start (" : "Waiting to start (") + _ma.getFull_email() + ") ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getFile_name_label().setVisible(true);
getView().getFile_name_label().setText(_file_name);
@ -457,20 +446,14 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().getFile_size_label().setVisible(true);
getView().getFile_size_label().setText(formatBytes(_file_size));
}
});
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getClose_button().setVisible(true);
getView().getQueue_down_button().setVisible(true);
getView().getQueue_up_button().setVisible(true);
}
});
}
@ -628,13 +611,8 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
if (!_chunkworkers.isEmpty()) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setEnabled(false);
}
});
int i = _chunkworkers.size() - 1;
@ -674,14 +652,9 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
LOG.log(Level.INFO, "{0} Uploader hello! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()});
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getQueue_down_button().setVisible(false);
getView().getQueue_up_button().setVisible(false);
}
});
getView().printStatusNormal("Starting upload, please wait...");
@ -739,21 +712,14 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
_byte_file_iv = i32a2bin(file_iv);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getClose_button().setVisible(false);
getView().getCbc_label().setVisible(true);
}
});
if (_file_size > 0) {
_progress_bar_rate = Integer.MAX_VALUE / (double) _file_size;
getView().updateProgressBar(0);
} else {
@ -785,32 +751,22 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
_thread_pool.execute(c);
}
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_label().setVisible(true);
getView().getSlots_spinner().setVisible(true);
getView().getSlot_status_label().setVisible(true);
}
});
}
getView().printStatusNormal(LabelTranslatorSingleton.getInstance().translate("Uploading file to mega (") + _ma.getFull_email() + ") ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setVisible(true);
getView().getProgress_pbar().setVisible(true);
}
});
secureWait();
@ -844,15 +800,10 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getMain_panel().getGlobal_up_speed().detachTransference(this);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{getView().getSpeed_label(), getView().getCbc_label(), getView().getPause_button(), getView().getStop_button(), getView().getSlots_label(), getView().getSlots_spinner()}) {
c.setVisible(false);
}
}
});
if (!_exit) {
@ -909,13 +860,8 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
_file_link = _ma.getPublicFileLink(_fid, i32a2bin(node_key));
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getFile_link_button().setEnabled(true);
}
});
} catch (Exception ex) {
@ -1004,25 +950,15 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getMain_panel().getUpload_manager().getTransference_finished_queue().add(this);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getMain_panel().getUpload_manager().getScroll_panel().remove(getView());
getMain_panel().getUpload_manager().getScroll_panel().add(getView());
getMain_panel().getUpload_manager().secureNotify();
}
});
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getClose_button().setVisible(true);
if (_status_error == null && !_canceled) {
@ -1035,41 +971,25 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().getRestart_button().setVisible(true);
}
}
});
if (_status_error != null && !_fatal_error) {
THREAD_POOL.execute(
new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
for (int i = 3; !_closed && i > 0; i--) {
final int j = i;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getRestart_button().setText("Restart (" + String.valueOf(j) + " secs...)");
}
});
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
if (!_closed) {
LOG.log(Level.INFO, "{0} Uploader {1} AUTO RESTARTING UPLOAD...", new Object[]{Thread.currentThread().getName(), getFile_name()});
restart();
}
}
});
}
@ -1086,14 +1006,9 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().printStatusNormal("Upload paused!");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME UPLOAD"));
getView().getPause_button().setEnabled(true);
}
});
}
@ -1105,14 +1020,9 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().printStatusNormal("Upload paused!");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME UPLOAD"));
getView().getPause_button().setEnabled(true);
}
});
}
@ -1127,24 +1037,16 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
_finishing_upload = true;
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setEnabled(false);
getView().getSlots_spinner().setValue((int) getView().getSlots_spinner().getValue() - 1);
}
});
} else if (!_finishing_upload) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getSlots_spinner().setEnabled(true);
}
});
}
@ -1153,13 +1055,9 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
getView().printStatusNormal("Upload paused!");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getView().getPause_button().setText(LabelTranslatorSingleton.getInstance().translate("RESUME UPLOAD"));
getView().getPause_button().setEnabled(true);
}
});
}
@ -1227,17 +1125,16 @@ public class Upload implements Transference, Runnable, SecureSingleThreadNotifia
_progress = progress;
swingInvoke(
new Runnable() {
@Override
public void run() {
getMain_panel().getUpload_manager().increment_total_progress(_progress - old_progress);
int old_percent_progress = (int) Math.floor(((double) old_progress / _file_size) * 100);
int new_percent_progress = (int) Math.floor(((double) progress / _file_size) * 100);
if (new_percent_progress > old_percent_progress) {
getView().updateProgressBar(_progress, _progress_bar_rate);
}
});
getMain_panel().getUpload_manager().increment_total_progress(_progress - old_progress);
}
}

24
src/main/java/com/tonikelope/megabasterd/UploadManager.java
View File

@ -38,12 +38,8 @@ public class UploadManager extends TransferenceManager {
@Override
public void provision(final Transference upload) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().add(((Upload) upload).getView());
}
});
((Upload) upload).provisionIt();
@ -66,23 +62,15 @@ public class UploadManager extends TransferenceManager {
getTransference_waitstart_queue().addAll(aux);
getTransference_waitstart_queue().forEach((t1) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
}
});
});
getTransference_finished_queue().forEach((t2) -> {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove((Component) t2.getView());
getScroll_panel().add((Component) t2.getView());
}
});
});
@ -106,12 +94,8 @@ public class UploadManager extends TransferenceManager {
for (final Transference u : uploads) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
getScroll_panel().remove(((Upload) u).getView());
}
});
getTransference_waitstart_queue().remove(u);

136
src/main/java/com/tonikelope/megabasterd/UploadView.java
View File

@ -353,15 +353,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
private void slots_spinnerStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_slots_spinnerStateChanged
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_upload.checkSlotsAndWorkers();
}
});
THREAD_POOL.execute(_upload::checkSlotsAndWorkers);
}//GEN-LAST:event_slots_spinnerStateChanged
private void close_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_close_buttonActionPerformed
@ -390,11 +382,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
public void hideAllExceptStatus() {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{speed_label, slots_spinner, slots_label, slot_status_label, pause_button, stop_button, progress_pbar, cbc_label}) {
c.setVisible(false);
@ -404,7 +392,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
c.setVisible(true);
}
}
});
}
@ -440,23 +427,11 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
queue_up_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_upload.upWaitQueue();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
queue_up_button.setEnabled(true);
}
});
}
});
}//GEN-LAST:event_queue_up_buttonActionPerformed
@ -465,36 +440,18 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
queue_down_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
THREAD_POOL.execute(() -> {
_upload.downWaitQueue();
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
queue_down_button.setEnabled(true);
}
});
}
});
}//GEN-LAST:event_queue_down_buttonActionPerformed
public void updateCBC(String status) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
cbc_label.setText(status);
}
});
}
@ -503,11 +460,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
printStatusNormal("Pausing upload ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{pause_button, speed_label, slots_label, slots_spinner, progress_pbar, file_name_label, file_size_label}) {
c.setEnabled(false);
@ -517,7 +470,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
c.setVisible(true);
}
}
});
}
@ -526,17 +478,11 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
printStatusNormal(status);
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{pause_button, stop_button, speed_label, slots_label, slots_spinner, progress_pbar, file_name_label, file_size_label}) {
c.setEnabled(false);
}
}
});
}
@ -545,11 +491,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
printStatusNormal("Uploading file to mega ...");
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
for (JComponent c : new JComponent[]{pause_button, speed_label, slots_label, slots_spinner, progress_pbar, file_name_label, file_size_label}) {
c.setEnabled(true);
@ -562,18 +504,13 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
pause_button.setText(LabelTranslatorSingleton.getInstance().translate("PAUSE UPLOAD"));
_upload.getMain_panel().getView().getPause_all_up_button().setVisible(true);
}
});
}
@Override
public void updateSpeed(final String speed, final Boolean visible) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
if (speed != null) {
speed_label.setText(speed);
}
@ -581,74 +518,48 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
if (visible != null) {
speed_label.setVisible(visible);
}
}
});
}
@Override
public void updateProgressBar(final long progress, final double bar_rate) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
progress_pbar.setValue((int) Math.floor(bar_rate * progress));
}
});
}
@Override
public void updateProgressBar(final int value) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
progress_pbar.setValue(value);
}
});
}
@Override
public void printStatusError(final String message) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setForeground(Color.red);
status_label.setText(LabelTranslatorSingleton.getInstance().translate(message));
}
});
}
@Override
public void printStatusOK(final String message) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setForeground(new Color(0, 170, 0));
status_label.setText(LabelTranslatorSingleton.getInstance().translate(message));
}
});
}
@Override
public void printStatusNormal(final String message) {
swingInvoke(
new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
status_label.setForeground(new Color(102, 102, 102));
status_label.setText(LabelTranslatorSingleton.getInstance().translate(message));
}
});
}
@ -670,27 +581,16 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
final String status = (conta_exit > 0 ? "Tot removing: " + conta_exit : "") + (conta_error > 0 ? ((conta_exit > 0 ? " / " : "") + "Tot error: " + conta_error) : "");
swingInvoke(new Runnable() {
@Override
public void run() {
swingInvoke(() -> {
slot_status_label.setForeground(status_color);
slot_status_label.setText(LabelTranslatorSingleton.getInstance().translate(status));
}
});
}
}
@Override
public int getSlots() {
return (int) swingInvokeAndWaitForReturn(new Callable() {
@Override
public Object call() throws Exception {
return getSlots_spinner().getValue();
}
});
return (int) swingInvokeAndWaitForReturn((Callable) getSlots_spinner()::getValue);
}
// Variables declaration - do not modify//GEN-BEGIN:variables

BIN
src/main/resources/images/mbasterd_screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 215 KiB