tyler.durden/cockpit-navigator
1
0
Fork 0
mirror of https://github.com/45Drives/cockpit-navigator.git synced 2025-09-26 03:08:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow errors to be ignored if given failCallback

Browse Source
This commit is contained in:
joshuaboud 2022-06-16 14:07:13 -03:00
parent 8696998249
commit f2782ae92b
No known key found for this signature in database
GPG Key ID: 17EFB59E2A8BF50E
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
navigator/src/functions/getDirEntryObjects.js
View File

@ -33,7 +33,7 @@ async function getDirEntryObjects(cwd, host, extraFindArgs = [], failCallback =
'%l', // symlink target name or '' if not symlink '%l', // symlink target name or '' if not symlink
] ]
return parseRawEntryStats( return parseRawEntryStats(
await getDirEntryStats(cwd, host, fields, extraFindArgs, false), await getDirEntryStats(cwd, host, fields, extraFindArgs, false, failCallback),
cwd, cwd,
host, host,
failCallback, failCallback,
@ -50,7 +50,7 @@ async function getDirEntryObjects(cwd, host, extraFindArgs = [], failCallback =
* @param {Boolean} recursive - if false, -maxdepth is 1 * @param {Boolean} recursive - if false, -maxdepth is 1
* @returns {Promise<String[][]>} Array of resultant output * @returns {Promise<String[][]>} Array of resultant output
*/ */
async function getDirEntryStats(cwd, host, outputFormat, extraFindArguments = [], recursive = false) { async function getDirEntryStats(cwd, host, outputFormat, extraFindArguments = [], recursive = false, failCallback = null) {
const UNIT_SEPARATOR_ESC = `\\${UNIT_SEPARATOR.charCodeAt(0).toString(8).padStart(3, '0')}`; const UNIT_SEPARATOR_ESC = `\\${UNIT_SEPARATOR.charCodeAt(0).toString(8).padStart(3, '0')}`;
const RECORD_SEPARATOR_ESC = `\\${RECORD_SEPARATOR.charCodeAt(0).toString(8).padStart(3, '0')}`; const RECORD_SEPARATOR_ESC = `\\${RECORD_SEPARATOR.charCodeAt(0).toString(8).padStart(3, '0')}`;
const argv = [ const argv = [
@ -65,12 +65,20 @@ async function getDirEntryStats(cwd, host, outputFormat, extraFindArguments = []
argv.push(...extraFindArguments); argv.push(...extraFindArguments);
if (outputFormat.length) if (outputFormat.length)
argv.push('-printf', `${outputFormat.join(UNIT_SEPARATOR_ESC)}${RECORD_SEPARATOR_ESC}`); argv.push('-printf', `${outputFormat.join(UNIT_SEPARATOR_ESC)}${RECORD_SEPARATOR_ESC}`);
// console.time('getDirEntryStats-useSpawn-' + cwd);
return new TextDecoder().decode( return new TextDecoder().decode(
( // make sure any possible nul bytes don't break cockpit's protocol by using binary ( // make sure any possible nul bytes don't break cockpit's protocol by using binary
await useSpawn( await useSpawn(
argv, argv,
{ superuser: 'try', host, binary: true } { superuser: 'try', host, binary: true }
).promise() ).promise()
// .then(state => {console.timeEnd('getDirEntryStats-useSpawn-' + cwd); return state})
.catch(state => {
if (failCallback) {
failCallback(state.stderr);
return state;
} else throw state;
})
).stdout ).stdout
).split(RECORD_SEPARATOR) ).split(RECORD_SEPARATOR)
.slice(0, -1) // remove last empty array element from split since all entries end with RECORD_SEPARATOR .slice(0, -1) // remove last empty array element from split since all entries end with RECORD_SEPARATOR