Skip to content

Commit

Permalink
8.4
Browse files Browse the repository at this point in the history 
SmartProxy ban time optimization
Resume downloads/uploads fix
GUI minor fixes
  • Loading branch information
tonikelope committed Oct 23, 2023
1 parent 9f9a1fc commit 78beea1
Show file tree
Hide file tree
Showing 10 changed files with 126 additions and 125 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId>
<version>8.3</version>
<version>8.4</version>
<packaging>jar</packaging>
<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tonikelope/megabasterd/ChunkUploader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public void run() {
} else if (tot_bytes_up == chunk_size || reads == -1) {

if (_upload.getProgress() == _upload.getFile_size()) {
_upload.getView().printStatusNormal("Waiting for completion handler ... ***DO NOT EXIT MEGABASTERD NOW***");
_upload.getView().printStatusWarning("Waiting for completion handler ... ***DO NOT EXIT MEGABASTERD NOW***");
_upload.getView().getPause_button().setEnabled(false);
}

Expand Down
32 changes: 8 additions & 24 deletions src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,6 @@
</Layout>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanel1">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Files">
<Font PropertyName="font" name="Noto Sans" size="18" style="0"/>
</TitledBorder>
</Border>
</Property>
</Properties>

<Layout>
<DimensionLayout dim="0">
Expand All @@ -88,7 +79,7 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="file_tree_scrollpane" alignment="0" pref="165" max="32767" attributes="0"/>
<Component id="file_tree_scrollpane" alignment="0" pref="236" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
Expand Down Expand Up @@ -121,19 +112,12 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel2">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Upload info"/>
</Border>
</Property>
</Properties>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="upload_log_checkbox" min="-2" max="-2" attributes="0"/>
Expand Down Expand Up @@ -162,7 +146,7 @@
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand All @@ -174,11 +158,11 @@
<Component id="dir_name_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="dir_name_textfield" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="account_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="account_combobox" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="copy_email_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="account_combobox" max="32767" attributes="0"/>
<Component id="copy_email_button" alignment="3" min="-2" pref="38" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="used_space_label" min="-2" max="-2" attributes="0"/>
Expand All @@ -192,7 +176,7 @@
<Component id="upload_log_checkbox" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="priority_checkbox" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -354,7 +338,7 @@
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="0" red="0" type="rgb"/>
</Property>
<Property name="text" type="java.lang.String" value="[0 B]"/>
<Property name="text" type="java.lang.String" value="[---]"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
Expand Down
24 changes: 8 additions & 16 deletions src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,6 @@ public FileGrabberDialog(MainPanelView parent, boolean modal, List<File> files)

updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());

updateTitledBorderFont(((javax.swing.border.TitledBorder) jPanel1.getBorder()), GUI_FONT, _main_panel.getZoom_factor());

updateTitledBorderFont(((javax.swing.border.TitledBorder) jPanel2.getBorder()), GUI_FONT, _main_panel.getZoom_factor());

translateLabels(this);

jPanel1.setDropTarget(
Expand Down Expand Up @@ -270,8 +266,6 @@ private void initComponents() {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("File Grabber");

jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Files", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Noto Sans", 0, 18))); // NOI18N

file_tree.setBorder(null);
file_tree.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
javax.swing.tree.DefaultMutableTreeNode treeNode1 = new javax.swing.tree.DefaultMutableTreeNode("root");
Expand All @@ -289,11 +283,9 @@ private void initComponents() {
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 165, Short.MAX_VALUE)
.addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 236, Short.MAX_VALUE)
);

jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Upload info"));

dir_name_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
dir_name_label.setText("Upload name:");
dir_name_label.setDoubleBuffered(true);
Expand Down Expand Up @@ -370,7 +362,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
.addGap(0, 0, 0)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addComponent(upload_log_checkbox)
Expand All @@ -392,7 +384,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(account_combobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(copy_email_button)))))
.addContainerGap())
.addGap(0, 0, 0))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Expand All @@ -401,11 +393,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(dir_name_label)
.addComponent(dir_name_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(account_label)
.addComponent(account_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(copy_email_button))
.addComponent(account_combobox)
.addComponent(copy_email_button, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(used_space_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
Expand All @@ -416,7 +408,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(upload_log_checkbox)
.addComponent(priority_checkbox))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);

dance_button.setBackground(new java.awt.Color(102, 204, 255));
Expand All @@ -433,7 +425,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

total_file_size_label.setFont(new java.awt.Font("Dialog", 1, 32)); // NOI18N
total_file_size_label.setForeground(new java.awt.Color(0, 0, 255));
total_file_size_label.setText("[0 B]");
total_file_size_label.setText("[---]");
total_file_size_label.setDoubleBuffered(true);
total_file_size_label.setEnabled(false);

Expand Down
Loading

0 comments on commit 78beea1

Please sign in to comment.