From b088897b0a0782e9dcc50a14c2552c57a89ab5ab Mon Sep 17 00:00:00 2001 From: tonikelope Date: Wed, 29 Nov 2017 18:03:42 +0100 Subject: [PATCH] 2.35 Urldecode Dialog font Race condition (lazy init) --- src/megabasterd/AboutDialog.form | 10 +- src/megabasterd/AboutDialog.java | 10 +- src/megabasterd/Download.java | 50 +++----- src/megabasterd/DownloadView.form | 28 ++--- src/megabasterd/DownloadView.java | 28 ++--- src/megabasterd/FileGrabberDialog.form | 26 ++-- src/megabasterd/FileGrabberDialog.java | 26 ++-- src/megabasterd/FolderLinkDialog.form | 18 +-- src/megabasterd/FolderLinkDialog.java | 18 +-- src/megabasterd/GetMasterPasswordDialog.form | 12 +- src/megabasterd/GetMasterPasswordDialog.java | 12 +- src/megabasterd/LinkGrabberDialog.form | 18 +-- src/megabasterd/LinkGrabberDialog.java | 18 +-- src/megabasterd/MainPanel.java | 2 +- src/megabasterd/MainPanelView.form | 54 ++++----- src/megabasterd/MainPanelView.java | 106 ++++++++-------- src/megabasterd/SetMasterPasswordDialog.form | 16 +-- src/megabasterd/SetMasterPasswordDialog.java | 16 +-- src/megabasterd/SettingsDialog.form | 120 +++++++++---------- src/megabasterd/SettingsDialog.java | 120 +++++++++---------- src/megabasterd/StreamerDialog.form | 10 +- src/megabasterd/StreamerDialog.java | 88 +++++++------- src/megabasterd/Upload.java | 75 +++++------- src/megabasterd/UploadMACGenerator.java | 8 +- src/megabasterd/UploadManager.java | 22 ++-- src/megabasterd/UploadView.form | 26 ++-- src/megabasterd/UploadView.java | 28 ++--- 27 files changed, 469 insertions(+), 496 deletions(-) diff --git a/src/megabasterd/AboutDialog.form b/src/megabasterd/AboutDialog.form index 78f9eaedb..98d2d526e 100644 --- a/src/megabasterd/AboutDialog.form +++ b/src/megabasterd/AboutDialog.form @@ -92,7 +92,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -191,7 +191,7 @@ - + diff --git a/src/megabasterd/AboutDialog.java b/src/megabasterd/AboutDialog.java index 4ad7a8a90..912fd6ce8 100644 --- a/src/megabasterd/AboutDialog.java +++ b/src/megabasterd/AboutDialog.java @@ -50,7 +50,7 @@ public final class AboutDialog extends javax.swing.JDialog { setIconImage(null); setResizable(false); - title_label.setFont(new java.awt.Font("Ubuntu", 1, 48)); // NOI18N + title_label.setFont(new java.awt.Font("Dialog", 1, 48)); // NOI18N title_label.setText("MegaBasterd X.X"); title_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); title_label.setDoubleBuffered(true); @@ -69,7 +69,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - subtitle_label.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + subtitle_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N subtitle_label.setForeground(new java.awt.Color(102, 102, 102)); subtitle_label.setText("(Made with love by tonikelope)"); subtitle_label.setDoubleBuffered(true); @@ -83,7 +83,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - mcdown_url_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + mcdown_url_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N mcdown_url_button.setText("Copy MegaBasterd download URL"); mcdown_url_button.setDoubleBuffered(true); mcdown_url_button.addActionListener(new java.awt.event.ActionListener() { @@ -92,7 +92,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - author_webpage_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + author_webpage_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N author_webpage_label.setForeground(new java.awt.Color(102, 102, 102)); author_webpage_label.setText("http://toni.world"); author_webpage_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); @@ -112,7 +112,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - check_version_button.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N + check_version_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N check_version_button.setText("Check version"); check_version_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/src/megabasterd/Download.java b/src/megabasterd/Download.java index f8fc0a16b..11b867e40 100644 --- a/src/megabasterd/Download.java +++ b/src/megabasterd/Download.java @@ -1,5 +1,6 @@ package megabasterd; +import java.awt.Color; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -51,8 +52,8 @@ public final class Download implements Transference, Runnable, SecureSingleThrea public static final int WATCHDOG_SMART_PROXY_TIMEOUT = 3600; private final MainPanel _main_panel; - private volatile DownloadView _view = null; //lazy init - private volatile ProgressMeter _progress_meter = null; //lazy init; + private volatile DownloadView _view; + private volatile ProgressMeter _progress_meter; private final Object _secure_notify_lock; private final Object _workers_lock; private final Object _chunkid_lock; @@ -133,6 +134,8 @@ public final class Download implements Transference, Runnable, SecureSingleThrea _partialProgressQueue = new ConcurrentLinkedQueue<>(); _rejectedChunkIds = new ConcurrentLinkedQueue<>(); _thread_pool = newCachedThreadPool(); + _view = new DownloadView(this); + _progress_meter = new ProgressMeter(this); } public boolean isUse_smart_proxy() { @@ -140,6 +143,13 @@ public final class Download implements Transference, Runnable, SecureSingleThrea } public void setUse_smart_proxy(boolean _use_smart_proxy) { + + if (_use_smart_proxy) { + swingReflectionInvoke("setForeground", this.getView().getSpeed_label(), Color.ORANGE); + } else { + swingReflectionInvoke("setForeground", this.getView().getSpeed_label(), new Color(0, 128, 255)); + } + this._use_smart_proxy = _use_smart_proxy; } @@ -251,45 +261,13 @@ public final class Download implements Transference, Runnable, SecureSingleThrea @Override public ProgressMeter getProgress_meter() { - ProgressMeter result = _progress_meter; - - if (result == null) { - - synchronized (this) { - - result = _progress_meter; - - if (result == null) { - - _progress_meter = result = new ProgressMeter(this); - - } - } - } - - return result; + return this._progress_meter; } @Override public DownloadView getView() { - DownloadView result = _view; - - if (result == null) { - - synchronized (this) { - - result = _view; - - if (result == null) { - - _view = result = new DownloadView(this); - - } - } - } - - return result; + return this._view; } @Override diff --git a/src/megabasterd/DownloadView.form b/src/megabasterd/DownloadView.form index df1b03ca8..0c2de7905 100644 --- a/src/megabasterd/DownloadView.form +++ b/src/megabasterd/DownloadView.form @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -286,7 +286,7 @@ - + diff --git a/src/megabasterd/DownloadView.java b/src/megabasterd/DownloadView.java index 116c5be0b..5651d28df 100644 --- a/src/megabasterd/DownloadView.java +++ b/src/megabasterd/DownloadView.java @@ -125,15 +125,15 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 4, true)); - status_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + status_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N status_label.setText("status"); status_label.setDoubleBuffered(true); - slots_label.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + slots_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N slots_label.setText("Slots"); slots_label.setDoubleBuffered(true); - slots_spinner.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + slots_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N slots_spinner.setToolTipText("Slots"); slots_spinner.setDoubleBuffered(true); slots_spinner.addChangeListener(new javax.swing.event.ChangeListener() { @@ -142,16 +142,16 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - speed_label.setFont(new java.awt.Font("Ubuntu", 3, 26)); // NOI18N + speed_label.setFont(new java.awt.Font("Dialog", 3, 26)); // NOI18N speed_label.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); speed_label.setText("speed"); speed_label.setDoubleBuffered(true); - progress_pbar.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + progress_pbar.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N progress_pbar.setDoubleBuffered(true); pause_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + pause_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N pause_button.setForeground(java.awt.Color.white); pause_button.setText("PAUSE DOWNLOAD"); pause_button.setDoubleBuffered(true); @@ -162,7 +162,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen }); stop_button.setBackground(new java.awt.Color(255, 0, 0)); - stop_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + stop_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N stop_button.setForeground(java.awt.Color.white); stop_button.setText("CANCEL DOWNLOAD"); stop_button.setDoubleBuffered(true); @@ -172,17 +172,17 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - keep_temp_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + keep_temp_checkbox.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N keep_temp_checkbox.setSelected(true); keep_temp_checkbox.setText("Keep temp file"); keep_temp_checkbox.setDoubleBuffered(true); - file_name_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + file_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N file_name_label.setForeground(new java.awt.Color(51, 51, 255)); file_name_label.setText("file_name"); file_name_label.setDoubleBuffered(true); - close_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + close_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N close_button.setText("Close"); close_button.setDoubleBuffered(true); close_button.addActionListener(new java.awt.event.ActionListener() { @@ -191,7 +191,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - copy_link_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + copy_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N copy_link_button.setText("Copy link"); copy_link_button.setDoubleBuffered(true); copy_link_button.addActionListener(new java.awt.event.ActionListener() { @@ -201,7 +201,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen }); restart_button.setBackground(new java.awt.Color(51, 51, 255)); - restart_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + restart_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N restart_button.setForeground(new java.awt.Color(255, 255, 255)); restart_button.setText("Restart"); restart_button.setDoubleBuffered(true); @@ -211,7 +211,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - file_size_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + file_size_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N file_size_label.setForeground(new java.awt.Color(51, 51, 255)); file_size_label.setText("file_size"); file_size_label.setDoubleBuffered(true); @@ -219,7 +219,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen slot_status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N slot_status_label.setDoubleBuffered(true); - open_folder_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + open_folder_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N open_folder_button.setText("Open folder"); open_folder_button.setDoubleBuffered(true); open_folder_button.addActionListener(new java.awt.event.ActionListener() { diff --git a/src/megabasterd/FileGrabberDialog.form b/src/megabasterd/FileGrabberDialog.form index b43ab1005..9a13d2b2f 100644 --- a/src/megabasterd/FileGrabberDialog.form +++ b/src/megabasterd/FileGrabberDialog.form @@ -106,7 +106,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -311,7 +311,7 @@ - + diff --git a/src/megabasterd/FileGrabberDialog.java b/src/megabasterd/FileGrabberDialog.java index 6387e927b..688df6fca 100644 --- a/src/megabasterd/FileGrabberDialog.java +++ b/src/megabasterd/FileGrabberDialog.java @@ -120,7 +120,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Files")); - file_tree.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + file_tree.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N javax.swing.tree.DefaultMutableTreeNode treeNode1 = new javax.swing.tree.DefaultMutableTreeNode("root"); file_tree.setModel(new javax.swing.tree.DefaultTreeModel(treeNode1)); file_tree.setDoubleBuffered(true); @@ -139,21 +139,21 @@ public final class FileGrabberDialog extends javax.swing.JDialog { .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 216, Short.MAX_VALUE) ); - dir_name_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + dir_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N dir_name_label.setText("Upload name:"); dir_name_label.setDoubleBuffered(true); dir_name_label.setEnabled(false); - dir_name_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + dir_name_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N dir_name_textfield.setDoubleBuffered(true); dir_name_textfield.setEnabled(false); - account_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + account_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N account_label.setText("Account:"); account_label.setDoubleBuffered(true); account_label.setEnabled(false); - account_combobox.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + account_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N account_combobox.setDoubleBuffered(true); account_combobox.setEnabled(false); account_combobox.addItemListener(new java.awt.event.ItemListener() { @@ -162,11 +162,11 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - used_space_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + used_space_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N used_space_label.setText("Used space: 0.00GB"); used_space_label.setDoubleBuffered(true); - add_folder_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + add_folder_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N add_folder_button.setText("Add folder"); add_folder_button.setDoubleBuffered(true); add_folder_button.setEnabled(false); @@ -176,7 +176,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - add_files_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + add_files_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N add_files_button.setText("Add files"); add_files_button.setDoubleBuffered(true); add_files_button.setEnabled(false); @@ -227,7 +227,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { ); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -238,17 +238,17 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - total_file_size_label.setFont(new java.awt.Font("Ubuntu", 1, 28)); // NOI18N + total_file_size_label.setFont(new java.awt.Font("Dialog", 1, 28)); // NOI18N total_file_size_label.setText("[0 B]"); total_file_size_label.setDoubleBuffered(true); total_file_size_label.setEnabled(false); - warning_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + warning_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N warning_label.setText("If you DO NOT want to upload some folder or file you can REMOVE it."); warning_label.setDoubleBuffered(true); warning_label.setEnabled(false); - skip_rest_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + skip_rest_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N skip_rest_button.setText("REMOVE ALL EXCEPT THIS"); skip_rest_button.setDoubleBuffered(true); skip_rest_button.setEnabled(false); @@ -258,7 +258,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - skip_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + skip_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N skip_button.setText("REMOVE THIS"); skip_button.setDoubleBuffered(true); skip_button.setEnabled(false); diff --git a/src/megabasterd/FolderLinkDialog.form b/src/megabasterd/FolderLinkDialog.form index 8763ef7fb..020c35f94 100644 --- a/src/megabasterd/FolderLinkDialog.form +++ b/src/megabasterd/FolderLinkDialog.form @@ -100,7 +100,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/src/megabasterd/FolderLinkDialog.java b/src/megabasterd/FolderLinkDialog.java index 2f0c48134..a65d95e13 100644 --- a/src/megabasterd/FolderLinkDialog.java +++ b/src/megabasterd/FolderLinkDialog.java @@ -95,14 +95,14 @@ public final class FolderLinkDialog extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("FolderLink"); - file_tree.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + file_tree.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N javax.swing.tree.DefaultMutableTreeNode treeNode1 = new javax.swing.tree.DefaultMutableTreeNode("root"); file_tree.setModel(new javax.swing.tree.DefaultTreeModel(treeNode1)); file_tree.setDoubleBuffered(true); file_tree.setEnabled(false); file_tree_scrollpane.setViewportView(file_tree); - skip_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + skip_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N skip_button.setText("REMOVE THIS"); skip_button.setDoubleBuffered(true); skip_button.setEnabled(false); @@ -112,12 +112,12 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - link_detected_label.setFont(new java.awt.Font("Ubuntu", 1, 30)); // NOI18N + link_detected_label.setFont(new java.awt.Font("Dialog", 1, 30)); // NOI18N link_detected_label.setText("Folder link detected!"); link_detected_label.setDoubleBuffered(true); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -128,16 +128,16 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - folder_link_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + folder_link_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N folder_link_label.setText("jLabel2"); folder_link_label.setDoubleBuffered(true); - warning_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + warning_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N warning_label.setText("If you DO NOT want to download some folder or file you can REMOVE it."); warning_label.setDoubleBuffered(true); warning_label.setEnabled(false); - skip_rest_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + skip_rest_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N skip_rest_button.setText("REMOVE ALL EXCEPT THIS"); skip_rest_button.setDoubleBuffered(true); skip_rest_button.setEnabled(false); @@ -147,7 +147,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - restore_button.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N + restore_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N restore_button.setText("Restore folder data"); restore_button.setDoubleBuffered(true); restore_button.addActionListener(new java.awt.event.ActionListener() { @@ -156,7 +156,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - total_space_label.setFont(new java.awt.Font("Ubuntu", 1, 28)); // NOI18N + total_space_label.setFont(new java.awt.Font("Dialog", 1, 28)); // NOI18N total_space_label.setText("[0 B]"); total_space_label.setDoubleBuffered(true); total_space_label.setEnabled(false); diff --git a/src/megabasterd/GetMasterPasswordDialog.form b/src/megabasterd/GetMasterPasswordDialog.form index 24826e833..477bd4c51 100644 --- a/src/megabasterd/GetMasterPasswordDialog.form +++ b/src/megabasterd/GetMasterPasswordDialog.form @@ -83,7 +83,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/src/megabasterd/GetMasterPasswordDialog.java b/src/megabasterd/GetMasterPasswordDialog.java index 66012bbbd..b4aa29ca1 100644 --- a/src/megabasterd/GetMasterPasswordDialog.java +++ b/src/megabasterd/GetMasterPasswordDialog.java @@ -89,7 +89,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { setTitle("MasterPassword"); setResizable(false); - current_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + current_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N current_pass_textfield.setDoubleBuffered(true); current_pass_textfield.addKeyListener(new java.awt.event.KeyAdapter() { public void keyPressed(java.awt.event.KeyEvent evt) { @@ -97,7 +97,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { } }); - cancel_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + cancel_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -106,7 +106,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { } }); - ok_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + ok_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -118,14 +118,14 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/lock_medium.png"))); // NOI18N lock_label.setDoubleBuffered(true); - please_label.setFont(new java.awt.Font("Ubuntu", 1, 26)); // NOI18N + please_label.setFont(new java.awt.Font("Dialog", 1, 26)); // NOI18N please_label.setText("Please, enter your master password"); please_label.setDoubleBuffered(true); - status_label.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N + status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N status_label.setDoubleBuffered(true); - remember_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + remember_checkbox.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N remember_checkbox.setSelected(true); remember_checkbox.setText("Remember for this session"); remember_checkbox.setDoubleBuffered(true); diff --git a/src/megabasterd/LinkGrabberDialog.form b/src/megabasterd/LinkGrabberDialog.form index dbca51479..0f8e41d59 100644 --- a/src/megabasterd/LinkGrabberDialog.form +++ b/src/megabasterd/LinkGrabberDialog.form @@ -92,7 +92,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,14 +154,14 @@ - + - + @@ -172,7 +172,7 @@ - + @@ -180,7 +180,7 @@ - + diff --git a/src/megabasterd/LinkGrabberDialog.java b/src/megabasterd/LinkGrabberDialog.java index c811c80f8..cb4fe0b57 100644 --- a/src/megabasterd/LinkGrabberDialog.java +++ b/src/megabasterd/LinkGrabberDialog.java @@ -112,14 +112,14 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip setModal(true); links_textarea.setColumns(20); - links_textarea.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + links_textarea.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N links_textarea.setRows(5); links_textarea.setDoubleBuffered(true); links_scrollpane.setViewportView(links_textarea); links_textarea.addMouseListener(new ContextMenuMouseListener()); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -129,11 +129,11 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip } }); - links_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + links_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N links_label.setText("Put your MEGA/MegaCrypter/ELC link/s here (one per line):"); links_label.setDoubleBuffered(true); - change_dir_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + change_dir_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N change_dir_button.setText("Change it"); change_dir_button.setDoubleBuffered(true); change_dir_button.addActionListener(new java.awt.event.ActionListener() { @@ -142,13 +142,13 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip } }); - down_dir_to_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + down_dir_to_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N down_dir_to_label.setText("Download to: "); down_dir_to_label.setDoubleBuffered(true); - download_dir_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + download_dir_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - dlc_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + dlc_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N dlc_button.setText("Load DLC container"); dlc_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -156,10 +156,10 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip } }); - use_mega_account_down_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + use_mega_account_down_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N use_mega_account_down_label.setText("Use this account for download:"); - use_mega_account_down_combobox.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N use_mega_account_down_combobox.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { use_mega_account_down_comboboxItemStateChanged(evt); diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java index fa2ed8a20..26ee80ca8 100644 --- a/src/megabasterd/MainPanel.java +++ b/src/megabasterd/MainPanel.java @@ -45,7 +45,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; */ public final class MainPanel { - public static final String VERSION = "2.34"; + public static final String VERSION = "2.35"; 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; diff --git a/src/megabasterd/MainPanelView.form b/src/megabasterd/MainPanelView.form index 931701bbc..3c1906e10 100644 --- a/src/megabasterd/MainPanelView.form +++ b/src/megabasterd/MainPanelView.form @@ -9,14 +9,14 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -101,14 +101,14 @@ - + - + @@ -123,14 +123,14 @@ - + - + @@ -184,7 +184,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -461,7 +461,7 @@ - + diff --git a/src/megabasterd/MainPanelView.java b/src/megabasterd/MainPanelView.java index 9535d48ed..b460af3da 100644 --- a/src/megabasterd/MainPanelView.java +++ b/src/megabasterd/MainPanelView.java @@ -5,6 +5,8 @@ import java.awt.event.WindowEvent; import static java.awt.event.WindowEvent.WINDOW_CLOSING; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.sql.SQLException; import java.util.HashMap; import java.util.HashSet; @@ -182,21 +184,21 @@ public final class MainPanelView extends javax.swing.JFrame { logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/mbasterd_logo_nuevo.png"))); // NOI18N logo_label.setDoubleBuffered(true); - kiss_server_status.setFont(new java.awt.Font("Ubuntu", 2, 14)); // NOI18N + kiss_server_status.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N kiss_server_status.setDoubleBuffered(true); jTabbedPane1.setDoubleBuffered(true); - jTabbedPane1.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N + jTabbedPane1.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N - global_speed_down_label.setFont(new java.awt.Font("Ubuntu", 1, 54)); // NOI18N + global_speed_down_label.setFont(new java.awt.Font("Dialog", 1, 54)); // NOI18N global_speed_down_label.setText("Speed"); global_speed_down_label.setDoubleBuffered(true); - status_down_label.setFont(new java.awt.Font("Ubuntu", 2, 16)); // NOI18N + status_down_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N status_down_label.setDoubleBuffered(true); close_all_finished_down_button.setBackground(new java.awt.Color(0, 153, 51)); - close_all_finished_down_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + close_all_finished_down_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N close_all_finished_down_button.setForeground(new java.awt.Color(255, 255, 255)); close_all_finished_down_button.setText("Close all OK finished"); close_all_finished_down_button.setDoubleBuffered(true); @@ -210,7 +212,7 @@ public final class MainPanelView extends javax.swing.JFrame { jScrollPane_down.setViewportView(jPanel_scroll_down); pause_all_down_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_all_down_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + pause_all_down_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N pause_all_down_button.setForeground(new java.awt.Color(255, 255, 255)); pause_all_down_button.setText("PAUSE ALL"); pause_all_down_button.setDoubleBuffered(true); @@ -220,7 +222,7 @@ public final class MainPanelView extends javax.swing.JFrame { } }); - down_remtime_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + down_remtime_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N javax.swing.GroupLayout downloads_panelLayout = new javax.swing.GroupLayout(downloads_panel); downloads_panel.setLayout(downloads_panelLayout); @@ -246,7 +248,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(close_all_finished_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 318, Short.MAX_VALUE) + .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 316, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(down_remtime_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -257,14 +259,14 @@ public final class MainPanelView extends javax.swing.JFrame { jTabbedPane1.addTab("Downloads", downloads_panel); - global_speed_up_label.setFont(new java.awt.Font("Ubuntu", 1, 54)); // NOI18N + global_speed_up_label.setFont(new java.awt.Font("Dialog", 1, 54)); // NOI18N global_speed_up_label.setText("Speed"); global_speed_up_label.setDoubleBuffered(true); - status_up_label.setFont(new java.awt.Font("Ubuntu", 2, 16)); // NOI18N + status_up_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N close_all_finished_up_button.setBackground(new java.awt.Color(0, 153, 51)); - close_all_finished_up_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + close_all_finished_up_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N close_all_finished_up_button.setForeground(new java.awt.Color(255, 255, 255)); close_all_finished_up_button.setText("Close all OK finished"); close_all_finished_up_button.setDoubleBuffered(true); @@ -278,7 +280,7 @@ public final class MainPanelView extends javax.swing.JFrame { jScrollPane_up.setViewportView(jPanel_scroll_up); pause_all_up_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_all_up_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + pause_all_up_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N pause_all_up_button.setForeground(new java.awt.Color(255, 255, 255)); pause_all_up_button.setText("PAUSE ALL"); pause_all_up_button.setDoubleBuffered(true); @@ -288,7 +290,7 @@ public final class MainPanelView extends javax.swing.JFrame { } }); - up_remtime_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + up_remtime_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); uploads_panel.setLayout(uploads_panelLayout); @@ -314,7 +316,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(close_all_finished_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 318, Short.MAX_VALUE) + .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 316, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(up_remtime_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -327,9 +329,9 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.setText("File"); file_menu.setDoubleBuffered(true); - file_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + file_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - new_download_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + new_download_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N new_download_menu.setText("New download"); new_download_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -338,7 +340,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(new_download_menu); - new_upload_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + new_upload_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N new_upload_menu.setText("New upload"); new_upload_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -347,7 +349,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(new_upload_menu); - new_stream_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + new_stream_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N new_stream_menu.setText("New stream"); new_stream_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -357,7 +359,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(new_stream_menu); file_menu.add(jSeparator4); - clean_all_down_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + clean_all_down_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N clean_all_down_menu.setText("Remove all pre/pro/wait downloads"); clean_all_down_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -366,7 +368,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(clean_all_down_menu); - clean_all_up_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + clean_all_up_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N clean_all_up_menu.setText("Remove all pre/pro/wait uploads"); clean_all_up_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -376,7 +378,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(clean_all_up_menu); file_menu.add(jSeparator2); - hide_tray_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + hide_tray_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N hide_tray_menu.setText("Hide to tray"); hide_tray_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -385,7 +387,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(hide_tray_menu); - exit_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + exit_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N exit_menu.setText("EXIT"); exit_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -398,9 +400,9 @@ public final class MainPanelView extends javax.swing.JFrame { edit_menu.setText("Edit"); edit_menu.setDoubleBuffered(true); - edit_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + edit_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - settings_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + settings_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N settings_menu.setText("Settings"); settings_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -413,9 +415,9 @@ public final class MainPanelView extends javax.swing.JFrame { help_menu.setText("Help"); help_menu.setDoubleBuffered(true); - help_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + help_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - about_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + about_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N about_menu.setText("About"); about_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -446,7 +448,7 @@ public final class MainPanelView extends javax.swing.JFrame { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(jTabbedPane1) + .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 482, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(logo_label) @@ -552,49 +554,53 @@ public final class MainPanelView extends javax.swing.JFrame { for (String url : urls) { if (getMain_panel().getDownload_manager().getPre_count() > 0) { - url = url.replaceAll("^mega://", "https://mega.nz"); + try { + url = URLDecoder.decode(url.replaceAll("^mega://", "https://mega.nz"), "UTF-8").trim(); - Download download; + Download download; - if (findFirstRegex("#F!", url, 0) != null) { + if (findFirstRegex("#F!", url, 0) != null) { - FolderLinkDialog fdialog = new FolderLinkDialog(_main_panel.getView(), true, url); + FolderLinkDialog fdialog = new FolderLinkDialog(_main_panel.getView(), true, url); - if (!fdialog.isMega_error()) { + if (!fdialog.isMega_error()) { - swingReflectionInvokeAndWait("setLocationRelativeTo", fdialog, _main_panel.getView()); + swingReflectionInvokeAndWait("setLocationRelativeTo", fdialog, _main_panel.getView()); - swingReflectionInvokeAndWait("setVisible", fdialog, true); + swingReflectionInvokeAndWait("setVisible", fdialog, true); - if (fdialog.isDownload()) { + if (fdialog.isDownload()) { - List folder_links = fdialog.getDownload_links(); + List folder_links = fdialog.getDownload_links(); - fdialog.dispose(); + fdialog.dispose(); - for (HashMap folder_link : folder_links) { + for (HashMap folder_link : folder_links) { - download = new Download(getMain_panel(), ma, (String) folder_link.get("url"), dl_path, (String) folder_link.get("filename"), (String) folder_link.get("filekey"), (long) folder_link.get("filesize"), null, null, getMain_panel().isUse_slots_down(), getMain_panel().getDefault_slots_down(), true); + download = new Download(getMain_panel(), ma, (String) folder_link.get("url"), dl_path, (String) folder_link.get("filename"), (String) folder_link.get("filekey"), (long) folder_link.get("filesize"), null, null, getMain_panel().isUse_slots_down(), getMain_panel().getDefault_slots_down(), true); - getMain_panel().getDownload_manager().getTransference_provision_queue().add(download); + getMain_panel().getDownload_manager().getTransference_provision_queue().add(download); + } } + } + fdialog.dispose(); + + } else { + + download = new Download(getMain_panel(), ma, url, dl_path, null, null, null, null, null, getMain_panel().isUse_slots_down(), getMain_panel().getDefault_slots_down(), false); + + getMain_panel().getDownload_manager().getTransference_provision_queue().add(download); } - fdialog.dispose(); + getMain_panel().getDownload_manager().addPre_count(-1); - } else { - - download = new Download(getMain_panel(), ma, url, dl_path, null, null, null, null, null, getMain_panel().isUse_slots_down(), getMain_panel().getDefault_slots_down(), false); - - getMain_panel().getDownload_manager().getTransference_provision_queue().add(download); + getMain_panel().getDownload_manager().secureNotify(); + } catch (UnsupportedEncodingException ex) { + Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, null, ex); } - getMain_panel().getDownload_manager().addPre_count(-1); - - getMain_panel().getDownload_manager().secureNotify(); - } } } diff --git a/src/megabasterd/SetMasterPasswordDialog.form b/src/megabasterd/SetMasterPasswordDialog.form index ea196b5d1..04615cb5b 100644 --- a/src/megabasterd/SetMasterPasswordDialog.form +++ b/src/megabasterd/SetMasterPasswordDialog.form @@ -96,7 +96,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/src/megabasterd/SetMasterPasswordDialog.java b/src/megabasterd/SetMasterPasswordDialog.java index e365ac32a..80c5c94f3 100644 --- a/src/megabasterd/SetMasterPasswordDialog.java +++ b/src/megabasterd/SetMasterPasswordDialog.java @@ -84,7 +84,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { setTitle("MasterPassword"); setResizable(false); - confirm_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + confirm_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N confirm_pass_textfield.setDoubleBuffered(true); confirm_pass_textfield.addKeyListener(new java.awt.event.KeyAdapter() { public void keyPressed(java.awt.event.KeyEvent evt) { @@ -92,11 +92,11 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { } }); - confirm_pass_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + confirm_pass_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N confirm_pass_label.setText("Confirm new:"); confirm_pass_label.setDoubleBuffered(true); - cancel_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + cancel_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -105,7 +105,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { } }); - ok_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + ok_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -117,18 +117,18 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/lock_medium.png"))); // NOI18N lock_label.setDoubleBuffered(true); - warning_label.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N + warning_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N warning_label.setText("WARNING: if you forget this password, you will have to insert all your accounts again."); warning_label.setDoubleBuffered(true); - new_pass_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + new_pass_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N new_pass_label.setText("New pass:"); new_pass_label.setDoubleBuffered(true); - new_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + new_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N new_pass_textfield.setDoubleBuffered(true); - status_label.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N + status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N status_label.setDoubleBuffered(true); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); diff --git a/src/megabasterd/SettingsDialog.form b/src/megabasterd/SettingsDialog.form index 01f340980..28139a1cd 100644 --- a/src/megabasterd/SettingsDialog.form +++ b/src/megabasterd/SettingsDialog.form @@ -60,7 +60,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -355,14 +355,14 @@ - + - + @@ -371,7 +371,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -390,7 +390,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -419,7 +419,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -447,21 +447,21 @@ - + - + - + @@ -470,7 +470,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -490,7 +490,7 @@ - + @@ -501,14 +501,14 @@ - + - + @@ -517,7 +517,7 @@ - + @@ -614,7 +614,7 @@ - + @@ -623,7 +623,7 @@ - + @@ -632,7 +632,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -651,7 +651,7 @@ - + @@ -663,7 +663,7 @@ - + @@ -671,14 +671,14 @@ - + - + @@ -693,7 +693,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -812,7 +812,7 @@ - + @@ -821,7 +821,7 @@ - + @@ -834,7 +834,7 @@ - + @@ -846,7 +846,7 @@ - + @@ -860,7 +860,7 @@ - + @@ -877,7 +877,7 @@ - + @@ -892,7 +892,7 @@ - + @@ -901,7 +901,7 @@ - +
@@ -918,7 +918,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -940,7 +940,7 @@ - + @@ -952,7 +952,7 @@ - + @@ -1056,7 +1056,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1078,7 +1078,7 @@ - + @@ -1088,7 +1088,7 @@ - + @@ -1100,7 +1100,7 @@ - + @@ -1112,7 +1112,7 @@ - + @@ -1161,7 +1161,7 @@ - + @@ -1171,7 +1171,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1210,7 +1210,7 @@ - + diff --git a/src/megabasterd/SettingsDialog.java b/src/megabasterd/SettingsDialog.java index 442445ac3..fbecbbf44 100644 --- a/src/megabasterd/SettingsDialog.java +++ b/src/megabasterd/SettingsDialog.java @@ -566,7 +566,7 @@ public final class SettingsDialog extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Settings"); - ok_button.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N + ok_button.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -575,7 +575,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - cancel_button.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N + cancel_button.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -585,17 +585,17 @@ public final class SettingsDialog extends javax.swing.JDialog { }); jTabbedPane1.setDoubleBuffered(true); - jTabbedPane1.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N + jTabbedPane1.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N jScrollPane2.setBorder(null); - megacrypter_reverse_warning_label.setFont(new java.awt.Font("Ubuntu", 2, 14)); // NOI18N + megacrypter_reverse_warning_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N megacrypter_reverse_warning_label.setText("Note: you MUST \"OPEN\" this port in your router/firewall."); - rec_download_slots_label.setFont(new java.awt.Font("Ubuntu", 2, 14)); // NOI18N + rec_download_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N rec_download_slots_label.setText("Note: it is recommended not to enable MULTI SLOT (unless you want to download +5GB file without PRO account, in which case you will MUST USE multi slot). "); - megacrypter_reverse_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + megacrypter_reverse_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N megacrypter_reverse_checkbox.setText("Use Megacrypter reverse mode"); megacrypter_reverse_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -603,7 +603,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - limit_download_speed_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + limit_download_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N limit_download_speed_checkbox.setText("Limit download speed"); limit_download_speed_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -611,11 +611,11 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - max_downloads_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + max_downloads_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N max_downloads_label.setText("Max parallel downloads:"); max_downloads_label.setDoubleBuffered(true); - smart_proxy_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + smart_proxy_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N smart_proxy_checkbox.setText("Use SmartProxy (experimental)"); smart_proxy_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -623,13 +623,13 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - max_down_speed_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + max_down_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N - verify_file_down_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + verify_file_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N verify_file_down_checkbox.setText("Verify file integrity (when download is finished)"); verify_file_down_checkbox.setDoubleBuffered(true); - use_mega_account_down_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + use_mega_account_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N use_mega_account_down_checkbox.setText("Use MEGA account for download/stream"); use_mega_account_down_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -637,15 +637,15 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - smart_proxy_url_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + smart_proxy_url_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N smart_proxy_url_label.setText("URL:"); - max_downloads_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + max_downloads_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_downloads_spinner.setDoubleBuffered(true); - use_mega_account_down_combobox.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N - change_download_dir_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + change_download_dir_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N change_download_dir_button.setText("Change it"); change_download_dir_button.setDoubleBuffered(true); change_download_dir_button.addActionListener(new java.awt.event.ActionListener() { @@ -654,24 +654,24 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - max_down_speed_label.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + max_down_speed_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_down_speed_label.setText("Max speed (KB/s):"); - megacrypter_reverse_port_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + megacrypter_reverse_port_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N megacrypter_reverse_port_label.setText("TCP Port:"); - default_dir_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + default_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N - smart_proxy_url_text.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + smart_proxy_url_text.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N - default_slots_down_label.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + default_slots_down_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_down_label.setText("Default slots per file:"); default_slots_down_label.setDoubleBuffered(true); - use_mega_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + use_mega_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N use_mega_label.setText("Mega account:"); - multi_slot_down_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N multi_slot_down_checkbox.setText("Use multi slot download mode (download restart needed)"); multi_slot_down_checkbox.setDoubleBuffered(true); multi_slot_down_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { @@ -680,17 +680,17 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - default_slots_down_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + default_slots_down_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_down_spinner.setDoubleBuffered(true); default_slots_down_spinner.setValue(2); - megacrypter_reverse_port_spinner.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + megacrypter_reverse_port_spinner.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N - down_dir_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + down_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N down_dir_label.setText("Default downloads directory:"); down_dir_label.setDoubleBuffered(true); - jLabel2.setFont(new java.awt.Font("Ubuntu", 2, 14)); // NOI18N + jLabel2.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N jLabel2.setText("Note: it is recomended to enable MULTI SLOT and be patient while MegaBasterd filters down proxies. MegaBasterd will try first to download chunk without proxy. (Use CTRL+V in order to paste URL)"); javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); @@ -845,22 +845,22 @@ public final class SettingsDialog extends javax.swing.JDialog { jTabbedPane1.addTab("Downloads", downloads_panel); - default_slots_up_label.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + default_slots_up_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_up_label.setText("Default slots per file:"); default_slots_up_label.setDoubleBuffered(true); - max_uploads_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + max_uploads_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N max_uploads_label.setText("Max parallel uploads:"); max_uploads_label.setDoubleBuffered(true); - default_slots_up_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + default_slots_up_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_up_spinner.setDoubleBuffered(true); default_slots_up_spinner.setValue(2); - max_uploads_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + max_uploads_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_uploads_spinner.setDoubleBuffered(true); - multi_slot_up_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + multi_slot_up_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N multi_slot_up_checkbox.setText("Use multi slot upload mode (upload restart needed)"); multi_slot_up_checkbox.setDoubleBuffered(true); multi_slot_up_checkbox.addActionListener(new java.awt.event.ActionListener() { @@ -869,12 +869,12 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - max_up_speed_label.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + max_up_speed_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_up_speed_label.setText("Max speed (KB/s):"); - max_up_speed_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + max_up_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N - limit_upload_speed_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + limit_upload_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N limit_upload_speed_checkbox.setText("Limit upload speed"); limit_upload_speed_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -882,7 +882,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - rec_upload_slots_label.setFont(new java.awt.Font("Ubuntu", 2, 16)); // NOI18N + rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N rec_upload_slots_label.setText("Note: MULTI-SLOT it's more robust against upload errors but it might be slower."); javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); @@ -947,7 +947,7 @@ public final class SettingsDialog extends javax.swing.JDialog { jTabbedPane1.addTab("Uploads", uploads_panel); - mega_accounts_table.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + mega_accounts_table.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N mega_accounts_table.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -969,11 +969,11 @@ public final class SettingsDialog extends javax.swing.JDialog { mega_accounts_table.setRowHeight(24); mega_accounts_scrollpane.setViewportView(mega_accounts_table); - mega_accounts_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + mega_accounts_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N mega_accounts_label.setText("Your MEGA accounts:"); mega_accounts_label.setDoubleBuffered(true); - remove_mega_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + remove_mega_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N remove_mega_account_button.setText("Remove selected"); remove_mega_account_button.setDoubleBuffered(true); remove_mega_account_button.setEnabled(false); @@ -983,7 +983,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - add_mega_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + add_mega_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N add_mega_account_button.setText("Add account"); add_mega_account_button.setDoubleBuffered(true); add_mega_account_button.addActionListener(new java.awt.event.ActionListener() { @@ -992,7 +992,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - encrypt_pass_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + encrypt_pass_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N encrypt_pass_checkbox.setText("Encrypt on disk sensitive information"); encrypt_pass_checkbox.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -1001,7 +1001,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); delete_all_accounts_button.setBackground(new java.awt.Color(255, 51, 0)); - delete_all_accounts_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + delete_all_accounts_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N delete_all_accounts_button.setForeground(new java.awt.Color(255, 255, 255)); delete_all_accounts_button.setText("RESET ACCOUNTS"); delete_all_accounts_button.addActionListener(new java.awt.event.ActionListener() { @@ -1011,7 +1011,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); unlock_accounts_button.setBackground(new java.awt.Color(0, 153, 51)); - unlock_accounts_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + unlock_accounts_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N unlock_accounts_button.setForeground(new java.awt.Color(255, 255, 255)); unlock_accounts_button.setText("Unlock accounts"); unlock_accounts_button.addActionListener(new java.awt.event.ActionListener() { @@ -1021,9 +1021,9 @@ public final class SettingsDialog extends javax.swing.JDialog { }); elc_accounts_scrollpane.setDoubleBuffered(true); - elc_accounts_scrollpane.setFont(new java.awt.Font("Ubuntu", 0, 12)); // NOI18N + elc_accounts_scrollpane.setFont(new java.awt.Font("Dialog", 0, 12)); // NOI18N - elc_accounts_table.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + elc_accounts_table.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N elc_accounts_table.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -1043,11 +1043,11 @@ public final class SettingsDialog extends javax.swing.JDialog { elc_accounts_table.setRowHeight(24); elc_accounts_scrollpane.setViewportView(elc_accounts_table); - elc_accounts_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + elc_accounts_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N elc_accounts_label.setText("Your ELC accounts:"); elc_accounts_label.setDoubleBuffered(true); - remove_elc_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + remove_elc_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N remove_elc_account_button.setText("Remove selected"); remove_elc_account_button.setDoubleBuffered(true); remove_elc_account_button.setEnabled(false); @@ -1057,7 +1057,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - add_elc_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + add_elc_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N add_elc_account_button.setText("Add account"); add_elc_account_button.setDoubleBuffered(true); add_elc_account_button.addActionListener(new java.awt.event.ActionListener() { @@ -1066,7 +1066,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - jLabel1.setFont(new java.awt.Font("Ubuntu", 2, 16)); // NOI18N + jLabel1.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N jLabel1.setText("Note: you can use a (optional) alias for your email addresses -> bob@supermail.com#bob_mail"); javax.swing.GroupLayout accounts_panelLayout = new javax.swing.GroupLayout(accounts_panel); @@ -1133,27 +1133,27 @@ public final class SettingsDialog extends javax.swing.JDialog { proxy_panel.setBorder(javax.swing.BorderFactory.createTitledBorder("Proxy settings")); - proxy_host_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + proxy_host_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N proxy_host_label.setText("Host:"); proxy_host_label.setDoubleBuffered(true); proxy_host_label.setEnabled(false); - proxy_host_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + proxy_host_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N proxy_host_textfield.setDoubleBuffered(true); proxy_host_textfield.setEnabled(false); proxy_host_textfield.addMouseListener(new ContextMenuMouseListener()); - proxy_port_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + proxy_port_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N proxy_port_label.setText("Port:"); proxy_port_label.setDoubleBuffered(true); proxy_port_label.setEnabled(false); - proxy_port_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + proxy_port_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N proxy_port_textfield.setDoubleBuffered(true); proxy_port_textfield.setEnabled(false); proxy_port_textfield.addMouseListener(new ContextMenuMouseListener()); - use_proxy_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + use_proxy_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N use_proxy_checkbox.setText("Use HTTP(S) PROXY (app restart required)"); use_proxy_checkbox.setDoubleBuffered(true); use_proxy_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { @@ -1162,28 +1162,28 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - proxy_warning_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N + proxy_warning_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N proxy_warning_label.setText("Warning: Megabasterd will use this proxy for ALL connections."); proxy_warning_label.setEnabled(false); proxy_auth_panel.setBorder(javax.swing.BorderFactory.createTitledBorder("Authentication")); - proxy_user_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + proxy_user_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N proxy_user_label.setText("Username:"); proxy_user_label.setDoubleBuffered(true); proxy_user_label.setEnabled(false); - proxy_user_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + proxy_user_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N proxy_user_textfield.setDoubleBuffered(true); proxy_user_textfield.setEnabled(false); proxy_user_textfield.addMouseListener(new ContextMenuMouseListener()); - proxy_pass_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + proxy_pass_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N proxy_pass_label.setText("Password:"); proxy_pass_label.setDoubleBuffered(true); proxy_pass_label.setEnabled(false); - proxy_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N + proxy_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N proxy_pass_textfield.setText("jPasswordField1"); proxy_pass_textfield.setEnabled(false); @@ -1276,7 +1276,7 @@ public final class SettingsDialog extends javax.swing.JDialog { jTabbedPane1.addTab("Advanced", jPanel1); - status.setFont(new java.awt.Font("Ubuntu", 3, 18)); // NOI18N + status.setFont(new java.awt.Font("Dialog", 3, 18)); // NOI18N status.setForeground(new java.awt.Color(51, 153, 255)); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); diff --git a/src/megabasterd/StreamerDialog.form b/src/megabasterd/StreamerDialog.form index 168a53160..8e743d5e6 100644 --- a/src/megabasterd/StreamerDialog.form +++ b/src/megabasterd/StreamerDialog.form @@ -63,7 +63,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/src/megabasterd/StreamerDialog.java b/src/megabasterd/StreamerDialog.java index 9329d60c4..fdafdc39f 100644 --- a/src/megabasterd/StreamerDialog.java +++ b/src/megabasterd/StreamerDialog.java @@ -3,6 +3,8 @@ package megabasterd; import java.awt.Dialog; import java.awt.event.WindowEvent; import static java.awt.event.WindowEvent.WINDOW_CLOSING; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.HashSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -91,12 +93,12 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Streamer"); - put_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + put_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N put_label.setText("Put your MEGA/MegaCrypter/ELC link here in order to get a streaming link:"); put_label.setDoubleBuffered(true); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -106,13 +108,13 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa } }); - original_link_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + original_link_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N original_link_textfield.setDoubleBuffered(true); - use_mega_account_down_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + use_mega_account_down_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N use_mega_account_down_label.setText("Use this account for streaming:"); - use_mega_account_down_combobox.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N use_mega_account_down_combobox.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { use_mega_account_down_comboboxItemStateChanged(evt); @@ -168,72 +170,76 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa @Override public void run() { - boolean error = false; + try { + boolean error = false; - String stream_link = null; + String stream_link = null; - String link = ((String) swingReflectionInvokeAndWaitForReturn("getText", original_link_textfield)).trim(); + String link = URLDecoder.decode((String) swingReflectionInvokeAndWaitForReturn("getText", original_link_textfield), "UTF-8").trim(); - if (link.length() > 0) { + if (link.length() > 0) { - try { + try { - if (findFirstRegex("://enc", link, 0) != null) { + if (findFirstRegex("://enc", link, 0) != null) { - link = CryptTools.decryptMegaDownloaderLink(link); + link = CryptTools.decryptMegaDownloaderLink(link); - } else if (findFirstRegex("://elc", link, 0) != null) { + } else if (findFirstRegex("://elc", link, 0) != null) { - HashSet links = CryptTools.decryptELC(link, ((MainPanelView) tthis.getParent()).getMain_panel()); + HashSet links = CryptTools.decryptELC(link, ((MainPanelView) tthis.getParent()).getMain_panel()); - if (links != null) { + if (links != null) { - link = (String) links.iterator().next(); + link = (String) links.iterator().next(); + } } + + } catch (Exception ex) { + + error = true; + + Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex); } - } catch (Exception ex) { + String data; - error = true; + if (findFirstRegex("://mega(\\.co)?\\.nz/#[^fF]", link, 0) != null || findFirstRegex("https?://[^/]+/![^!]+![0-9a-fA-F]+", link, 0) != null) { - Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex); - } + data = Bin2UrlBASE64(((_last_selected_account != null ? _last_selected_account : "") + "|" + link).getBytes()); - String data; + stream_link = "http://localhost:1337/video/" + data; - if (findFirstRegex("://mega(\\.co)?\\.nz/#[^fF]", link, 0) != null || findFirstRegex("https?://[^/]+/![^!]+![0-9a-fA-F]+", link, 0) != null) { + } else { - data = Bin2UrlBASE64(((_last_selected_account != null ? _last_selected_account : "") + "|" + link).getBytes()); - - stream_link = "http://localhost:1337/video/" + data; + error = true; + } } else { error = true; } - } else { + if (error) { - error = true; - } + JOptionPane.showMessageDialog(tthis, "Please, paste a Mega/MegaCrypter/ELC link!", "Error", JOptionPane.ERROR_MESSAGE); - if (error) { + swingReflectionInvoke("setText", original_link_textfield, ""); - JOptionPane.showMessageDialog(tthis, "Please, paste a Mega/MegaCrypter/ELC link!", "Error", JOptionPane.ERROR_MESSAGE); + swingReflectionInvoke("setEnabled", dance_button, true); - swingReflectionInvoke("setText", original_link_textfield, ""); + swingReflectionInvoke("setEnabled", original_link_textfield, true); - swingReflectionInvoke("setEnabled", dance_button, true); + } else { - swingReflectionInvoke("setEnabled", original_link_textfield, true); - - } else { - - _mainPanelView.getMain_panel().getClipboardspy().detachObserver((ClipboardChangeObserver) tthis); - copyTextToClipboard(stream_link); - JOptionPane.showMessageDialog(tthis, "Streaming link was copied to clipboard!\nRemember to keep MegaBasterd running in background while playing content. (I recommend to use MPLAYER)"); - dispose(); - getParent().dispatchEvent(new WindowEvent(tthis, WINDOW_CLOSING)); + _mainPanelView.getMain_panel().getClipboardspy().detachObserver((ClipboardChangeObserver) tthis); + copyTextToClipboard(stream_link); + JOptionPane.showMessageDialog(tthis, "Streaming link was copied to clipboard!\nRemember to keep MegaBasterd running in background while playing content. (I recommend to use MPLAYER)"); + dispose(); + getParent().dispatchEvent(new WindowEvent(tthis, WINDOW_CLOSING)); + } + } catch (UnsupportedEncodingException ex) { + Logger.getLogger(StreamerDialog.class.getName()).log(Level.SEVERE, null, ex); } } diff --git a/src/megabasterd/Upload.java b/src/megabasterd/Upload.java index 5eaa1b252..215527f8b 100644 --- a/src/megabasterd/Upload.java +++ b/src/megabasterd/Upload.java @@ -27,8 +27,8 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN public static final boolean USE_SLOTS_DEFAULT = false; public static final int WORKERS_DEFAULT = 6; private final MainPanel _main_panel; - private volatile UploadView _view = null; //lazy init - private volatile ProgressMeter _progress_meter = null; //lazy init + private volatile UploadView _view; + private volatile ProgressMeter _progress_meter; private String _exit_message; private String _dir_name; private volatile boolean _exit; @@ -97,7 +97,8 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN _partialProgressQueue = new ConcurrentLinkedQueue<>(); _rejectedChunkIds = new ConcurrentLinkedQueue<>(); _thread_pool = Executors.newCachedThreadPool(); - + _view = new UploadView(this); + _progress_meter = new ProgressMeter(this); } public Object getWorkers_lock() { @@ -270,45 +271,13 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN @Override public ProgressMeter getProgress_meter() { - ProgressMeter result = _progress_meter; - - if (result == null) { - - synchronized (this) { - - result = _progress_meter; - - if (result == null) { - - _progress_meter = result = new ProgressMeter(this); - - } - } - } - - return result; + return this._progress_meter; } @Override public UploadView getView() { - UploadView result = _view; - - if (result == null) { - - synchronized (this) { - - result = _view; - - if (result == null) { - - _view = result = new UploadView(this); - - } - } - } - - return result; + return this._view; } @Override @@ -631,7 +600,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN @Override public void run() { - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader hello!", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader hello! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); swingReflectionInvoke("setVisible", getView().getClose_button(), false); @@ -640,7 +609,18 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN if (!_exit) { if (_ul_url == null) { - _ul_url = _ma.initUploadFile(_file_name); + int conta_error = 0; + + do { + _ul_url = _ma.initUploadFile(_file_name); + long wait_time = MiscTools.getWaitTimeExpBackOff(++conta_error); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader {1} Upload URL is null, retrying in {2} secs...", new Object[]{Thread.currentThread().getName(), this.getFile_name(), wait_time}); + try { + Thread.sleep(wait_time * 1000); + } catch (InterruptedException ex) { + Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, null, ex); + } + } while (_ul_url == null); try { @@ -690,7 +670,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN _chunkworkers.add(c); - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Starting chunkuploader{1} ...", new Object[]{Thread.currentThread().getName(), t}); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Starting chunkuploader {1} ...", new Object[]{Thread.currentThread().getName(), t}); _thread_pool.execute(c); } @@ -729,7 +709,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN _thread_pool.shutdown(); - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Chunkuploaders finished!", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Chunkuploaders finished! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); getProgress_meter().setExit(true); @@ -737,7 +717,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN try { - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0}Waiting for all threads to finish...", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0}Waiting for all threads to finish {1}...", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); _thread_pool.awaitTermination(MAX_WAIT_WORKERS_SHUTDOWN, TimeUnit.SECONDS); @@ -747,12 +727,12 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN if (!_thread_pool.isTerminated()) { - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Closing thread pool in ''mecag\u00fcen'' style...", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Closing thread pool in ''mecag\u00fcen'' style {1}...", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); _thread_pool.shutdownNow(); } - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader thread pool finished!", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader thread pool finished! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); getMain_panel().getGlobal_up_speed().detachTransference(this); @@ -764,6 +744,8 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN if (_completion_handle != null) { + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader creating NEW MEGA NODE {1}...", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); + printStatus("Creating new MEGA node ... ***DO NOT EXIT MEGABASTERD NOW***"); File f = new File(_file_name); @@ -868,7 +850,6 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN } catch (SQLException ex) { Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex); } - } getMain_panel().getUpload_manager().getTransference_running_list().remove(this); @@ -888,7 +869,9 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN swingReflectionInvoke("setVisible", getView().getRestart_button(), true); } - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader BYE BYE", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader finished with message -> {1} {2}...", new Object[]{Thread.currentThread().getName(), _exit_message, this.getFile_name()}); + + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader {1} BYE BYE", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); } public void pause_worker() { diff --git a/src/megabasterd/UploadMACGenerator.java b/src/megabasterd/UploadMACGenerator.java index 6faa195e2..c81080463 100644 --- a/src/megabasterd/UploadMACGenerator.java +++ b/src/megabasterd/UploadMACGenerator.java @@ -115,6 +115,8 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot _upload.getView().printStatusNormal("Finishing FILE MAC calculation... ***DO NOT EXIT MEGABASTERD NOW***"); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Macgenerator {1} Finishing FILE MAC calculation...", new Object[]{Thread.currentThread().getName(), this.getUpload().getFile_name()}); + swingReflectionInvokeAndWait("setEnabled", _upload.getView().getPause_button(), false); upload_workers_finish = true; @@ -169,7 +171,7 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot temp_file_data = (String.valueOf(_bytes_read) + "|" + Bin2BASE64(i32a2bin(file_mac))); - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Macgenerator -> {1} {2} {3}", new Object[]{Thread.currentThread().getName(), temp_file_data, _upload.calculateLastUploadedChunk(_bytes_read), _last_chunk_id_read}); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Macgenerator -> {1} {2} {3} {4}", new Object[]{Thread.currentThread().getName(), temp_file_data, _upload.calculateLastUploadedChunk(_bytes_read), _last_chunk_id_read, this.getUpload().getFile_name()}); temp_file_out = new FileOutputStream(temp_file); @@ -181,7 +183,7 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot } if (!_exit && (!_upload.isStopped() || !_upload.getChunkworkers().isEmpty()) && (_bytes_read < _upload.getFile_size() || (_upload.getFile_size() == 0 && _last_chunk_id_read < 1))) { - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} {1}/{2} METAMAC wait...", new Object[]{Thread.currentThread().getName(), _bytes_read, _upload.getFile_size()}); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} {1}/{2} METAMAC wait {3}...", new Object[]{Thread.currentThread().getName(), _bytes_read, _upload.getFile_size(), this.getUpload().getFile_name()}); secureWait(); } } @@ -197,7 +199,7 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot _upload.secureNotify(); - Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} MAC GENERATOR BYE BYE...", Thread.currentThread().getName()); + Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} MAC GENERATOR {1} BYE BYE...", new Object[]{Thread.currentThread().getName(), this.getUpload().getFile_name()}); } catch (Exception ex) { Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex); diff --git a/src/megabasterd/UploadManager.java b/src/megabasterd/UploadManager.java index 7d7171441..7ef62e437 100644 --- a/src/megabasterd/UploadManager.java +++ b/src/megabasterd/UploadManager.java @@ -73,25 +73,23 @@ public final class UploadManager extends TransferenceManager { getTransference_finished_queue().remove(u); - if (((Upload) u).isProvision_ok()) { + _total_transferences_size -= u.getFile_size(); - _total_transferences_size -= u.getFile_size(); + delete_up.add(new String[]{u.getFile_name(), ((Upload) u).getMa().getFull_email()}); - delete_up.add(new String[]{u.getFile_name(), ((Upload) u).getMa().getFull_email()}); + try { - try { + File temp_file = new File("." + HashString("SHA-1", u.getFile_name())); - File temp_file = new File("." + HashString("SHA-1", u.getFile_name())); + if (temp_file.exists()) { - if (temp_file.exists()) { - - temp_file.delete(); - } - - } catch (UnsupportedEncodingException | NoSuchAlgorithmException ex) { - Logger.getLogger(getClass().getName()).log(SEVERE, null, ex); + temp_file.delete(); } + + } catch (UnsupportedEncodingException | NoSuchAlgorithmException ex) { + Logger.getLogger(getClass().getName()).log(SEVERE, null, ex); } + } try { diff --git a/src/megabasterd/UploadView.form b/src/megabasterd/UploadView.form index 9af12ba26..5c4f28c74 100644 --- a/src/megabasterd/UploadView.form +++ b/src/megabasterd/UploadView.form @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/src/megabasterd/UploadView.java b/src/megabasterd/UploadView.java index 56b1fc235..9c3245d28 100644 --- a/src/megabasterd/UploadView.java +++ b/src/megabasterd/UploadView.java @@ -113,15 +113,15 @@ public final class UploadView extends javax.swing.JPanel implements Transference setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 4, true)); - status_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + status_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N status_label.setText("status"); status_label.setDoubleBuffered(true); - slots_label.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + slots_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N slots_label.setText("Slots"); slots_label.setDoubleBuffered(true); - slots_spinner.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N + slots_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N slots_spinner.setToolTipText("Slots"); slots_spinner.setDoubleBuffered(true); slots_spinner.addChangeListener(new javax.swing.event.ChangeListener() { @@ -130,16 +130,16 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - speed_label.setFont(new java.awt.Font("Ubuntu", 3, 26)); // NOI18N + speed_label.setFont(new java.awt.Font("Dialog", 3, 26)); // NOI18N speed_label.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); speed_label.setText("speed"); speed_label.setDoubleBuffered(true); - progress_pbar.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N + progress_pbar.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N progress_pbar.setDoubleBuffered(true); pause_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + pause_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N pause_button.setForeground(java.awt.Color.white); pause_button.setText("PAUSE UPLOAD"); pause_button.setDoubleBuffered(true); @@ -150,7 +150,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference }); stop_button.setBackground(new java.awt.Color(255, 0, 0)); - stop_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + stop_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N stop_button.setForeground(java.awt.Color.white); stop_button.setText("CANCEL UPLOAD"); stop_button.setDoubleBuffered(true); @@ -160,12 +160,12 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - file_name_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + file_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N file_name_label.setForeground(new java.awt.Color(51, 51, 255)); file_name_label.setText("file_name"); file_name_label.setDoubleBuffered(true); - close_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + close_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N close_button.setText("Close"); close_button.setDoubleBuffered(true); close_button.addActionListener(new java.awt.event.ActionListener() { @@ -175,7 +175,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference }); restart_button.setBackground(new java.awt.Color(51, 51, 255)); - restart_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + restart_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N restart_button.setForeground(new java.awt.Color(255, 255, 255)); restart_button.setText("Restart"); restart_button.setDoubleBuffered(true); @@ -185,7 +185,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - file_size_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N + file_size_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N file_size_label.setForeground(new java.awt.Color(51, 51, 255)); file_size_label.setText("file_size"); file_size_label.setDoubleBuffered(true); @@ -193,7 +193,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference slot_status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N slot_status_label.setDoubleBuffered(true); - folder_link_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + folder_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N folder_link_button.setText("Copy folder link"); folder_link_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -201,7 +201,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - file_link_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N + file_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N file_link_button.setText("Copy file link"); file_link_button.setEnabled(false); file_link_button.addActionListener(new java.awt.event.ActionListener() { @@ -398,7 +398,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference @Override public void updateProgressBar(long progress, double bar_rate) { - swingReflectionInvoke("setValue", progress_pbar, (int) Math.ceil(bar_rate * progress)); + swingReflectionInvokeAndWait("setValue", progress_pbar, (int) Math.ceil(bar_rate * progress)); } @Override