Merge pull request #338 from tmc-cli/cli-context-aleksi

Cli context bug fixes

Author: Salmela

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc.cli</groupId>
     <artifactId>tmc-cli</artifactId>
-    <version>0.6.1</version>
+    <version>0.6.2</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/fi/helsinki/cs/tmc/cli/Application.java

@@ -57,10 +57,6 @@ public Application(CliContext context) {
         }
     }
 
-    public Application(Io io, WorkDir workDir) {
-        this(new CliContext(io, workDir));
-    }
-
     private boolean runCommand(String name, String[] args) {
         AbstractCommand command = CommandFactory.createCommand(this.context, name);
         if (command == null) {

src/main/java/fi/helsinki/cs/tmc/cli/CliContext.java

@@ -22,26 +22,22 @@ public class CliContext {
     private Application application;
     private TmcCore tmcCore;
     private Settings settings;
+
+    /* cached values */
     private boolean hasLogin;
     private CourseInfo courseInfo;
-
     private HashMap<String, String> properties;
     private final boolean inTest;
 
     /*TODO some of the constructors could be removed */
     public CliContext(Io io) {
-        this(io, new WorkDir());
+        this(io, new WorkDir(), null);
     }
 
     public CliContext(Io io, TmcCore core) {
         this(io, new WorkDir(), core);
     }
 
-    @Deprecated
-    public CliContext(Io io, WorkDir workDir) {
-        this(io, workDir, null);
-    }
-
     public CliContext(Io io, WorkDir workDir, TmcCore core) {
         inTest = (io != null);
         if (!inTest) {
@@ -60,6 +56,11 @@ public CliContext(Io io, WorkDir workDir, TmcCore core) {
         this.courseInfo = null;
     }
 
+    /*TODO create reset method for removing all cached data that is called
+     * when working directory is changed or by users demand also use it in
+     * constructor.
+     */
+
     protected void setApp(Application app) {
         this.application = app;
     }
@@ -85,16 +86,6 @@ public WorkDir getWorkDir() {
         return this.workDir;
     }
 
-    /**
-     * Does some thing in old style.
-     *
-     * @deprecated use {@link fi.helsinki.cs.tmc.cli.tmcstuff.WorkDir#setWorkdir(String)} instead.
-     */
-    @Deprecated
-    public void setWorkdir(WorkDir workDir) {
-        this.workDir = workDir;
-    }
-
     public CourseInfo createCourseInfo(Course course) {
         return new CourseInfo(settings, course);
     }
@@ -109,6 +100,24 @@ public Boolean saveProperties() {
         return SettingsIo.saveProperties(properties);
     }
 
+    public CourseInfo getCourseInfo() {
+        if (courseInfo != null) {
+            return courseInfo;
+        }
+        if (workDir.getConfigFile() == null) {
+            return null;
+        }
+        courseInfo = CourseInfoIo.load(workDir.getConfigFile());
+        if (courseInfo == null) {
+            io.println("Course configuration file "
+                    + workDir.getConfigFile().toString()
+                    + "is invalid.");
+            //TODO add a way to rewrite the course config file.
+            return null;
+        }
+        return this.courseInfo;
+    }
+
     // Method is used to help testing
     public void setTmcCore(TmcCore tmcCore) {
         this.tmcCore = tmcCore;
@@ -168,23 +177,18 @@ private void createTmcCore(Settings settings) {
     }
 
     private boolean createTmcCore() {
-        Settings settings;
+        Settings cachedSettings = null;
 
         if (workDir.getConfigFile() != null) {
             // If we're in a course directory, we load settings matching the course
             // Otherwise we just load the last used settings
-            courseInfo = CourseInfoIo.load(workDir.getConfigFile());
-            if (courseInfo == null) {
-                io.println("Course configuration file "
-                        + workDir.getConfigFile().toString()
-                        + "is invalid.");
-                //TODO add a way to rewrite the course config file.
-                return false;
+            courseInfo = getCourseInfo();
+            if (courseInfo != null) {
+                cachedSettings = SettingsIo.load(courseInfo.getUsername(),
+                        courseInfo.getServerAddress());
             }
-            settings = SettingsIo.load(courseInfo.getUsername(),
-                    courseInfo.getServerAddress());
         } else {
-            settings = SettingsIo.load();
+            cachedSettings = SettingsIo.load();
         }
 
         hasLogin = true;
@@ -193,7 +197,7 @@ private boolean createTmcCore() {
             settings = new Settings();
         }
 
-        createTmcCore(settings);
+        createTmcCore(cachedSettings);
         return true;
     }
 }

src/main/java/fi/helsinki/cs/tmc/cli/command/CourseInfoCommand.java

@@ -45,7 +45,13 @@ public void run(CommandLine args, Io io) {
         this.ctx = getContext();
         workDir = ctx.getWorkDir();
 
-        if (!args.hasOption("i")) {
+        boolean fetchFromInternet = args.hasOption("i");
+
+        if (! ctx.loadBackend()) {
+            return;
+        }
+
+        if (!fetchFromInternet) {
             printLocalCourseOrExercise(args);
             return;
         }
@@ -56,9 +62,6 @@ public void run(CommandLine args, Io io) {
             return;
         }
 
-        if (! ctx.loadBackend()) {
-            return;
-        }
         course = TmcUtil.findCourse(ctx, stringArgs[0]);
         if (course == null) {
             io.println("The course " + stringArgs[0] + " doesn't exist on this server.");
@@ -68,8 +71,8 @@ public void run(CommandLine args, Io io) {
     }
 
     private void printLocalCourseOrExercise(CommandLine args) {
-        if (workDir.getConfigFile() != null) {
-            info = CourseInfoIo.load(workDir.getConfigFile());
+        info = ctx.getCourseInfo();
+        if (info != null) {
             course = info.getCourse();
             printCourseOrExercise(args);
         } else {

src/main/java/fi/helsinki/cs/tmc/cli/command/ListCoursesCommand.java

@@ -5,7 +5,6 @@
 import fi.helsinki.cs.tmc.cli.io.Io;
 import fi.helsinki.cs.tmc.cli.tmcstuff.TmcUtil;
 
-import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.domain.Course;
 
 import org.apache.commons.cli.CommandLine;

src/main/java/fi/helsinki/cs/tmc/cli/command/ListExercisesCommand.java

@@ -35,7 +35,7 @@ public void getOptions(Options options) {
     public void run(CommandLine args, Io io) {
         this.ctx = getContext();
         this.io = io;
-        
+
         String courseName = getCourseName(args);
         if (courseName == null) {
             return;
@@ -77,10 +77,7 @@ private String getCourseNameFromCurrentDirectory() {
     private CourseInfo getCourseInfoFromCurrentDirectory() {
         WorkDir workDir = ctx.getWorkDir();
         workDir.addPath();
-        if (workDir.getConfigFile() != null) {
-            return CourseInfoIo.load(workDir.getConfigFile());
-        }
-        return null;
+        return ctx.getCourseInfo();
     }
 
     private List<Exercise> getExercisesFromServer(String courseName) {

src/main/java/fi/helsinki/cs/tmc/cli/command/PasteCommand.java

@@ -88,8 +88,8 @@ public void run(CommandLine args, Io io) {
         }
 
         String exerciseName = exercisenames.get(0);
-        CourseInfo courseinfo = CourseInfoIo.load(ctx.getWorkDir().getConfigFile());
-        Exercise exercise = courseinfo.getExercise(exerciseName);
+        CourseInfo info = ctx.getCourseInfo();
+        Exercise exercise = info.getExercise(exerciseName);
         URI uri = TmcUtil.sendPaste(ctx, exercise, message);
         if (uri == null && exercise.hasDeadlinePassed()) {
             io.println("Unable to send the paste."

src/main/java/fi/helsinki/cs/tmc/cli/command/RunTestsCommand.java

@@ -67,7 +67,7 @@ public void run(CommandLine args, Io io) {
             io.println("You have to be in a course directory to run tests");
             return;
         }
-        CourseInfo info = CourseInfoIo.load(workDir.getConfigFile());
+        CourseInfo info = ctx.getCourseInfo();
 
         ResultPrinter resultPrinter
                 = new ResultPrinter(io, this.showDetails, this.showPassed);

src/main/java/fi/helsinki/cs/tmc/cli/command/SubmitCommand.java

@@ -88,7 +88,7 @@ public void run(CommandLine args, Io io) {
             return;
         }
 
-        CourseInfo info = CourseInfoIo.load(workDir.getConfigFile());
+        CourseInfo info = ctx.getCourseInfo();
         Course currentCourse = info.getCourse();
         if (currentCourse == null) {
             return;

src/main/java/fi/helsinki/cs/tmc/cli/command/UpdateCommand.java

@@ -53,7 +53,7 @@ public void run(CommandLine args, Io io) {
             return;
         }
 
-        CourseInfo info = CourseInfoIo.load(workDir.getConfigFile());
+        CourseInfo info = ctx.getCourseInfo();
         updateExercises(info, workDir.getConfigFile());
     }