mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1392003 - Support estimatedEndTime in DownloadItem; r=aswan 

MozReview-Commit-ID: 4Yzj52qI1Mz

--HG--
extra : rebase_source : ccfa669ec432887f3459a13758c42206ccb2d85c
This commit is contained in:
Thomas Wisniewski 2017-08-19 15:06:46 -04:00
Родитель dedf384ca4
Коммит 99ee6030a0
2 изменённых файлов: 59 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
toolkit/components/extensions/ext-downloads.js
Просмотреть файл

@ -31,6 +31,8 @@ const DOWNLOAD_ITEM_FIELDS = ["id", "url", "referrer", "filename", "incognito",
"fileSize", "exists",
"byExtensionId", "byExtensionName"];
const DOWNLOAD_DATE_FIELDS = ["startTime", "endTime", "estimatedEndTime"];
// Fields that we generate onChanged events for.
const DOWNLOAD_ITEM_CHANGE_FIELDS = ["endTime", "state", "paused", "canResume",
"error", "exists"];
@ -60,7 +62,14 @@ class DownloadItem {
get mime() { return this.download.contentType; }
get startTime() { return this.download.startTime; }
get endTime() { return null; } // TODO
get estimatedEndTime() { return null; } // TODO
get estimatedEndTime() {
// Based on the code in summarizeDownloads() in DownloadsCommon.jsm
if (this.download.hasProgress && this.download.speed > 0) {
let sizeLeft = this.download.totalBytes - this.download.currentBytes;
let rawTimeLeft = sizeLeft / this.download.speed;
return new Date(Date.now() + rawTimeLeft);
}
}
get state() {
if (this.download.succeeded) {
return "complete";
@ -120,8 +129,10 @@ class DownloadItem {
for (let field of DOWNLOAD_ITEM_FIELDS) {
obj[field] = this[field];
}
if (obj.startTime) {
obj.startTime = obj.startTime.toISOString();
for (let field of DOWNLOAD_DATE_FIELDS) {
if (obj[field]) {
obj[field] = obj[field].toISOString();
}
}
return obj;
}

52
toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js
Просмотреть файл

@ -48,6 +48,13 @@ function handleRequest(request, response) {
response.setStatusLine(request.httpVersion, 206, "Partial Content");
response.setHeader("Content-Range", `${start}-${end}/${TOTAL_LEN}`, false);
response.write(TEST_DATA.slice(start, end + 1));
} else if (request.queryString.includes("stream")) {
response.processAsync();
response.setHeader("Content-Length", "10000", false);
response.write("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
setInterval(() => {
response.write("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}, 50);
} else {
response.processAsync();
response.setHeader("Content-Length", `${TOTAL_LEN}`, false);
@ -217,15 +224,15 @@ function runInExtension(what, ...args) {
// download of the given url in which the total bytes are exactly equal
// to the given value. Unless you know exactly how data will arrive from
// the server (eg see interruptible.sjs), it probably isn't very useful.
async function waitForProgress(url, bytes) {
async function waitForProgress(url, testFn) {
let list = await Downloads.getList(Downloads.ALL);
return new Promise(resolve => {
const view = {
onDownloadChanged(download) {
if (download.source.url == url && download.currentBytes == bytes) {
if (download.source.url == url && testFn(download.currentBytes)) {
list.removeView(view);
resolve();
resolve(download.currentBytes);
}
},
};
@ -293,7 +300,7 @@ add_task(async function test_cancel() {
equal(msg.status, "success", "download() succeeded");
const id = msg.result;
let progressPromise = waitForProgress(url, INT_PARTIAL_LEN);
let progressPromise = waitForProgress(url, bytes => bytes == INT_PARTIAL_LEN);
msg = await runInExtension("waitForEvents", [
{type: "onCreated", data: {id}},
@ -348,6 +355,7 @@ add_task(async function test_cancel() {
equal(msg.result[0].id, id, "download.id is correct");
equal(msg.result[0].state, "interrupted", "download.state is correct");
equal(msg.result[0].paused, false, "download.paused is correct");
equal(msg.result[0].estimatedEndTime, null, "download.estimatedEndTime is correct");
equal(msg.result[0].canResume, false, "download.canResume is correct");
equal(msg.result[0].error, "USER_CANCELED", "download.error is correct");
equal(msg.result[0].totalBytes, INT_TOTAL_LEN, "download.totalBytes is correct");
@ -366,7 +374,7 @@ add_task(async function test_pauseresume() {
equal(msg.status, "success", "download() succeeded");
const id = msg.result;
let progressPromise = waitForProgress(url, INT_PARTIAL_LEN);
let progressPromise = waitForProgress(url, bytes => bytes == INT_PARTIAL_LEN);
msg = await runInExtension("waitForEvents", [
{type: "onCreated", data: {id}},
@ -415,6 +423,7 @@ add_task(async function test_pauseresume() {
equal(msg.result[0].id, id, "download.id is correct");
equal(msg.result[0].state, "interrupted", "download.state is correct");
equal(msg.result[0].paused, true, "download.paused is correct");
equal(msg.result[0].estimatedEndTime, null, "download.estimatedEndTime is correct");
equal(msg.result[0].canResume, true, "download.canResume is correct");
equal(msg.result[0].error, "USER_CANCELED", "download.error is correct");
equal(msg.result[0].bytesReceived, INT_PARTIAL_LEN, "download.bytesReceived is correct");
@ -473,6 +482,7 @@ add_task(async function test_pauseresume() {
equal(msg.result.length, 1, "search() found 1 download");
equal(msg.result[0].state, "complete", "download.state is correct");
equal(msg.result[0].paused, false, "download.paused is correct");
equal(msg.result[0].estimatedEndTime, null, "download.estimatedEndTime is correct");
equal(msg.result[0].canResume, false, "download.canResume is correct");
equal(msg.result[0].error, null, "download.error is correct");
equal(msg.result[0].bytesReceived, INT_TOTAL_LEN, "download.bytesReceived is correct");
@ -492,7 +502,7 @@ add_task(async function test_pausecancel() {
equal(msg.status, "success", "download() succeeded");
const id = msg.result;
let progressPromise = waitForProgress(url, INT_PARTIAL_LEN);
let progressPromise = waitForProgress(url, bytes => bytes == INT_PARTIAL_LEN);
msg = await runInExtension("waitForEvents", [
{type: "onCreated", data: {id}},
@ -541,6 +551,7 @@ add_task(async function test_pausecancel() {
equal(msg.result[0].id, id, "download.id is correct");
equal(msg.result[0].state, "interrupted", "download.state is correct");
equal(msg.result[0].paused, true, "download.paused is correct");
equal(msg.result[0].estimatedEndTime, null, "download.estimatedEndTime is correct");
equal(msg.result[0].canResume, true, "download.canResume is correct");
equal(msg.result[0].error, "USER_CANCELED", "download.error is correct");
equal(msg.result[0].bytesReceived, INT_PARTIAL_LEN, "download.bytesReceived is correct");
@ -578,6 +589,7 @@ add_task(async function test_pausecancel() {
equal(msg.result.length, 1, "search() found 1 download");
equal(msg.result[0].state, "interrupted", "download.state is correct");
equal(msg.result[0].paused, false, "download.paused is correct");
equal(msg.result[0].estimatedEndTime, null, "download.estimatedEndTime is correct");
equal(msg.result[0].canResume, false, "download.canResume is correct");
equal(msg.result[0].error, "USER_CANCELED", "download.error is correct");
equal(msg.result[0].totalBytes, INT_TOTAL_LEN, "download.totalBytes is correct");
@ -638,7 +650,7 @@ add_task(async function test_removal_of_incomplete_download() {
equal(msg.status, "success", "download() succeeded");
const id = msg.result;
let progressPromise = waitForProgress(url, INT_PARTIAL_LEN);
let progressPromise = waitForProgress(url, bytes => bytes == INT_PARTIAL_LEN);
msg = await runInExtension("waitForEvents", [
{type: "onCreated", data: {id}},
@ -857,6 +869,32 @@ add_task(async function test_getFileIcon() {
webNav.close();
});
add_task(async function test_estimatedendtime() {
// Note we are not testing the actual value calculation of estimatedEndTime,
// only whether it is null/non-null at the appropriate times.
let url = `${getInterruptibleUrl()}&stream=1`;
let msg = await runInExtension("download", {url});
equal(msg.status, "success", "download() succeeded");
const id = msg.result;
let previousBytes = await waitForProgress(url, bytes => bytes > 0);
await waitForProgress(url, bytes => bytes > previousBytes);
msg = await runInExtension("search", {id});
equal(msg.status, "success", "search() succeeded");
equal(msg.result.length, 1, "search() found 1 download");
ok(msg.result[0].estimatedEndTime, "download.estimatedEndTime is correct");
ok(msg.result[0].bytesReceived > 0, "download.bytesReceived is correct");
msg = await runInExtension("cancel", id);
msg = await runInExtension("search", {id});
equal(msg.status, "success", "search() succeeded");
equal(msg.result.length, 1, "search() found 1 download");
ok(!msg.result[0].estimatedEndTime, "download.estimatedEndTime is correct");
});
add_task(async function cleanup() {
await extension.unload();
});