0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

use moveTo callbacks

Browse source
This commit is contained in:
j 2015-04-11 23:18:55 +02:00
parent 71bdf09e8b
commit 295ddddf41
1 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
static/js/fs.js
View file

@ -38,6 +38,10 @@ pandora.fs = (function() {
} else { } else {
that.downloadVideoURL(id, pandora.user.ui.videoResolution, part + 1, false, function(result) { that.downloadVideoURL(id, pandora.user.ui.videoResolution, part + 1, false, function(result) {
result.progress = 1/parts * (part + result.progress); result.progress = 1/parts * (part + result.progress);
if (!that.downloads[id]) {
result.cancel && result.cancel();
return;
}
that.downloads[id].progress = result.progress; that.downloads[id].progress = result.progress;
if (result.cancel) { if (result.cancel) {
that.downloads[id].cancel = result.cancel; that.downloads[id].cancel = result.cancel;
@ -53,51 +57,51 @@ pandora.fs = (function() {
}); });
} }
function done() { function done() {
var n = 0;
if (part + 1 == parts) { if (part + 1 == parts) {
Ox.range(parts).forEach(function(part) { renamePart(0);
var name = that.getVideoName(id, pandora.user.ui.videoResolution, part + 1),
partialName = 'partial::' + name;
renameFile(partialName, name, function(fileEntry) {
if (fileEntry) {
that.local[name] = fileEntry.toURL();
} else {
Ox.print('rename failed');
callback && callback({progress: -1, error: 'rename failed'});
}
if (++n == parts) {
callback && callback({
progress: 1
});
}
});
});
delete that.downloads[id];
active = false;
if (queue.length) {
var next = queue.shift();
setTimeout(function() {
cacheVideo(next[0], next[1]);
});
}
} else { } else {
setTimeout(function() { setTimeout(function() {
downloadPart(part + 1); downloadPart(part + 1);
}); });
} }
} }
function renamePart(i) {
var name = that.getVideoName(id, pandora.user.ui.videoResolution, i + 1),
partialName = 'partial::' + name;
renameFile(partialName, name, function(fileEntry) {
if (fileEntry) {
Ox.Log('FS', 'renamed file', partialName, 'to', name);
that.local[name] = fileEntry.toURL();
} else {
Ox.print('rename failed', name);
callback && callback({progress: -1, error: 'rename failed'});
}
if (i + 1 == parts) {
delete that.downloads[id];
active = false;
if (queue.length) {
var next = queue.shift();
setTimeout(function() {
cacheVideo(next[0], next[1]);
}, 50);
}
} else {
renamePart(i + 1);
}
});
}
} }
}); });
} }
function renameFile(old, name, callback) { function renameFile(old, name, callback) {
that.fs.root.getFile(old, {}, function(fileEntry) { that.fs.root.getFile(old, {}, function(fileEntry) {
fileEntry.moveTo(that.fs.root, name); fileEntry.moveTo(that.fs.root, name, callback, function(error) {
setTimeout(function() { Ox.Log('FS', 'failed to move', old, name);
that.fs.root.getFile(name, {}, callback, function() { callback() }); callback();
}); });
}, function() { }, function() {
Ox.Log('FS', 'failed to move', old, name); Ox.Log('FS', 'could not find old file', old, name);
callback(); callback();
}); });
} }
@ -134,13 +138,6 @@ pandora.fs = (function() {
if (that.downloads && that.downloads[id] && that.downloads[id].cancel) { if (that.downloads && that.downloads[id] && that.downloads[id].cancel) {
that.downloads[id].cancel(); that.downloads[id].cancel();
delete that.downloads[id]; delete that.downloads[id];
active = false;
if (queue.length) {
var next = queue.shift();
setTimeout(function() {
cacheVideo(next[0], next[1]);
});
}
} else { } else {
pandora.api.get({id: id, keys: ['parts']}, function(result) { pandora.api.get({id: id, keys: ['parts']}, function(result) {
var count = result.data.parts * pandora.site.video.resolutions.length, done = 0; var count = result.data.parts * pandora.site.video.resolutions.length, done = 0;
@ -228,12 +225,12 @@ pandora.fs = (function() {
url: fileEntry.toURL() url: fileEntry.toURL()
}) })
} else { } else {
Ox.Log('FS', 'resume from', meta.size); Ox.Log('FS', url, 'resume from', meta.size);
partialDownload(meta.size); partialDownload(meta.size);
} }
}); });
}, function() { }, function() {
Ox.Log('FS', 'new download'); Ox.Log('FS', url, 'new download');
partialDownload(0); partialDownload(0);
}); });
}); });
@ -284,6 +281,13 @@ pandora.fs = (function() {
total: total, total: total,
cancel: function() { cancel: function() {
xhr.abort(); xhr.abort();
active = false;
if (queue.length) {
var next = queue.shift();
setTimeout(function() {
cacheVideo(next[0], next[1]);
}, 50);
}
} }
}); });
} }