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

Fixed loading of older state files

Browse source
This commit is contained in:
Jeff Parsons 2014-11-10 22:45:43 -08:00 • committed by jeffpar
commit ab5eb61b8d
11 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
my_modules/htmlout/lib/htmlout.js
View file

@ -166,11 +166,15 @@ var aMachineFileTypes = {
var asNonDirectories = [
"COPYING",
"LICENSE",
"README"
"README",
"makefile"
];
var asExtsPlainText = [
"map"
"65v",
"bas",
"map",
"txt"
];
/*
@ -215,7 +219,6 @@ var asFilesNonServed = [
"debug",
"lib",
"logs",
"makefile",
"my_modules",
"node_modules",
"node.log",
@ -440,7 +443,7 @@ HTMLOut.filter = function(req, res, next)
var i;
var sPath = path.join(sServerRoot, req.path);
var sBaseName = path.basename(req.path);
var sBaseExt = ((i = sBaseName.lastIndexOf('.')) > 0? sBaseName.substr(i+1) : "");
var sBaseExt = ((i = sBaseName.lastIndexOf('.')) > 0? sBaseName.substr(i+1) : "").toLowerCase();
var sTrailingChar = req.path.slice(-1);
if (!fServerDebug && !net.hasParm(net.GORT_COMMAND, net.GORT_DEBUG, req)) {
@ -531,7 +534,7 @@ HTMLOut.filter = function(req, res, next)
* folders with trailing slashes.
*/
if (asNonDirectories.indexOf(sBaseName) < 0) {
if (sTrailingChar != '/' || sBaseName.match(/\.[^0-9]+[^Ma-z]?$/)) {
if (sTrailingChar != '/') {
HTMLOut.logDebug('HTMLOut.filter("' + sBaseName + '"): passing static file request to next()');
next();
return;
@ -1052,7 +1055,7 @@ HTMLOut.prototype.getDirList = function(sToken, sIndent, aParms)
var fDir = false;
if (sURL == '/' || sBaseName == "..") {
fDir = true;
} else if (asNonDirectories.indexOf(sBaseName) < 0 && (iExt < 0 || sBaseName.match(/\.[0-9]+[Ma-z]?$/))) {
} else if (asNonDirectories.indexOf(sBaseName) < 0 && (iExt < 0 || sBaseName.match(/\.[0-9]+[Ma-c]?$/))) {
fDir = true;
sURL += '/';
}

2
my_modules/pcjs-client/lib/fdc.js
View file

@ -931,6 +931,8 @@ FDC.prototype.initDrive = function(drive, iDrive, data)
}
var deltas = data[i++];
if (deltas == 102) deltas = false; // v1.02 backward-compatibility
if (typeof deltas == "boolean") {
var fLocal = deltas;
var sDisketteName = data[i++];