LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix how mode gets processed when building images (only use permission bits).

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2018-12-17 19:57:02 -05:00 committed by David Humphrey
parent b0809272a1
commit b7312bfa1e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/fs-image.js
View File

@ -7,6 +7,7 @@ const cwd = process.cwd();
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
const { S_IFMT } = fs.constants;
const SerializableMemoryProvider = require('../tests/lib/serializable-memory-provider'); const SerializableMemoryProvider = require('../tests/lib/serializable-memory-provider');
const unusedFilename = require('unused-filename'); const unusedFilename = require('unused-filename');
const prettyBytes = require('pretty-bytes'); const prettyBytes = require('pretty-bytes');
@ -50,6 +51,7 @@ if(!(cli.input && cli.input.length >= 1)) {
const dirPath = path.normalize(cli.input[0]); const dirPath = path.normalize(cli.input[0]);
const exportFilePath = cli.input[1] ? path.normalize(cli.input[1]) : null; const exportFilePath = cli.input[1] ? path.normalize(cli.input[1]) : null;
// Log in verbose mode
const log = msg => { const log = msg => {
if(cli.flags.verbose) { if(cli.flags.verbose) {
console.log(msg); console.log(msg);
@ -77,7 +79,7 @@ fs.stat(dirPath, (err, stats) => {
// Create a filer instance with serializable provider, and start walking dir path // Create a filer instance with serializable provider, and start walking dir path
const provider = new SerializableMemoryProvider(); const provider = new SerializableMemoryProvider();
const filer = new Filer.FileSystem({provider: provider}); const filer = new Filer.FileSystem({provider});
const walker = walk.walk(dirPath); const walker = walk.walk(dirPath);
// Convert a filesystem path into a Filer path, rooted in / // Convert a filesystem path into a Filer path, rooted in /
@ -86,12 +88,12 @@ fs.stat(dirPath, (err, stats) => {
// Write a file to Filer, including various metadata from the file node // Write a file to Filer, including various metadata from the file node
const filerWriteFile = (filerPath, stats, data, callback) => { const filerWriteFile = (filerPath, stats, data, callback) => {
const error = err => console.error(`[Filer] ${err}`); const error = err => console.error(`[Filer] ${err}`);
// Convert date to ms
const toDateMS = d => (new Date(d)).getTime();
const mode = stats.mode; // Mask out the type, we only care about the various permission bits
const atime = toDateMS(stats.atime); const mode = stats.mode & ~S_IFMT;
const mtime = toDateMS(stats.mtime); // Prefer Unix Timestamps ms
const atimeMs = stats.atimeMs;
const mtimeMs = stats.mtimeMs;
const uid = stats.uid; const uid = stats.uid;
const gid = stats.gid; const gid = stats.gid;
@ -101,7 +103,7 @@ fs.stat(dirPath, (err, stats) => {
return callback(err); return callback(err);
} }
filer.utimes(filerPath, atime, mtime, err => { filer.utimes(filerPath, atimeMs, mtimeMs, err => {
if(err) { if(err) {
error(`Error writing ${filerPath}: ${err.message}`); error(`Error writing ${filerPath}: ${err.message}`);
return callback(err); return callback(err);
@ -109,7 +111,7 @@ fs.stat(dirPath, (err, stats) => {
// Not all shipped versions of Filer had chown(), bail if not present // Not all shipped versions of Filer had chown(), bail if not present
if(typeof filer.chown !== 'function') { if(typeof filer.chown !== 'function') {
log(` File Node: mode=${mode} atime=${atime} mtime=${mtime}`); log(` File Node: mode=${mode.toString('8')} atime=${atimeMs} mtime=${mtimeMs}`);
return callback(); return callback();
} }
@ -119,7 +121,7 @@ fs.stat(dirPath, (err, stats) => {
return callback(err); return callback(err);
} }
log(` File Node: mode=${mode} uid=${uid} gid=${gid} atime=${atime} mtime=${mtime}`); log(` File Node: mode=${mode.toString('8')} uid=${uid} gid=${gid} atime=${atimeMs} mtime=${mtimeMs}`);
callback(); callback();
}); });
}); });
@ -132,6 +134,8 @@ fs.stat(dirPath, (err, stats) => {
const filerPath = toFilerPath(filePath); const filerPath = toFilerPath(filePath);
log(`Writing file ${filePath} to ${filerPath} [${prettyBytes(fileStats.size)}]`); log(`Writing file ${filePath} to ${filerPath} [${prettyBytes(fileStats.size)}]`);
// TODO: deal with symlinks...
fs.readFile(filePath, null, (err, data) => { fs.readFile(filePath, null, (err, data) => {
if(err) { if(err) {
console.error(`Error reading file ${filePath}: ${err.message}`); console.error(`Error reading file ${filePath}: ${err.message}`);