tt/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug https://github.com/AriaLyy/Aria/issues/703

Browse Source 
fix bug https://github.com/AriaLyy/Aria/issues/702
优化异常提示
This commit is contained in:
laoyuyu
2020-06-26 13:32:50 +08:00
parent 3edf40f533
commit 9a174311d9
40 changed files with 252 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SFtpComponent/src/main/java/com/arialyy/aria/sftp/AbsSFtpInfoTask.java
View File

@@ -54,11 +54,11 @@ public abstract class AbsSFtpInfoTask<WP extends AbsTaskWrapper> implements IInf
}
getFileInfo(session);
} catch (JSchException e) {
fail(new AriaSFTPException(TAG, "jsch错误", e), false);
fail(new AriaSFTPException("jsch错误", e), false);
} catch (UnsupportedEncodingException e) {
fail(new AriaSFTPException(TAG, "字符编码错误", e), false);
fail(new AriaSFTPException("字符编码错误", e), false);
} catch (SftpException e) {
fail(new AriaSFTPException(TAG, "sftp错误，错误类型：" + e.id, e), false);
fail(new AriaSFTPException("sftp错误，错误类型：" + e.id, e), false);
}
}

2
SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDInfoTask.java
View File

@@ -63,7 +63,7 @@ final class SFtpDInfoTask extends AbsSFtpInfoTask<DTaskWrapper> {
callback.onSucceed(getWrapper().getKey(), info);
} else {
callback.onFail(getWrapper().getEntity(),
new AriaSFTPException(TAG, String.format("文件不存在，remotePath：%s", remotePath)), false);
new AriaSFTPException(String.format("文件不存在，remotePath：%s", remotePath)), false);
}
channel.disconnect();
}

10
SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDThreadTaskAdapter.java
View File

@@ -53,7 +53,7 @@ final class SFtpDThreadTaskAdapter extends AbsThreadTaskAdapter {
@Override protected void handlerThreadTask() {
if (session == null) {
fail(new AriaSFTPException(TAG, "session 为空"), false);
fail(new AriaSFTPException("session 为空"), false);
return;
}
try {
@@ -74,13 +74,13 @@ final class SFtpDThreadTaskAdapter extends AbsThreadTaskAdapter {
CommonUtil.convertSFtpChar(charSet, option.getUrlEntity().remotePath);
download(remotePath);
} catch (SftpException e) {
fail(new AriaSFTPException(TAG, "sftp错误，错误类型：" + e.id, e), false);
fail(new AriaSFTPException("sftp错误，错误类型：" + e.id, e), false);
} catch (UnsupportedEncodingException e) {
fail(new AriaSFTPException(TAG, "字符编码错误", e), false);
fail(new AriaSFTPException("字符编码错误", e), false);
} catch (IOException e) {
fail(new AriaSFTPException(TAG, "", e), true);
fail(new AriaSFTPException("", e), true);
} catch (JSchException e) {
fail(new AriaSFTPException(TAG, "jsch 错误", e), false);
fail(new AriaSFTPException("jsch 错误", e), false);
} finally {
channelSftp.disconnect();
}

10
SFtpComponent/src/main/java/com/arialyy/aria/sftp/upload/SFtpUThreadTaskAdapter.java
View File

@@ -50,7 +50,7 @@ final class SFtpUThreadTaskAdapter extends AbsThreadTaskAdapter {
@Override protected void handlerThreadTask() {
if (session == null) {
fail(new AriaSFTPException(TAG, "session 为空"), false);
fail(new AriaSFTPException("session 为空"), false);
return;
}
try {
@@ -75,13 +75,13 @@ final class SFtpUThreadTaskAdapter extends AbsThreadTaskAdapter {
channelSftp.cd(remotePath);
upload(remotePath);
} catch (SftpException e) {
fail(new AriaSFTPException(TAG, "sftp错误，错误类型：" + e.id, e), false);
fail(new AriaSFTPException("sftp错误，错误类型：" + e.id, e), false);
} catch (UnsupportedEncodingException e) {
fail(new AriaSFTPException(TAG, "字符编码错误", e), false);
fail(new AriaSFTPException("字符编码错误", e), false);
} catch (IOException e) {
fail(new AriaSFTPException(TAG, "", e), true);
fail(new AriaSFTPException("", e), true);
} catch (JSchException e) {
fail(new AriaSFTPException(TAG, "jsch 错误", e), false);
fail(new AriaSFTPException("jsch 错误", e), false);
} finally {
channelSftp.disconnect();
}