Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More redirects and some API tweaks

Browse source
This commit is contained in:
Jeff Parsons 2016-04-07 08:29:54 -07:00
commit 25da7a3a94
19 changed files with 124 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

49
modules/diskdump/lib/diskdump.js
View file

@ -688,28 +688,39 @@ DiskDump.API = function(aParms)
var sFormat = aParms[DumpAPI.QUERY.FORMAT] || DumpAPI.FORMAT.JSON;
var fComments = (aParms[DumpAPI.QUERY.COMMENTS]? true : false);
var disk = new DiskDump(sDisk, null, sFormat, fComments);
disk.loadFile(function(err) {
if (!err) {
var sData, sType, fBase64;
if (sFormat == DumpAPI.FORMAT.IMG) {
sType = "octet-stream";
var buf = disk.convertToIMG();
if (buf) {
sData = disk.encodeAsBase64(buf);
fBase64 = true;
if (sDisk) {
var disk = new DiskDump(sDisk, null, sFormat, fComments);
disk.loadFile(function(err) {
if (!err) {
var sData, sType, fBase64;
if (sFormat == DumpAPI.FORMAT.IMG) {
sType = "octet-stream";
var buf = disk.convertToIMG();
if (buf) {
sData = disk.encodeAsBase64(buf);
fBase64 = true;
}
} else {
sType = "json";
sData = disk.convertToJSON();
}
if (sData) {
var sFileName = str.getBaseName(disk.sDiskPath, true) + '.' + sFormat;
var sAlert = web.downloadFile(sData, sType, fBase64, sFileName);
web.alertUser(sAlert);
} else {
web.alertUser("No data.");
}
} else {
sType = "json";
sData = disk.convertToJSON();
web.alertUser(err.message);
}
if (sData) {
var sAlert = web.downloadFile(sData, sType, fBase64);
web.alertUser(sAlert);
}
}
});
});
} else {
/*
* The client-side API currently supports DumpAPI.QUERY.DISK requests only (eg, not DumpAPI.QUERY.FILE).
*/
web.alertUser("Unsupported API request.");
}
};
/**

2
modules/shared/lib/weblib.js
View file

@ -644,7 +644,7 @@ web.downloadFile = function(sData, sType, fBase64, sFileName)
sAlert = 'Check your Downloads folder for ' + sFileName + '.';
} else {
window.open(sURI);
sAlert = 'Check your browser for a new window/tab containing the requested data (' + sFileName + ').';
sAlert = 'Check your browser for a new window/tab containing the requested data' + (sFileName? (' (' + sFileName + ')') : '') + '.';
}
return sAlert;
};