Mercurial > hg > rlgwebd
comparison rlgwebd @ 206:04c2a895b679
RLGWebD: replace deprecated fs.exists() with fs.access().
author | John "Elwin" Edwards |
---|---|
date | Fri, 27 Jan 2017 15:43:10 -0500 |
parents | a200b313870d |
children | f06f2d1a5035 |
comparison
equal
deleted
inserted
replaced
205:6651f54a0062 | 206:04c2a895b679 |
---|---|
484 | 484 |
485 function checksaved(user, game, callback, args) { | 485 function checksaved(user, game, callback, args) { |
486 var savedirc = game.uname + "save"; | 486 var savedirc = game.uname + "save"; |
487 var basename = String(pwent.uid) + "-" + user + game.suffix; | 487 var basename = String(pwent.uid) + "-" + user + game.suffix; |
488 var savefile = path.join("/var/games/roguelike", savedirc, basename); | 488 var savefile = path.join("/var/games/roguelike", savedirc, basename); |
489 fs.exists(savefile, function (exist) { | 489 fs.access(savefile, function (err) { |
490 args.unshift(exist); | 490 if (err) |
491 args.unshift(false); | |
492 else | |
493 args.unshift(true); | |
491 callback.apply(null, args); | 494 callback.apply(null, args); |
492 }); | 495 }); |
493 } | 496 } |
494 | 497 |
495 function playerstatus(user, callback) { | 498 function playerstatus(user, callback) { |
836 nname = "index.html"; | 839 nname = "index.html"; |
837 if (nname.match(/\/$/)) | 840 if (nname.match(/\/$/)) |
838 path.join(nname, "index.html"); /* it was a directory */ | 841 path.join(nname, "index.html"); /* it was a directory */ |
839 var realname = path.join(rlgwebd_options.static_root, nname); | 842 var realname = path.join(rlgwebd_options.static_root, nname); |
840 var extension = path.extname(realname); | 843 var extension = path.extname(realname); |
841 fs.exists(realname, function (exists) { | 844 fs.access(realname, function (access_err) { |
842 var resheaders = {}; | 845 var resheaders = {}; |
843 if (!exists || !extension || extension == ".html") | 846 if (access_err || !extension || extension == ".html") |
844 resheaders["Content-Type"] = "text/html; charset=utf-8"; | 847 resheaders["Content-Type"] = "text/html; charset=utf-8"; |
845 else if (extension == ".png") | 848 else if (extension == ".png") |
846 resheaders["Content-Type"] = "image/png"; | 849 resheaders["Content-Type"] = "image/png"; |
847 else if (extension == ".css") | 850 else if (extension == ".css") |
848 resheaders["Content-Type"] = "text/css"; | 851 resheaders["Content-Type"] = "text/css"; |
850 resheaders["Content-Type"] = "text/javascript"; | 853 resheaders["Content-Type"] = "text/javascript"; |
851 else if (extension == ".svg") | 854 else if (extension == ".svg") |
852 resheaders["Content-Type"] = "image/svg+xml"; | 855 resheaders["Content-Type"] = "image/svg+xml"; |
853 else | 856 else |
854 resheaders["Content-Type"] = "application/octet-stream"; | 857 resheaders["Content-Type"] = "application/octet-stream"; |
855 if (exists) { | 858 if (!access_err) { |
856 fs.readFile(realname, function (error, data) { | 859 fs.readFile(realname, function (error, data) { |
857 if (error) { | 860 if (error) { |
858 res.writeHead(500, {}); | 861 res.writeHead(500, {}); |
859 res.end(); | 862 res.end(); |
860 } | 863 } |