mirror of
https://github.com/tonikelope/megabasterd.git
synced 2025-05-13 04:47:12 +02:00
2.99
This commit is contained in:
parent
69c049a1f6
commit
43b74e9924
2
pom.xml
2
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.tonikelope</groupId>
|
<groupId>com.tonikelope</groupId>
|
||||||
<artifactId>MegaBasterd</artifactId>
|
<artifactId>MegaBasterd</artifactId>
|
||||||
<version>2.98</version>
|
<version>2.99</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -44,7 +44,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
|
|||||||
|
|
||||||
public static final boolean VERIFY_CBC_MAC_DEFAULT = false;
|
public static final boolean VERIFY_CBC_MAC_DEFAULT = false;
|
||||||
public static final boolean USE_SLOTS_DEFAULT = true;
|
public static final boolean USE_SLOTS_DEFAULT = true;
|
||||||
public static final int WORKERS_DEFAULT = 8;
|
public static final int WORKERS_DEFAULT = 4;
|
||||||
public static final boolean USE_MEGA_ACCOUNT_DOWN = false;
|
public static final boolean USE_MEGA_ACCOUNT_DOWN = false;
|
||||||
public static final int CHUNK_SIZE_MULTI = 10;
|
public static final int CHUNK_SIZE_MULTI = 10;
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
|
|||||||
*/
|
*/
|
||||||
public final class MainPanel {
|
public final class MainPanel {
|
||||||
|
|
||||||
public static final String VERSION = "2.98";
|
public static final String VERSION = "2.99";
|
||||||
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
|
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
|
||||||
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
|
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
|
||||||
public static final int STREAMER_PORT = 1337;
|
public static final int STREAMER_PORT = 1337;
|
||||||
|
@ -600,7 +600,7 @@
|
|||||||
</Group>
|
</Group>
|
||||||
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
|
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace min="0" pref="612" max="32767" attributes="0"/>
|
<EmptySpace min="0" pref="551" max="32767" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace max="-2" attributes="0"/>
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
@ -727,7 +727,7 @@
|
|||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Dialog" size="14" style="2"/>
|
<Font name="Dialog" size="14" style="2"/>
|
||||||
</Property>
|
</Property>
|
||||||
<Property name="text" type="java.lang.String" value="Note: MULTI-SLOT is required if you want to resume uploads."/>
|
<Property name="text" type="java.lang.String" value="Note: MULTI-SLOT is required if you want to exit and resume uploads."/>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
|
@ -916,7 +916,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
|
|||||||
});
|
});
|
||||||
|
|
||||||
rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N
|
rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N
|
||||||
rec_upload_slots_label.setText("Note: MULTI-SLOT is required if you want to resume uploads.");
|
rec_upload_slots_label.setText("Note: MULTI-SLOT is required if you want to exit and resume uploads.");
|
||||||
|
|
||||||
javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel);
|
javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel);
|
||||||
uploads_panel.setLayout(uploads_panelLayout);
|
uploads_panel.setLayout(uploads_panelLayout);
|
||||||
@ -949,7 +949,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
|
|||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(limit_upload_speed_checkbox))
|
.addComponent(limit_upload_speed_checkbox))
|
||||||
.addGap(0, 612, Short.MAX_VALUE)))
|
.addGap(0, 551, Short.MAX_VALUE)))
|
||||||
.addContainerGap())))
|
.addContainerGap())))
|
||||||
);
|
);
|
||||||
uploads_panelLayout.setVerticalGroup(
|
uploads_panelLayout.setVerticalGroup(
|
||||||
@ -1424,8 +1424,6 @@ public final class SettingsDialog extends javax.swing.JDialog {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
_settings_ok = true;
|
|
||||||
|
|
||||||
if (proxy_host_textfield.getText().isEmpty()) {
|
if (proxy_host_textfield.getText().isEmpty()) {
|
||||||
|
|
||||||
use_proxy_checkbox.setSelected(false);
|
use_proxy_checkbox.setSelected(false);
|
||||||
@ -1783,6 +1781,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
|
|||||||
public void run() {
|
public void run() {
|
||||||
status.setText("");
|
status.setText("");
|
||||||
JOptionPane.showMessageDialog(tthis, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE);
|
JOptionPane.showMessageDialog(tthis, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
_settings_ok = true;
|
||||||
setVisible(false);
|
setVisible(false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -1793,6 +1792,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
JOptionPane.showMessageDialog(this, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE);
|
JOptionPane.showMessageDialog(this, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
_settings_ok = true;
|
||||||
setVisible(false);
|
setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1867,6 +1867,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
|
|||||||
|
|
||||||
JOptionPane.showMessageDialog(this, "Settings successfully imported!", "Settings imported", JOptionPane.INFORMATION_MESSAGE);
|
JOptionPane.showMessageDialog(this, "Settings successfully imported!", "Settings imported", JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
|
||||||
|
_settings_ok = true;
|
||||||
|
|
||||||
setVisible(false);
|
setVisible(false);
|
||||||
|
|
||||||
} catch (SQLException | ClassNotFoundException ex) {
|
} catch (SQLException | ClassNotFoundException ex) {
|
||||||
|
@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
|
|||||||
public interface Transference {
|
public interface Transference {
|
||||||
|
|
||||||
int MIN_WORKERS = 2;
|
int MIN_WORKERS = 2;
|
||||||
int MAX_WORKERS = 40;
|
int MAX_WORKERS = 30;
|
||||||
int MAX_SIM_TRANSFERENCES = 30;
|
int MAX_SIM_TRANSFERENCES = 30;
|
||||||
int SIM_TRANSFERENCES_DEFAULT = 4;
|
int SIM_TRANSFERENCES_DEFAULT = 4;
|
||||||
boolean LIMIT_TRANSFERENCE_SPEED_DEFAULT = false;
|
boolean LIMIT_TRANSFERENCE_SPEED_DEFAULT = false;
|
||||||
|
@ -25,7 +25,7 @@ import static com.tonikelope.megabasterd.MainPanel.*;
|
|||||||
public final class Upload implements Transference, Runnable, SecureSingleThreadNotifiable {
|
public final class Upload implements Transference, Runnable, SecureSingleThreadNotifiable {
|
||||||
|
|
||||||
public static final boolean USE_SLOTS_DEFAULT = true;
|
public static final boolean USE_SLOTS_DEFAULT = true;
|
||||||
public static final int WORKERS_DEFAULT = 8;
|
public static final int WORKERS_DEFAULT = 4;
|
||||||
public static final int CHUNK_SIZE_MULTI = 10;
|
public static final int CHUNK_SIZE_MULTI = 10;
|
||||||
private final MainPanel _main_panel;
|
private final MainPanel _main_panel;
|
||||||
private volatile UploadView _view;
|
private volatile UploadView _view;
|
||||||
@ -657,15 +657,6 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
|
|||||||
|
|
||||||
Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader hello! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()});
|
Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader hello! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()});
|
||||||
|
|
||||||
swingInvoke(
|
|
||||||
new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
|
|
||||||
getView().getClose_button().setVisible(false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
getView().printStatusNormal("Starting upload, please wait...");
|
getView().printStatusNormal("Starting upload, please wait...");
|
||||||
|
|
||||||
if (!_exit) {
|
if (!_exit) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user