Skip to content

Edits concerning output and the structure of accessTime #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linuxxon wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Edits concerning output and the structure of accessTime #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0582ca9
All commands should have access to the standard ouput, in this case t…
linuxxon Sep 24, 2014
9f46188
Accesstime should not be allowed to be falsified
linuxxon Sep 24, 2014
f338954
Fix for the JUnit test when added return values
linuxxon Sep 24, 2014
8c51d61
Errors are now handled with exceptions in the driver, as sugested.
linuxxon Oct 17, 2014
b8d67bc
Errors are now handled with exceptions in the driver, as sugested.
linuxxon Oct 17, 2014
30d0f81
Merge branch 'master' of https://github.com/linuxxon/ht14-minifs
linuxxon Oct 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions src/main/java/se/kth/id1020/minifs/Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,34 @@ public static String processCmd(FileSystem fs, String line) {

String result = null;

if (cmd.equals("mkdir")) {
fs.mkdir(comp[1].trim());
} else if (cmd.equals("touch")) {
fs.touch(comp[1].trim());
} else if (cmd.equals("append")) {
String[] subComp = comp[1].split(" ", 2);
fs.append(subComp[0].trim(), subComp[1].trim());
} else if (cmd.equals("ls")) {
String[] subComp = comp[1].split(" ", 2);
String param = subComp[0].trim().toLowerCase();
String path = subComp[1].trim();
if (param.equals("-t")) {
result = fs.lsByTime(path);
} else if (param.equals("-s")) {
result = fs.lsByName(path);
try {
if (cmd.equals("mkdir")) {
fs.mkdir(comp[1].trim());
} else if (cmd.equals("touch")) {
fs.touch(comp[1].trim());
} else if (cmd.equals("append")) {
String[] subComp = comp[1].split(" ", 2);
fs.append(subComp[0].trim(), subComp[1].trim());
} else if (cmd.equals("ls")) {
String[] subComp = comp[1].split(" ", 2);
String param = subComp[0].trim().toLowerCase();
String path = subComp[1].trim();
if (param.equals("-t")) {
result = fs.lsByTime(path);
} else if (param.equals("-s")) {
result = fs.lsByName(path);
} else {
result = param + ": parameter not recognized for ls";
}
} else if (cmd.equals("du")) {
result = fs.du(comp[1].trim());
} else if (cmd.equals("cat")) {
result = fs.cat(comp[1].trim());
} else {
result = param + ": parameter not recognized for ls";
result = cmd + ": command not found";
}
} else if (cmd.equals("du")) {
result = fs.du(comp[1].trim());
} else if (cmd.equals("cat")) {
result = fs.cat(comp[1].trim());
} else {
result = cmd + ": command not found";
} catch (Exception e) {
result = "Error: "+e.getMessage();
}

return result;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/se/kth/id1020/minifs/INode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public long getAccessTime() {
return accessTime;
}

public void setAccessTime(long accessTime) {
this.accessTime = accessTime;
public void setAccessTime() {
this.accessTime = System.currentTimeMillis();;
}

public String getName() {
Expand Down
6 changes: 5 additions & 1 deletion src/test/java/se/kth/id1020/minifs/DriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package se.kth.id1020.minifs;

import edu.princeton.cs.introcs.In;
import static junit.framework.Assert.assertEquals;
import junit.framework.TestCase;

/**
Expand All @@ -17,12 +18,15 @@ public class DriverTest extends TestCase {
class TestFs implements FileSystem {

public void mkdir(String path) {
return "";
}

public void touch(String path) {
return "";
}

public void append(String path, String data) {
return "";
}

public String lsByTime(String path) {
Expand All @@ -40,7 +44,7 @@ public String du(String path) {
public String cat(String path) {
return "";
}

}

public void testMain() {
Expand Down