Implement ls long with fixed chmod for missing role

uclaacm · Jan 6, 2023 · 19a48db · 19a48db
1 parent 1ede3cb
commit 19a48db
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 14 deletions.
diff --git a/src/components/shared/TerminalCommands.ts b/src/components/shared/TerminalCommands.ts
@@ -726,6 +726,23 @@ function executeFind(
   return result;
 }
 
+function setAllPermissions(
+  permissionMap: Map<string, string>,
+  action: string,
+  role: string,
+  file: FileSystemObject
+): void {
+  const p = permissionMap.get(action);
+  const val = role === '+';
+  if (p === 'read' || p === 'write' || p === 'execute') {
+    Object.keys(file.permissions).forEach((r) => {
+      if (r === 'user' || r === 'group' || r === 'other') {
+        file.permissions[r][p] = val;
+      }
+    });
+  }
+}
+
 function executeChmod(
   fileSystem: Directory,
   cwd: Directory,
@@ -779,18 +796,12 @@ function executeChmod(
     if (permission.length == 2 && (role === '+' || role === '-')) {
       if (path === '.') {
         file.children?.forEach((child) => {
-          const p = permissionMap.get(action);
-          const val = role === '+';
-          if (p === 'read' || p === 'write' || p === 'execute') {
-            Object.keys(child.permissions).forEach((r) => {
-              if (r === 'user' || r === 'group' || r === 'other') {
-                child.permissions[r][p] = val;
-              }
-            });
-          }
+          setAllPermissions(permissionMap, action, role, child);
         });
-        continue;
+      } else {
+        setAllPermissions(permissionMap, action, role, file);
       }
+      continue;
     }
 
     // Minor error handling

diff --git a/src/components/shared/globalTypes.ts b/src/components/shared/globalTypes.ts
@@ -169,10 +169,34 @@ export class Directory extends FileSystemObject {
   }
 
   getChildrenNames(showHidden = false, longFormat = false): Array<string> {
-    if (longFormat) {
-      // TODO: implement long format
-    }
-    return this.getChildren(showHidden).map((child) => child.name);
+    return this.getChildren(showHidden).map((child) => {
+      if (longFormat) {
+        let permissionString = '';
+        for (const permission of [
+          child.permissions.user,
+          child.permissions.group,
+          child.permissions.other,
+        ]) {
+          permissionString += ' ';
+          permissionString += `${permission.read ? 'r' : '-'}`;
+          permissionString += `${permission.write ? 'w' : '-'}`;
+          permissionString += `${permission.execute ? 'x' : '-'}`;
+        }
+        const options = {
+          month: 'long',
+          day: 'numeric',
+          hour: '2-digit',
+          minute: '2-digit',
+          hour12: false,
+        };
+        // The user is tux, so we just hardcode that
+        return `${permissionString} tux ${new Date().toLocaleString(
+          'en-us',
+          options
+        )} ${child.name}`;
+      }
+      return child.name;
+    });
   }
 
   getChild(name: string): Directory | File | undefined {