Mirrors/megabasterd
1
0
Fork 0
mirror of https://github.com/tonikelope/megabasterd.git synced 2025-06-12 21:37:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

6.51

Browse Source 
-More on uploads and logger
This commit is contained in:
tonikelope
2019-10-02 19:38:22 +02:00
parent d479b20339
commit d62b8c3918
34 changed files with 172 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
View File

@ -90,7 +90,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
_exit = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -363,7 +363,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
timeout = true;
}
LOG.log(Level.SEVERE, null, ex.getMessage());
LOG.log(Level.SEVERE, ex.getMessage());
} finally {
@ -413,7 +413,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
_download.stopDownloader(error.getMessage());
LOG.log(Level.SEVERE, null, error.getMessage());
LOG.log(Level.SEVERE, error.getMessage());
}

4
src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java
View File

@ -161,7 +161,7 @@ public class ChunkDownloaderMono extends ChunkDownloader {
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} finally {
@ -202,7 +202,7 @@ public class ChunkDownloaderMono extends ChunkDownloader {
} catch (OutOfMemoryError | Exception error) {
getDownload().stopDownloader(error.getMessage());
LOG.log(Level.SEVERE, null, error.getMessage());
LOG.log(Level.SEVERE, error.getMessage());
}
getDownload().stopThisSlot(this);

45
src/main/java/com/tonikelope/megabasterd/ChunkUploader.java
View File

@ -67,7 +67,7 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
_exit = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -100,11 +100,13 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
byte[] buffer = new byte[MainPanel.DEFAULT_BYTE_BUFFER_SIZE];
boolean fatal_error = false;
int conta_error = 0;
try {
int conta_error = 0;
while (!_upload.getMain_panel().isExit() && !_exit && !_upload.isStopped() && conta_error < MAX_CHUNK_ERROR) {
while (!_upload.getMain_panel().isExit() && !_exit && !_upload.isStopped() && conta_error < MAX_CHUNK_ERROR && !fatal_error) {
if (_upload.isPaused() && !_upload.isStopped()) {
@ -229,6 +231,8 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
LOG.log(Level.WARNING, "{0} Worker {1} UPLOAD FAILED! (MEGA ERROR: {2})", new Object[]{Thread.currentThread().getName(), _id, MegaAPI.checkMEGAError(httpresponse)});
fatal_error = true;
} else {
LOG.log(Level.INFO, "{0} Worker {1} Completion handler -> {2}", new Object[]{Thread.currentThread().getName(), _id, httpresponse});
@ -270,31 +274,34 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
_upload.getProgress_meter().secureNotify();
}
if (!_exit) {
if (fatal_error) {
if (++conta_error == MAX_CHUNK_ERROR) {
_upload.stopUploader("UPLOAD FAILED: FATAL ERROR");
_upload.stopUploader("UPLOAD FAILED: too many errors");
LOG.log(Level.SEVERE, "UPLOAD FAILED: FATAL ERROR");
LOG.log(Level.SEVERE, null, "UPLOAD FAILED: too many errors");
} else if (++conta_error == MAX_CHUNK_ERROR) {
} else {
_upload.stopUploader("UPLOAD FAILED: too many errors");
_error_wait = true;
LOG.log(Level.SEVERE, "UPLOAD FAILED: too many errors");
_upload.getView().updateSlotsStatus();
} else if (!_exit && !_upload.isStopped()) {
try {
Thread.sleep(MiscTools.getWaitTimeExpBackOff(conta_error) * 1000);
} catch (InterruptedException exc) {
_error_wait = true;
}
_upload.getView().updateSlotsStatus();
_error_wait = false;
_upload.getView().updateSlotsStatus();
try {
Thread.sleep(MiscTools.getWaitTimeExpBackOff(conta_error) * 1000);
} catch (InterruptedException exc) {
}
_error_wait = false;
_upload.getView().updateSlotsStatus();
}
} else {
@ -313,7 +320,7 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
} catch (OutOfMemoryError | Exception error) {
_upload.stopUploader(error.getMessage());
LOG.log(Level.SEVERE, null, error.getMessage());
LOG.log(Level.SEVERE, error.getMessage());
}
_upload.stopThisSlot(this);

8
src/main/java/com/tonikelope/megabasterd/ChunkWriteManager.java
View File

@ -117,7 +117,7 @@ public final class ChunkWriteManager implements Runnable, SecureSingleThreadNoti
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
_exit = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -147,7 +147,7 @@ public final class ChunkWriteManager implements Runnable, SecureSingleThreadNoti
try {
MiscTools.deleteDirectoryRecursion(Paths.get(getChunks_dir()));
} catch (IOException ex) {
Logger.getLogger(ChunkWriteManager.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(ChunkWriteManager.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -187,7 +187,7 @@ public final class ChunkWriteManager implements Runnable, SecureSingleThreadNoti
_download.getOutput_stream().write(buffer, 0, reads);
}
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
_bytes_written += chunk_file.length();
@ -217,7 +217,7 @@ public final class ChunkWriteManager implements Runnable, SecureSingleThreadNoti
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
_download.stopDownloader(ex.getMessage());
}

6
src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java
View File

@ -82,7 +82,7 @@ public final class ClipboardSpy implements Runnable, ClipboardOwner, SecureSingl
try {
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
LOG.log(SEVERE, null, ex);
LOG.log(SEVERE, ex.getMessage());
}
}
@ -129,7 +129,7 @@ public final class ClipboardSpy implements Runnable, ClipboardOwner, SecureSingl
try {
sleep(SLEEP);
} catch (InterruptedException ex1) {
LOG.log(SEVERE, null, ex1);
LOG.log(SEVERE, ex1.getMessage());
}
}
@ -156,7 +156,7 @@ public final class ClipboardSpy implements Runnable, ClipboardOwner, SecureSingl
try {
sleep(SLEEP);
} catch (InterruptedException ex1) {
LOG.log(SEVERE, null, ex1);
LOG.log(SEVERE, ex1.getMessage());
}
}

4
src/main/java/com/tonikelope/megabasterd/CryptTools.java
View File

@ -478,7 +478,7 @@ public final class CryptTools {
}
} catch (Exception ex) {
Logger.getLogger(CryptTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(CryptTools.class.getName()).log(Level.SEVERE, ex.getMessage());
JOptionPane.showMessageDialog(main_panel.getView(), ex.getMessage(), "ELC ERROR", JOptionPane.ERROR_MESSAGE);
} finally {
if (con != null) {
@ -581,7 +581,7 @@ public final class CryptTools {
} catch (Exception ex) {
Logger.getLogger(CryptTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(CryptTools.class.getName()).log(Level.SEVERE, ex.getMessage());
JOptionPane.showMessageDialog(main_panel.getView(), ex.getMessage(), "DLC ERROR", JOptionPane.ERROR_MESSAGE);
} finally {

4
src/main/java/com/tonikelope/megabasterd/DBTools.java
View File

@ -79,7 +79,7 @@ public final class DBTools {
return session;
}
} catch (SQLException ex) {
Logger.getLogger(DBTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(DBTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
return session;
@ -233,7 +233,7 @@ public final class DBTools {
value = res.getString(1);
}
} catch (SQLException ex) {
Logger.getLogger(DBTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(DBTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
return value;

12
src/main/java/com/tonikelope/megabasterd/Download.java
View File

@ -367,7 +367,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
try {
Thread.sleep(250);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -381,7 +381,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
try {
Thread.sleep(250);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -675,7 +675,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
_thread_pool.awaitTermination(MAX_WAIT_WORKERS_SHUTDOWN, TimeUnit.SECONDS);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
if (!_thread_pool.isTerminated()) {
@ -846,10 +846,10 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
_status_error = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
if (_file != null && !getView().isKeepTempFileSelected()) {
@ -1158,7 +1158,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
try {
Thread.sleep(getWaitTimeExpBackOff(conta_error++) * 1000);
} catch (InterruptedException ex2) {
LOG.log(Level.SEVERE, null, ex2);
LOG.log(Level.SEVERE, ex2.getMessage());
}
}

2
src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java
View File

@ -437,7 +437,7 @@ public class FileMergerDialog extends javax.swing.JDialog {
});
}
} catch (IOException ex) {
Logger.getLogger(FileMergerDialog.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(FileMergerDialog.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}

2
src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java
View File

@ -429,7 +429,7 @@ public class FileSplitterDialog extends javax.swing.JDialog {
});
}
} catch (IOException ex) {
Logger.getLogger(FileSplitterDialog.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(FileSplitterDialog.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}

2
src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
View File

@ -243,7 +243,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog {
});
} catch (HeadlessException | NoSuchAlgorithmException | InvalidKeySpecException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}

11
src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java
View File

@ -165,12 +165,13 @@ public final class KissVideoStreamServer implements HttpHandler, SecureSingleThr
error = true;
LOG.log(Level.SEVERE, null, ex.getMessage());
LOG.log(Level.SEVERE, ex.getMessage());
try {
Thread.sleep(getWaitTimeExpBackOff(conta_error++) * 1000);
} catch (InterruptedException ex2) {
LOG.log(Level.SEVERE, null, ex2);
LOG.log(Level.SEVERE, ex2.getMessage());
}
}
@ -210,12 +211,12 @@ public final class KissVideoStreamServer implements HttpHandler, SecureSingleThr
error = true;
LOG.log(Level.SEVERE, null, ex.getMessage());
LOG.log(Level.SEVERE, ex.getMessage());
try {
Thread.sleep(getWaitTimeExpBackOff(conta_error++) * 1000);
} catch (InterruptedException ex2) {
LOG.log(Level.SEVERE, null, ex2);
LOG.log(Level.SEVERE, ex2.getMessage());
}
}
@ -459,7 +460,7 @@ public final class KissVideoStreamServer implements HttpHandler, SecureSingleThr
} catch (Exception ex) {
if (!(ex instanceof IOException)) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
} finally {

4
src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java
View File

@ -253,7 +253,9 @@ public final class LabelTranslatorSingleton {
_addTranslation("Pausing upload ...", "Pausando subida ...");
_addTranslation("File successfully downloaded! (Integrity check PASSED)", "¡Archivo descargado correctamente! (Test de integridad CORRECTO)");
_addTranslation("File successfully downloaded! (but integrity check CANCELED)", "¡Archivo descargado correctamente! (Test de integridad cancelado)");
_addTranslation("UPLOAD FAILED! (Empty completion handle!)", "¡SUBIDA FALLIDA! (Completion handle vacío)");
_addTranslation("UPLOAD FAILED! (Empty completion handler!)", "¡SUBIDA FALLIDA! (Manejador de finalización vacío)");
_addTranslation("UPLOAD FAILED: too many errors", "LA SUBIDA FALLÓ: demasiados errores");
_addTranslation("UPLOAD FAILED: FATAL ERROR", "LA SUBIDA FALLÓ: ERROR FATAL");
_addTranslation("BAD NEWS :( File is DAMAGED!", "MALAS NOTICIAS :( El archivo está corrupto!");
_addTranslation("File temporarily unavailable! (Retrying in ", "¡Archivo temporalmente no disponible! (Reintentando en ");
_addTranslation(" secs...)", " segundos...)");

4
src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java
View File

@ -365,9 +365,9 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
}
} catch (FileNotFoundException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
swingInvoke(new Runnable() {

28
src/main/java/com/tonikelope/megabasterd/MainPanel.java
View File

@ -50,7 +50,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
public static final String VERSION = "6.50";
public static final String VERSION = "6.51";
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;
@ -94,7 +94,7 @@ public final class MainPanel {
Logger.getLogger(MainPanel.class.getName()).log(Level.INFO, "{0} Waiting {1} seconds before start...", new Object[]{Thread.currentThread().getName(), args[1]});
Thread.sleep(Long.parseLong(args[1]) * 1000);
} catch (InterruptedException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -244,7 +244,7 @@ public final class MainPanel {
try {
trayIcon();
} catch (AWTException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
THREAD_POOL.execute((_download_manager = new DownloadManager(this)));
@ -292,7 +292,7 @@ public final class MainPanel {
timer_lock.wait();
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -398,7 +398,7 @@ public final class MainPanel {
try {
Thread.sleep(2000);
} catch (InterruptedException ex) {
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -510,7 +510,7 @@ public final class MainPanel {
try {
Thread.sleep(250);
} catch (InterruptedException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -769,7 +769,7 @@ public final class MainPanel {
DBTools.insertSettingValue("master_pass_salt", _master_pass_salt);
} catch (SQLException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -890,7 +890,7 @@ public final class MainPanel {
try {
DBTools.vaccum();
} catch (SQLException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
if (restart) {
@ -916,7 +916,7 @@ public final class MainPanel {
try {
DBTools.vaccum();
} catch (SQLException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1031,7 +1031,7 @@ public final class MainPanel {
try {
DBTools.updateUploadProgress(upload.getFile_name(), upload.getMa().getFull_email(), upload.getProgress(), upload.getTemp_mac_data() != null ? upload.getTemp_mac_data() : null);
} catch (SQLException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1043,7 +1043,7 @@ public final class MainPanel {
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1105,7 +1105,7 @@ public final class MainPanel {
});
} catch (Exception ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1113,7 +1113,7 @@ public final class MainPanel {
});
} catch (Exception ex2) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex2);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex2.getMessage());
}
@ -1163,7 +1163,7 @@ public final class MainPanel {
}
} catch (Exception ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}

12
src/main/java/com/tonikelope/megabasterd/MainPanelView.java
View File

@ -265,7 +265,7 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
fr.write(dir_name + " " + folder_link + "\n\n");
fr.close();
} catch (IOException ex) {
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1040,9 +1040,9 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
getMain_panel().getDownload_manager().secureNotify();
} catch (UnsupportedEncodingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (InterruptedException ex) {
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1159,7 +1159,7 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
THREAD_POOL.execute(_main_panel.getMega_proxy_server());
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -1170,7 +1170,7 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
try {
_main_panel.getMega_proxy_server().stopServer();
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -1319,7 +1319,7 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
try {
DBTools.insertSettingValue("auto_close", getAuto_close_menu().isSelected() ? "yes" : "no");
} catch (SQLException ex) {
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MainPanelView.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}//GEN-LAST:event_auto_close_menuActionPerformed

30
src/main/java/com/tonikelope/megabasterd/MegaAPI.java
View File

@ -298,7 +298,7 @@ public final class MegaAPI implements Serializable {
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return quota;
@ -343,7 +343,7 @@ public final class MegaAPI implements Serializable {
}
} catch (IOException | MegaAPIException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -465,7 +465,7 @@ public final class MegaAPI implements Serializable {
} catch (Exception ex) {
Logger.getLogger(MegaAPI.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MegaAPI.class.getName()).log(Level.SEVERE, ex.getMessage());
} finally {
@ -487,7 +487,7 @@ public final class MegaAPI implements Serializable {
try {
Thread.sleep(getWaitTimeExpBackOff(conta_error++) * 1000);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
} else if (!empty_response && mega_error == 0 && http_error == 0) {
@ -606,7 +606,7 @@ public final class MegaAPI implements Serializable {
ret = aes_cbc_encrypt_nopadding(new_attr_byte, key, AES_ZERO_IV);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return ret;
@ -631,7 +631,7 @@ public final class MegaAPI implements Serializable {
res_map = objectMapper.readValue(att, HashMap.class);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
@ -659,7 +659,7 @@ public final class MegaAPI implements Serializable {
ul_url = (String) res_map[0].get("p");
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return ul_url;
@ -684,7 +684,7 @@ public final class MegaAPI implements Serializable {
res_map = objectMapper.readValue(res, HashMap[].class);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return res_map != null ? res_map[0] : null;
@ -737,7 +737,7 @@ public final class MegaAPI implements Serializable {
res_map = objectMapper.readValue(res, HashMap[].class);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return res_map != null ? res_map[0] : null;
@ -767,7 +767,7 @@ public final class MegaAPI implements Serializable {
res_map = objectMapper.readValue(res, HashMap[].class);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return res_map != null ? res_map[0] : null;
@ -799,7 +799,7 @@ public final class MegaAPI implements Serializable {
public_link = "https://mega.nz/#!" + file_id + "!" + Bin2UrlBASE64(node_key);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return public_link;
@ -830,7 +830,7 @@ public final class MegaAPI implements Serializable {
public_link = "https://mega.nz/#F!" + folder_id + "!" + Bin2UrlBASE64(node_key);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return public_link;
@ -868,7 +868,7 @@ public final class MegaAPI implements Serializable {
return _rawRequest(request, url_api);
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return null;
@ -883,7 +883,7 @@ public final class MegaAPI implements Serializable {
ch = Bin2UrlBASE64(encryptKey((h + h).getBytes("UTF-8"), i32a2bin(getMaster_key())));
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return ch;
@ -966,7 +966,7 @@ public final class MegaAPI implements Serializable {
}
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return null;

2
src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java
View File

@ -101,7 +101,7 @@ public final class MegaCrypterAPI {
}
} catch (Exception ex) {
Logger.getLogger(MegaAPI.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MegaAPI.class.getName()).log(Level.SEVERE, ex.getMessage());
} finally {
if (con != null) {

4
src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java
View File

@ -65,14 +65,14 @@ public class MegaProxyServer implements Runnable {
}
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} finally {
if (!_serverSocket.isClosed()) {
try {
_serverSocket.close();
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
}

34
src/main/java/com/tonikelope/megabasterd/MiscTools.java
View File

@ -128,7 +128,7 @@ public final class MiscTools {
ge.registerFont(font);
} catch (FontFormatException | IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
return font;
@ -144,7 +144,7 @@ public final class MiscTools {
}
}
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(MiscTools.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
java.util.logging.Logger.getLogger(MiscTools.class.getName()).log(java.util.logging.Level.SEVERE, ex.getMessage());
}
}
@ -453,7 +453,7 @@ public final class MiscTools {
SwingUtilities.invokeAndWait(r);
} catch (InterruptedException | InvocationTargetException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -471,7 +471,7 @@ public final class MiscTools {
try {
ret = c.call();
} catch (Exception ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
} else {
@ -483,7 +483,7 @@ public final class MiscTools {
try {
ret = futureTask.get();
} catch (InterruptedException | ExecutionException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -618,7 +618,7 @@ public final class MiscTools {
tree.setEnabled(true);
} catch (InstantiationException | IllegalAccessException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
return true;
@ -656,7 +656,7 @@ public final class MiscTools {
((MutableTreeNode) new_root).setUserObject(((DefaultMutableTreeNode) tree_model.getRoot()).getUserObject());
} catch (InstantiationException | IllegalAccessException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
for (TreePath path : paths) {
@ -685,7 +685,7 @@ public final class MiscTools {
((MutableTreeNode) node).setUserObject(((DefaultMutableTreeNode) path_element).getUserObject());
} catch (InstantiationException | IllegalAccessException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -800,7 +800,7 @@ public final class MiscTools {
res += s + "\n";
}
} catch (UnsupportedEncodingException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -823,7 +823,7 @@ public final class MiscTools {
res = links.get(0);
}
} catch (UnsupportedEncodingException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -930,7 +930,7 @@ public final class MiscTools {
}
} catch (IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
} finally {
if (con != null) {
@ -982,9 +982,9 @@ public final class MiscTools {
}
} catch (MalformedURLException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
} catch (IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
} finally {
if (con != null) {
con.disconnect();
@ -1052,9 +1052,9 @@ public final class MiscTools {
}
} catch (MalformedURLException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
} catch (IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
} finally {
if (con != null) {
con.disconnect();
@ -1069,7 +1069,7 @@ public final class MiscTools {
try {
Desktop.getDesktop().browse(new URI(url));
} catch (URISyntaxException | IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -1110,7 +1110,7 @@ public final class MiscTools {
try {
Runtime.getRuntime().exec(cmd.toString());
} catch (IOException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}

2
src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
View File

@ -272,7 +272,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog {
}
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
});

42
src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
View File

@ -377,9 +377,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
pass = new String(CryptTools.aes_cbc_decrypt_pkcs7(BASE642Bin((String) data.get("password")), _main_panel.getMaster_pass(), CryptTools.AES_ZERO_IV), "UTF-8");
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
String[] new_row_data = {(String) pair.getKey(), pass};
@ -400,9 +400,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
apikey = new String(CryptTools.aes_cbc_decrypt_pkcs7(BASE642Bin((String) data.get("apikey")), _main_panel.getMaster_pass(), CryptTools.AES_ZERO_IV), "UTF-8");
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
String[] new_row_data = {(String) pair.getKey(), user, apikey};
@ -1765,7 +1765,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
apikey = new String(CryptTools.aes_cbc_decrypt_pkcs7(BASE642Bin(apikey), _main_panel.getMaster_pass(), CryptTools.AES_ZERO_IV), "UTF-8");
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -1904,7 +1904,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
} catch (Exception ex) {
email_error.add(email);
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
} else {
@ -1920,7 +1920,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
password = new String(CryptTools.aes_cbc_decrypt_pkcs7(BASE642Bin(password), _main_panel.getMaster_pass(), CryptTools.AES_ZERO_IV), "UTF-8");
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -1991,7 +1991,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
} catch (Exception ex) {
email_error.add(email);
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -2076,11 +2076,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
}
} catch (SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}//GEN-LAST:event_save_buttonActionPerformed
@ -2140,11 +2140,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
setVisible(false);
} catch (SQLException | ClassNotFoundException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
}
@ -2198,11 +2198,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
setVisible(false);
} catch (SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
}
@ -2304,9 +2304,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
pass = new String(CryptTools.aes_cbc_decrypt_pkcs7(BASE642Bin((String) data.get("password")), _main_panel.getMaster_pass(), CryptTools.AES_ZERO_IV), "UTF-8");
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
String[] new_row_data = {(String) pair.getKey(), pass};
@ -2327,9 +2327,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
apikey = new String(CryptTools.aes_cbc_decrypt_pkcs7(BASE642Bin((String) data.get("apikey")), _main_panel.getMaster_pass(), CryptTools.AES_ZERO_IV), "UTF-8");
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
String[] new_row_data = {(String) pair.getKey(), user, apikey};
@ -2429,7 +2429,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
setVisible(false);
} catch (SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
}//GEN-LAST:event_delete_all_accounts_buttonActionPerformed
@ -2564,7 +2564,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
}
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}

4
src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java
View File

@ -129,9 +129,9 @@ public final class SmartMegaProxyManager {
}
} catch (MalformedURLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} finally {
if (con != null) {
con.disconnect();

2
src/main/java/com/tonikelope/megabasterd/SpeedMeter.java
View File

@ -236,7 +236,7 @@ public final class SpeedMeter implements Runnable {
Thread.sleep(SLEEP);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
} while (true);

2
src/main/java/com/tonikelope/megabasterd/SqliteSingleton.java
View File

@ -49,7 +49,7 @@ public final class SqliteSingleton {
}
} catch (ClassNotFoundException | SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
return conn;

6
src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java
View File

@ -180,7 +180,7 @@ public class StreamChunkDownloader implements Runnable {
}
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} finally {
con.disconnect();
}
@ -192,9 +192,9 @@ public class StreamChunkDownloader implements Runnable {
}
} catch (IOException | URISyntaxException | ChunkInvalidException | InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
} catch (OutOfMemoryError | Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
_chunkmanager.secureNotifyAll();

6
src/main/java/com/tonikelope/megabasterd/StreamChunkManager.java
View File

@ -118,13 +118,13 @@ public class StreamChunkManager implements Runnable, SecureMultiThreadNotifiable
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
try {
_pipeos.close();
} catch (IOException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
_exit = true;
@ -172,7 +172,7 @@ public class StreamChunkManager implements Runnable, SecureMultiThreadNotifiable
try {
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}

4
src/main/java/com/tonikelope/megabasterd/StreamThrottlerSupervisor.java
View File

@ -97,7 +97,7 @@ public final class StreamThrottlerSupervisor implements Runnable, SecureMultiThr
try {
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -172,7 +172,7 @@ public final class StreamThrottlerSupervisor implements Runnable, SecureMultiThr
try {
_timer_lock.wait();
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
}

4
src/main/java/com/tonikelope/megabasterd/StreamerDialog.java
View File

@ -224,7 +224,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
error = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
String data;
@ -266,7 +266,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
getParent().dispatchEvent(new WindowEvent(tthis, WINDOW_CLOSING));
}
} catch (UnsupportedEncodingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}

4
src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
View File

@ -202,7 +202,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
try {
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -692,7 +692,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, ex.getMessage());
}
} else {

25
src/main/java/com/tonikelope/megabasterd/Upload.java
View File

@ -305,7 +305,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
try {
Thread.sleep(250);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -319,7 +319,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
try {
Thread.sleep(250);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -346,7 +346,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
_exit = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -396,7 +396,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
}
} catch (SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -714,7 +714,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -727,7 +727,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
DBTools.updateUploadUrl(_file_name, _ma.getFull_email(), _ul_url);
} catch (SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
}
@ -829,7 +829,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
_thread_pool.awaitTermination(MAX_WAIT_WORKERS_SHUTDOWN, TimeUnit.SECONDS);
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
if (!_thread_pool.isTerminated()) {
@ -887,7 +887,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -912,7 +912,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
});
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
getView().printStatusOK(LabelTranslatorSingleton.getInstance().translate("File successfully uploaded! (") + _ma.getFull_email() + ")");
@ -929,7 +929,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
fr.write(_file_name + " [" + MiscTools.formatBytes(_file_size) + "] " + _file_link + "\n");
fr.close();
} catch (IOException ex) {
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
@ -977,7 +977,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
try {
DBTools.deleteUpload(_file_name, _ma.getFull_email());
} catch (SQLException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -1047,11 +1047,12 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(Upload.class.getName()).log(Level.SEVERE, ex.getMessage());
}
}
if (!_closed) {
LOG.log(Level.INFO, "{0} Uploader {1} AUTO RESTARTING UPLOAD...", new Object[]{Thread.currentThread().getName(), getFile_name()});
restart();
}
}

6
src/main/java/com/tonikelope/megabasterd/UploadMACGenerator.java
View File

@ -50,7 +50,7 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot
_secure_notify_lock.wait();
} catch (InterruptedException ex) {
_exit = true;
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}
@ -167,7 +167,7 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot
file_mac = bin2i32a(cryptor.doFinal(i32a2bin(file_mac)));
} catch (IOException | IllegalBlockSizeException | BadPaddingException ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
chunk_id++;
@ -217,7 +217,7 @@ public final class UploadMACGenerator implements Runnable, SecureSingleThreadNot
LOG.log(Level.INFO, "{0} MAC GENERATOR {1} BYE BYE...", new Object[]{Thread.currentThread().getName(), this.getUpload().getFile_name()});
} catch (Exception ex) {
LOG.log(Level.SEVERE, null, ex);
LOG.log(Level.SEVERE, ex.getMessage());
}
}

BIN
src/main/resources/images/mbasterd_screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 KiB

After

Width:  |  Height:  |  Size: 193 KiB