From 51f54711f7654e8735ca65cf8fc6d2ae42ce5b5d Mon Sep 17 00:00:00 2001 From: tonikelope Date: Wed, 6 Dec 2017 21:42:28 +0100 Subject: [PATCH] 2.50 --- ...Copia en conflicto de lacueva 2017-12-06).db | Bin 0 -> 15360 bytes src/megabasterd/Download.java | 1 - src/megabasterd/FolderLinkDialog.form | 5 ++++- src/megabasterd/FolderLinkDialog.java | 3 ++- src/megabasterd/GlobalSpeedMeter.java | 6 +++--- src/megabasterd/MainPanel.java | 2 +- src/megabasterd/ProgressMeter.java | 4 +++- src/megabasterd/SettingsDialog.form | 4 ++-- src/megabasterd/SettingsDialog.java | 4 ++-- 9 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 megabasterd (Copia en conflicto de lacueva 2017-12-06).db diff --git a/megabasterd (Copia en conflicto de lacueva 2017-12-06).db b/megabasterd (Copia en conflicto de lacueva 2017-12-06).db new file mode 100644 index 0000000000000000000000000000000000000000..16e9296e4b5da50c731746a9e89ee2e05107ada8 GIT binary patch literal 15360 zcmeHOO>Eo96((n7Ge0Y5y-rs3rm3|sTuCd-A|=a`vQe|LSM~2Ewjw);P?V*lkw}{& z6%J)f0SZ(Idg+1aDLobaIqh+eJ@n9PkNr9HRPJ3~`4xrwtzvm0Pt zj%8@xoA-wAeKYeYa^BqA*-}gtZt6x`GQ(*mzyQF!7Y;KFXfq6Rh5S2({g_k&LyCN} zuKFoe(nsR2m&d3u{DjH`;U}yP`e1|k6Z`J_>oF16{W7J z+qBq5ElHH>b-k;ZSQI?upQ!pky-O$+oD)3 zF+LtDUOx>B#~U%_RJg?0S;PfLe0*@ga-o?S_Q{+LTth$7Z0JT6-~n&Mj-FuTMy?~7 zvg7H{Hy3#VC2hpYV??~Zx4wF(^nQ4GeKov(hfD|B)R8bA&6uS{f{xvrj(Q!%K;9PD z^dX26vs_?Oa~xeV(y^ET$3vx=)36*lC#FW#fB?>>B8*hX%6lykr0dVUs$aAo{Wc!~ zAAxg)z$NO9zy8nFnEKB62%HrGfBl~oDPPV<;QS%r|NcLJW9ob4BXCv({QLh|k@Dqy z1kN7<{`x==5lFVdZ#pml3RcQG=8*1IFRqZ?+>x;dg{ z9h(zY9?nb>Nzv{@(`73ch!3*3Eg9x9PbB+7vT1hk&16#35jG{PXord^HS~qL-cH(z z3mv(0yIT;Jz9|=$GJHChuGO;n=8}|e@{JT)%GC3zTq>7sO0|5wju6UZ7ALJNoSkxA zsgLlCwFC>-=)P&)=yy!A0cfB@WKjEv^?6dJtqe?0Jx79QU$qutl5y|4igat~Eh`PP zwv*2^Y5G+w1rt}=QcpbI*AsCEp++WT2~e0+m9}Df8Z`Y)i-&@(Fx<9sRHm&Y%s49E zCaSam6H~+!rP;S_66vlSG5Ly>fU~a4}- z=3>%o681GK1{0GF)RelaIg%InkQF5!dHGaD;1gB^CW^xr$`c!kk(Bi|N}9T+93WNi zpyc}q*CnGR;p9MpiBem_bbRQn6J-g@8TsLAX_K!R{c`hQxn9Ofny*$j`D$jp5NBbc z;8wtrYW9wj@$B7NDP1XM+d>_0X>u1I6$ z_s#^Iv3YhN;_`37tW7?%*17am7zeI+Ln9lPdmYZYnOyb?d>b4`R2o6KTPHM)LEO78 zn#_H!a6;3F%H6yH3*b5N$&O&$($`@6d97ULO_;PBhWR6QnBW$vc_+~ca|sI73FA2S zaH%(7#O6{+>?{OsJ_H31%MseQ0fa`g)Th4D6bIY<(xxX*%rv*jtAIN*HjphSwSGwDZE0uZyl@Pz**x27w zcgjaPznJDXA63kfd8n+%E4yZGxoh&$qYVG;`g)<9&F}U5tyQhxf1Fcyc4`e(ky^+1 ze-{3QAs@f^2>1w`GX!Sf3j2a^1A-(KH^Ax)_z?aUK7G}>xt{~}OXU9&w|?U1|Gvun zU-&8WT|fW#E0q5W$?6LP!6I{keZs)sk!Sx~@G`(4$39{0Wc|-soqqEdgTUcsE;KjC z4w80eJ5uYzhf?gWPk8d%-7Qi2BXjLDaKuHyLl|0x5Xele5T@5M*JN8n`!XQXP z9+tbt0!H!G$Bn&uPTwfDaJ|^mx7C%E{bHfO@2qWXsmAt((rs1ymAk!aFP&fAtyNc& zojdo}s{6f-BfYYQHc1D<&OQFF*4gIoALLSaZA&iq8}$7@3;)TGk6(NQd<4!r0uyld IqARZa7xMRR8vp - + @@ -186,6 +186,9 @@ + + + diff --git a/src/megabasterd/FolderLinkDialog.java b/src/megabasterd/FolderLinkDialog.java index bdab93c5a..93973729f 100644 --- a/src/megabasterd/FolderLinkDialog.java +++ b/src/megabasterd/FolderLinkDialog.java @@ -147,6 +147,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); + 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() { @@ -197,7 +198,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { .addComponent(folder_link_label) .addComponent(restore_button)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE) + .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 381, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(total_space_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) diff --git a/src/megabasterd/GlobalSpeedMeter.java b/src/megabasterd/GlobalSpeedMeter.java index db1337e6d..efbebcb64 100644 --- a/src/megabasterd/GlobalSpeedMeter.java +++ b/src/megabasterd/GlobalSpeedMeter.java @@ -77,15 +77,15 @@ public final class GlobalSpeedMeter implements Runnable { double current_speed = (progress - last_progress) / sleep_time; - last_progress = progress; - - sp = Math.round(current_speed); + sp = last_progress > 0 ? Math.round(current_speed) : 0; if (sp > 0) { transference.getView().updateSpeed(formatBytes(sp) + "/s", true); } + last_progress = progress; + no_data_count = 0; } else { diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java index c21518b1d..9aeea8200 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.49"; + public static final String VERSION = "2.50"; 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/ProgressMeter.java b/src/megabasterd/ProgressMeter.java index 4aef640c9..9555cc32b 100644 --- a/src/megabasterd/ProgressMeter.java +++ b/src/megabasterd/ProgressMeter.java @@ -16,7 +16,7 @@ public final class ProgressMeter implements Runnable, SecureSingleThreadNotifiab _notified = false; _secure_notify_lock = new Object(); _transference = transference; - _progress = transference.getProgress(); + _progress = 0; _exit = false; } @@ -56,6 +56,8 @@ public final class ProgressMeter implements Runnable, SecureSingleThreadNotifiab public void run() { Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} ProgressMeter hello!", Thread.currentThread().getName()); + _progress = _transference.getProgress(); + while (!_exit || !_transference.getPartialProgress().isEmpty()) { Integer reads; diff --git a/src/megabasterd/SettingsDialog.form b/src/megabasterd/SettingsDialog.form index 7a54e11e0..04cbbe774 100644 --- a/src/megabasterd/SettingsDialog.form +++ b/src/megabasterd/SettingsDialog.form @@ -574,7 +574,7 @@ - + @@ -701,7 +701,7 @@ - + diff --git a/src/megabasterd/SettingsDialog.java b/src/megabasterd/SettingsDialog.java index afea1dae5..81e5e7b60 100644 --- a/src/megabasterd/SettingsDialog.java +++ b/src/megabasterd/SettingsDialog.java @@ -897,7 +897,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.setText("Note: MULTI-SLOT it's more robust against upload errors but it might be slower."); + rec_upload_slots_label.setText("Note: MULTI-SLOT seems to be more robust against upload errors but it might be slower."); javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); uploads_panel.setLayout(uploads_panelLayout); @@ -930,7 +930,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGap(3, 3, 3) .addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(limit_upload_speed_checkbox)) - .addGap(0, 321, Short.MAX_VALUE))) + .addGap(0, 255, Short.MAX_VALUE))) .addContainerGap()))) ); uploads_panelLayout.setVerticalGroup(