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

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

Browse Source 
fix bug https://github.com/AriaLyy/Aria/issues/505
增加上传任务强制上传的功能
This commit is contained in:
laoyuyu
2019-11-18 19:35:06 +08:00
parent 5ad485890c
commit 846e6c0720
41 changed files with 401 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8RecordAdapter.java
View File

@@ -56,7 +56,7 @@ public class M3U8RecordAdapter extends AbsRecordHandlerAdapter {
long currentProgress = 0;
int completeNum = 0;
File targetFile = new File(mTaskRecord.filePath);
if (!targetFile.exists()){
if (!targetFile.exists()) {
FileUtil.createFile(targetFile);
}
@@ -117,17 +117,15 @@ public class M3U8RecordAdapter extends AbsRecordHandlerAdapter {
record.filePath = getEntity().getFilePath();
record.threadRecords = new ArrayList<>();
record.threadNum = threadNum;
record.isBlock = true;
int requestType = getWrapper().getRequestType();
if (requestType == ITaskWrapper.M3U8_VOD) {
record.taskType = TaskRecord.TYPE_M3U8_VOD;
record.isOpenDynamicFile = true;
record.bandWidth = mOption.getBandWidth();
} else if (requestType == ITaskWrapper.M3U8_LIVE) {
record.taskType = TaskRecord.TYPE_M3U8_LIVE;
record.isOpenDynamicFile = true;
record.bandWidth = mOption.getBandWidth();
}
record.bandWidth = mOption.getBandWidth();
return record;
}

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

@@ -100,7 +100,7 @@ public class M3U8ThreadTaskAdapter extends AbsThreadTaskAdapter {
is = new BufferedInputStream(ConnectionHelp.convertInputStream(conn));
if (mHttpTaskOption.isChunked()) {
readChunked(is);
} else if (getThreadConfig().isOpenDynamicFile) {
} else if (getThreadConfig().isBlock) {
readDynamicFile(is);
}
} catch (MalformedURLException e) {

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

@@ -177,7 +177,6 @@ public class M3U8LiveLoader extends BaseM3U8Loader {
config.url = tsUrl;
config.tempFile = new File(getTsFilePath(cacheDir, indexId));
config.isBlock = mRecord.isBlock;
config.isOpenDynamicFile = mRecord.isOpenDynamicFile;
config.taskWrapper = mTaskWrapper;
config.record = record;
config.stateHandler = mStateHandler;

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

@@ -436,7 +436,6 @@ public class M3U8VodLoader extends BaseM3U8Loader {
config.url = record.tsUrl;
config.tempFile = new File(BaseM3U8Loader.getTsFilePath(cacheDir, record.threadId));
config.isBlock = mRecord.isBlock;
config.isOpenDynamicFile = mRecord.isOpenDynamicFile;
config.taskWrapper = mTaskWrapper;
config.record = record;
config.stateHandler = mStateHandler;