test
/
josh
forked from tools/josh
1
0
Fork 0
Code Issues 1 Releases Activity

Remove force option from rmdir

This commit is contained in:
Florine W. Dekker 2018-11-29 13:38:00 +01:00
parent aebbb690e8
commit a8c6c79cea
Signed by: FWDekker
GPG Key ID: B1B567AF58D6EE0F
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/commands.js
View File

@ -105,13 +105,11 @@ class Commands {
rmdir: {
fun: this.rmdir,
summary: `remove directories`,
usage: `rmdir [-f | --force] DIRECTORY...`,
usage: `rmdir DIRECTORY...`,
desc: "" +
`Removes the directories given by DIRECTORY.
If more than one directory is given, the directories are removed in the order they are given in.s
If -f or --force is set, the directories are deleted even if they contain files or other directories, and no warning is given if a directory could not be removed.`.trimLines()
If more than one directory is given, the directories are removed in the order they are given in.`.trimLines()
}
};
}

31
js/fs.js
View File

@ -382,17 +382,13 @@ class FileSystem {
* Removes a directory from the file system.
*
* @param path {string} the absolute or relative path to the directory to be removed
* @param force {boolean} true iff the directory should be removed regardless of whether it is empty
* @returns {string} an empty string if the removal was successful, or a message explaining what went wrong
*/
rmdir(path, force) {
force = (force || false);
rmdir(path) {
if (this._normalisePath(path) === "/") {
if (!force && this._root.getNodeCount() > 0) {
if (this._root.getNodeCount() > 0) {
return `The directory is not empty.`;
} else {
this._root = new Directory("/", undefined, []);
return "";
}
}
@ -402,28 +398,20 @@ class FileSystem {
const parentDir = this._getFile(parentDirName);
if (parentDir === undefined) {
return force
? ""
: `The directory '${parentDirName}' does not exist`;
return `The directory '${parentDirName}' does not exist`;
}
if (!FileSystem.isDirectory(parentDir)) {
return force
? ""
: `'${parentDirName}' is not a directory`;
return `'${parentDirName}' is not a directory`;
}
const childDir = parentDir.getNode(childDirName);
if (childDir === undefined) {
return force
? ""
: `The directory '${childDirName}' does not exist`;
return `The directory '${childDirName}' does not exist`;
}
if (!FileSystem.isDirectory(childDir)) {
return force
? ""
: `'${childDirName}' is not a directory`;
return `'${childDirName}' is not a directory`;
}
if (!force && childDir.getNodeCount() > 0) {
if (childDir.getNodeCount() > 0) {
return `The directory is not empty`;
}
@ -435,12 +423,11 @@ class FileSystem {
* Calls {@link rmdir} on all elements in {@code paths}.
*
* @param paths {string[]} the absolute or relative paths to the directories to be removed
* @param force {boolean} true iff the directories should be removed regardless of whether they are empty
* @returns {string} the warnings generated during removal of the directories
*/
rmdirs(paths, force) {
rmdirs(paths) {
return this._executeForEach(paths, path => {
return this.rmdir(path, force);
return this.rmdir(path);
});
}
}