3.8

tonikelope · Mar 25, 2018 · 4698b44 · 4698b44
1 parent fd342f1
commit 4698b44
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>3.7</version>
+    <version>3.8</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
@@ -185,7 +185,7 @@ public void run() {
 
                             } else {
 
-                                byte[] buffer = new byte[THROTTLE_SLICE_SIZE];
+                                byte[] buffer = new byte[DEFAULT_BYTE_BUFFER_SIZE];
 
                                 int reads;
 

diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java
@@ -105,7 +105,7 @@ public void run() {
 
                         if (!isExit() && !getDownload().isStopped() && is != null) {
 
-                            byte[] buffer = new byte[THROTTLE_SLICE_SIZE];
+                            byte[] buffer = new byte[DEFAULT_BYTE_BUFFER_SIZE];
 
                             int reads;
 

diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java b/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java
@@ -123,7 +123,7 @@ public void run() {
 
                 f.seek(chunk.getOffset());
 
-                byte[] buffer = new byte[MainPanel.THROTTLE_SLICE_SIZE];
+                byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
 
                 do {
 

diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkUploaderMono.java b/src/main/java/com/tonikelope/megabasterd/ChunkUploaderMono.java
@@ -63,7 +63,7 @@ public void run() {
 
                 f.seek(chunk.getOffset());
 
-                byte[] buffer = new byte[MainPanel.THROTTLE_SLICE_SIZE];
+                byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
 
                 do {
 

diff --git a/src/main/java/com/tonikelope/megabasterd/Download.java b/src/main/java/com/tonikelope/megabasterd/Download.java
@@ -33,6 +33,7 @@
 import static com.tonikelope.megabasterd.CryptTools.*;
 import static com.tonikelope.megabasterd.DBTools.*;
 import static com.tonikelope.megabasterd.MainPanel.*;
+import java.io.BufferedInputStream;
 
 /**
  *
@@ -1173,7 +1174,7 @@ private boolean verifyFileCBCMAC(String filename) throws FileNotFoundException,
 
         Cipher cryptor = genCrypter("AES", "AES/CBC/NoPadding", _chunkwriter.getByte_file_key(), i32a2bin(cbc_iv));
 
-        try (FileInputStream is = new FileInputStream(new File(filename))) {
+        try (BufferedInputStream is = new BufferedInputStream(new FileInputStream(filename))) {
 
             long chunk_id = 1L;
             long tot = 0L;

diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -48,7 +48,7 @@
  */
 public final class MainPanel {
 
-    public static final String VERSION = "3.7";
+    public static final String VERSION = "3.8";
     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/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java
@@ -107,7 +107,7 @@ public void run() {
 
                     int reads, http_status;
 
-                    byte[] buffer = new byte[THROTTLE_SLICE_SIZE];
+                    byte[] buffer = new byte[DEFAULT_BYTE_BUFFER_SIZE];
 
                     StreamChunk chunk_stream = new StreamChunk(offset, _chunkwriter.calculateChunkSize(offset), url);
 

diff --git a/src/main/java/com/tonikelope/megabasterd/UploadMACGenerator.java b/src/main/java/com/tonikelope/megabasterd/UploadMACGenerator.java
@@ -9,7 +9,7 @@
 import javax.crypto.IllegalBlockSizeException;
 import static com.tonikelope.megabasterd.CryptTools.*;
 import static com.tonikelope.megabasterd.MiscTools.*;
-import java.io.File;
+import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 
 /**
@@ -99,7 +99,7 @@ public void run() {
 
                 Cipher cryptor = genCrypter("AES", "AES/CBC/NoPadding", _upload.getByte_file_key(), i32a2bin(mac_iv));
 
-                try (FileInputStream is = new FileInputStream(new File(_upload.getFile_name()))) {
+                try (BufferedInputStream is = new BufferedInputStream(new FileInputStream(_upload.getFile_name()))) {
 
                     long chunk_id = 1L;
                     long tot = 0L;
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,7 +123,7 @@ public void run() { @@
                     f.seek(chunk.getOffset());
-                    byte[] buffer = new byte[MainPanel.THROTTLE_SLICE_SIZE];
+                    byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
                     do {
@@ Expand Down @@