7.96

CHUNKWRITER joining chunks improving and bug fix MUST UPGRADE
Numpo · Oct 19, 2023 · f54614b · f54614b
1 parent 754ae6a
commit f54614b
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 147 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>7.95</version>
+ <version>7.96</version>
  <packaging>jar</packaging>
  <repositories>
  <repository>

diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkWriterManager.java b/src/main/java/com/tonikelope/megabasterd/ChunkWriterManager.java
@@ -143,7 +143,7 @@ public long getLast_chunk_id_written() {
 
  private String _create_chunks_temp_dir() {
 
- File chunks_temp_dir = new File((_download.getCustom_chunks_dir() != null ? _download.getCustom_chunks_dir() : _download.getDownload_path()) + "/.mb_chunks_" + _download.getFile_key());
+ File chunks_temp_dir = new File((_download.getCustom_chunks_dir() != null ? _download.getCustom_chunks_dir() : _download.getDownload_path()) + "/.MEGABASTERD_CHUNKS_" + MiscTools.HashString("sha1", _download.getUrl()));
 
  chunks_temp_dir.mkdirs();
 
@@ -159,6 +159,19 @@ public void delete_chunks_temp_dir() {
  }
  }
 
+ private void finishDownload() {
+ _download.getMain_panel().getDownload_manager().getTransference_running_list().remove(_download);
+ _download.getMain_panel().getDownload_manager().secureNotify();
+ _download.getView().printStatusNormal("Download finished. Joining file chunks, please wait...");
+ _download.getView().getPause_button().setVisible(false);
+ _download.getMain_panel().getGlobal_dl_speed().detachTransference(_download);
+ _download.getView().getSpeed_label().setVisible(false);
+ _download.getView().getSlots_label().setVisible(false);
+ _download.getView().getSlot_status_label().setVisible(false);
+ _download.getView().getSlots_spinner().setVisible(false);
+
+ }
+
  @Override
  public void run() {
 
@@ -170,82 +183,70 @@ public void run() {
 
  if (!download_finished && _download.getProgress() == _file_size) {
 
- _download.getMain_panel().getDownload_manager().getTransference_running_list().remove(_download);
- _download.getMain_panel().getDownload_manager().secureNotify();
-
- _download.getView().printStatusNormal("Download finished. Joining file chunks, please wait...");
- _download.getView().getPause_button().setVisible(false);
- _download.getMain_panel().getGlobal_dl_speed().detachTransference(_download);
- _download.getView().getSpeed_label().setVisible(false);
- _download.getView().getSlots_label().setVisible(false);
- _download.getView().getSlot_status_label().setVisible(false);
- _download.getView().getSlots_spinner().setVisible(false);
+ finishDownload();
  download_finished = true;
  }
 
  boolean chunk_io_error;
 
  do {
- synchronized (ChunkWriterManager.class) {
- chunk_io_error = false;
 
-  try {
+ chunk_io_error = false;
 
-  File chunk_file = new File(getChunks_dir() + "/" + MiscTools.HashString("sha1", _download.getUrl()) + ".chunk" + String.valueOf(_last_chunk_id_written + 1));
+ try {
 
-  while (chunk_file.exists() && chunk_file.canRead() && chunk_file.canWrite() && chunk_file.length() > 0) {
+ File chunk_file = new File(getChunks_dir() + "/" + MiscTools.HashString("sha1", _download.getUrl()) + ".chunk" + String.valueOf(_last_chunk_id_written + 1));
 
-  if (!download_finished && _download.getProgress() == _file_size) {
+ while (chunk_file.exists() && chunk_file.canRead() && chunk_file.canWrite() && chunk_file.length() > 0) {
 
- _download.getMain_panel().getDownload_manager().getTransference_running_list().remove(_download);
- _download.getMain_panel().getDownload_manager().secureNotify();
+ if (!download_finished && _download.getProgress() == _file_size) {
 
- _download.getView().printStatusNormal("Download finished. Joining file chunks, please wait...");
- _download.getView().getPause_button().setVisible(false);
- _download.getMain_panel().getGlobal_dl_speed().detachTransference(_download);
- _download.getView().getSpeed_label().setVisible(false);
- _download.getView().getSlots_label().setVisible(false);
- _download.getView().getSlot_status_label().setVisible(false);
- _download.getView().getSlots_spinner().setVisible(false);
- download_finished = true;
- }
+ finishDownload();
+ download_finished = true;
+ }
 
-  byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
+ byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
 
-  int reads;
+ int reads;
 
- try (CipherInputStream cis = new CipherInputStream(new BufferedInputStream(new FileInputStream(chunk_file)), genDecrypter("AES", "AES/CTR/NoPadding", _byte_file_key, forwardMEGALinkKeyIV(_byte_iv, _bytes_written)))) {
- while ((reads = cis.read(buffer)) != -1) {
- _download.getOutput_stream().write(buffer, 0, reads);
- }
- } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) {
- LOG.log(Level.SEVERE, ex.getMessage());
+ try (CipherInputStream cis = new CipherInputStream(new BufferedInputStream(new FileInputStream(chunk_file)), genDecrypter("AES", "AES/CTR/NoPadding", _byte_file_key, forwardMEGALinkKeyIV(_byte_iv, _bytes_written)))) {
+ while ((reads = cis.read(buffer)) != -1) {
+ _download.getOutput_stream().write(buffer, 0, reads);
  }
+ } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) {
+ LOG.log(Level.SEVERE, ex.getMessage());
+ }
 
-  _bytes_written += chunk_file.length();
+ _bytes_written += chunk_file.length();
 
-  _last_chunk_id_written++;
+ _last_chunk_id_written++;
 
-  LOG.log(Level.INFO, "{0} ChunkWriterManager has written to disk chunk [{1}] {2} {3} {4}...", new Object[]{Thread.currentThread().getName(), _last_chunk_id_written, _bytes_written, _download.calculateLastWrittenChunk(_bytes_written), _download.getFile_name()});
+ LOG.log(Level.INFO, "{0} ChunkWriterManager has written to disk chunk [{1}] {2} {3} {4}...", new Object[]{Thread.currentThread().getName(), _last_chunk_id_written, _bytes_written, _download.calculateLastWrittenChunk(_bytes_written), _download.getFile_name()});
 
-  chunk_file.delete();
+ chunk_file.delete();
 
-  chunk_file = new File(getChunks_dir() + "/" + new File(_download.getFile_name()).getName() + ".chunk" + String.valueOf(_last_chunk_id_written + 1));
+ chunk_file = new File(getChunks_dir() + "/" + MiscTools.HashString("sha1", _download.getUrl()) + ".chunk" + String.valueOf(_last_chunk_id_written + 1));
 
- }
- } catch (IOException ex) {
- chunk_io_error = true;
- LOG.log(Level.WARNING, ex.getMessage());
- MiscTools.pausar(1000);
  }
+ } catch (IOException ex) {
+ chunk_io_error = true;
+ LOG.log(Level.WARNING, ex.getMessage());
+ MiscTools.pausar(1000);
  }
+
  } while (chunk_io_error);
 
  if (!_exit && (!_download.isStopped() || !_download.getChunkworkers().isEmpty()) && _bytes_written < _file_size) {
 
  LOG.log(Level.INFO, "{0} ChunkWriterManager waiting for chunk [{1}] {2}...", new Object[]{Thread.currentThread().getName(), _last_chunk_id_written + 1, _download.getFile_name()});
 
- secureWait();
+ try {
+ synchronized (_secure_notify_lock) {
+ _secure_notify_lock.wait(1000);
+ }
+ } catch (InterruptedException ex) {
+ Logger.getLogger(ChunkWriterManager.class.getName()).log(Level.SEVERE, null, ex);
+ }
 
  }
 

diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -70,7 +70,7 @@
  */
 public final class MainPanel {
 
- public static final String VERSION = "7.95";
+ public static final String VERSION = "7.96";
  public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY
  public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
  public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;