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

4
M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8InfoTask.java
View File

@@ -295,7 +295,7 @@ final public class M3U8InfoTask implements IInfoTask {
ALog.d(TAG, "30x跳转，新url为【" + newUrl + "】");
if (TextUtils.isEmpty(newUrl) || newUrl.equalsIgnoreCase("null")) {
if (mCallback != null) {
mCallback.onFail(mEntity, new AriaM3U8Exception(TAG, "获取重定向链接失败"), false);
mCallback.onFail(mEntity, new AriaM3U8Exception("获取重定向链接失败"), false);
}
return;
}
@@ -354,7 +354,7 @@ final public class M3U8InfoTask implements IInfoTask {
}
private void failDownload(String errorInfo, boolean needRetry) {
mCallback.onFail(mEntity, new AriaM3U8Exception(TAG, errorInfo), needRetry);
mCallback.onFail(mEntity, new AriaM3U8Exception(errorInfo), needRetry);
}
/**

16
M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8ThreadTaskAdapter.java
View File

@@ -91,15 +91,15 @@ public final class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
handleConn(conn);
} catch (MalformedURLException e) {
fail(new AriaM3U8Exception(TAG,
fail(new AriaM3U8Exception(
String.format("分片【%s】下载失败，filePath: %s, url: %s", getThreadRecord().threadId,
getThreadConfig().tempFile.getPath(), getEntity().getUrl()), e), false);
} catch (IOException e) {
fail(new AriaM3U8Exception(TAG,
fail(new AriaM3U8Exception(
String.format("分片【%s】下载失败，filePath: %s, url: %s", getThreadRecord().threadId,
getThreadConfig().tempFile.getPath(), getEntity().getUrl()), e), true);
} catch (Exception e) {
fail(new AriaM3U8Exception(TAG,
fail(new AriaM3U8Exception(
String.format("分片【%s】下载失败，filePath: %s, url: %s", getThreadRecord().threadId,
getThreadConfig().tempFile.getPath(), getEntity().getUrl()), e), false);
} finally {
@@ -137,7 +137,7 @@ public final class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
|| code == 307) {
handleUrlReTurn(conn, conn.getHeaderField("Location"));
} else {
fail(new AriaM3U8Exception(TAG,
fail(new AriaM3U8Exception(
String.format("连接错误，http错误码：%s，url：%s", code, getThreadConfig().url)),
false);
}
@@ -150,7 +150,7 @@ public final class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
private void handleUrlReTurn(HttpURLConnection conn, String newUrl) throws IOException {
ALog.d(TAG, "30x跳转，新url为【" + newUrl + "】");
if (TextUtils.isEmpty(newUrl) || newUrl.equalsIgnoreCase("null")) {
fail(new AriaM3U8Exception(TAG, "下载失败，重定向url为空"), false);
fail(new AriaM3U8Exception("下载失败，重定向url为空"), false);
return;
}
@@ -160,7 +160,7 @@ public final class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
}
if (!CheckUtil.checkUrl(newUrl)) {
fail(new AriaM3U8Exception(TAG, "下载失败，重定向url错误"), false);
fail(new AriaM3U8Exception("下载失败，重定向url错误"), false);
return;
}
String cookies = conn.getHeaderField("Set-Cookie");
@@ -198,7 +198,7 @@ public final class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
}
handleComplete();
} catch (IOException e) {
fail(new AriaM3U8Exception(TAG,
fail(new AriaM3U8Exception(
String.format("文件下载失败，savePath: %s, url: %s", getThreadConfig().tempFile.getPath(),
getThreadConfig().url), e), true);
} finally {
@@ -241,7 +241,7 @@ public final class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
}
handleComplete();
} catch (IOException e) {
fail(new AriaM3U8Exception(TAG,
fail(new AriaM3U8Exception(
String.format("文件下载失败，savePath: %s, url: %s", getThreadConfig().tempFile.getPath(),
getThreadConfig().url), e), true);
} finally {

6
M3U8Component/src/main/java/com/arialyy/aria/m3u8/live/M3U8LiveLoader.java
View File

@@ -276,7 +276,7 @@ final class M3U8LiveLoader extends BaseM3U8Loader {
}
}
if (TextUtils.isEmpty(url) || !url.startsWith("http")) {
fail(new AriaM3U8Exception(TAG, String.format("ts地址错误，url：%s", url)), false);
fail(new AriaM3U8Exception(String.format("ts地址错误，url：%s", url)), false);
return;
}
offerPeer(new M3U8LiveLoader.ExtInfo(url, extInf));
@@ -297,13 +297,13 @@ final class M3U8LiveLoader extends BaseM3U8Loader {
if (generateIndexFile(true)) {
getListener().onComplete();
} else {
getListener().onFail(false, new AriaM3U8Exception(TAG, "创建索引文件失败"));
getListener().onFail(false, new AriaM3U8Exception("创建索引文件失败"));
}
} else if (mM3U8Option.isMergeFile()) {
if (mergeFile()) {
getListener().onComplete();
} else {
getListener().onFail(false, new AriaM3U8Exception(TAG, "合并文件失败"));
getListener().onFail(false, new AriaM3U8Exception("合并文件失败"));
}
} else {
getListener().onComplete();

4
M3U8Component/src/main/java/com/arialyy/aria/m3u8/vod/M3U8VodLoader.java
View File

@@ -519,10 +519,10 @@ final class M3U8VodLoader extends BaseM3U8Loader {
urls.addAll((Collection<? extends String>) info.obj);
}
if (urls.isEmpty()) {
fail(new AriaM3U8Exception(TAG, "获取地址失败"), false);
fail(new AriaM3U8Exception("获取地址失败"), false);
return;
} else if (!urls.get(0).startsWith("http")) {
fail(new AriaM3U8Exception(TAG, "地址错误，请使用IVodTsUrlConverter处理你的url信息"), false);
fail(new AriaM3U8Exception("地址错误，请使用IVodTsUrlConverter处理你的url信息"), false);
return;
}
mM3U8Option.setUrls(urls);

2
M3U8Component/src/main/java/com/arialyy/aria/m3u8/vod/VodStateManager.java
View File

@@ -149,7 +149,7 @@ public final class VodStateManager implements IThreadStateManager {
if (loader.generateIndexFile(false)) {
listener.onComplete();
} else {
listener.onFail(false, new AriaM3U8Exception(TAG, "创建索引文件失败"));
listener.onFail(false, new AriaM3U8Exception("创建索引文件失败"));
}
} else if (m3U8Option.isMergeFile()) {
if (mergeFile()) {