DownloadExerciseAction now saves all checksums to courseDb. Then new exercises or updates are not offered if no reason.

Author: samutamm

tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java

@@ -7,15 +7,16 @@
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.model.ObsoleteClientException;
-import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
+import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
 import fi.helsinki.cs.tmc.utilities.Inflector;
 import fi.helsinki.cs.tmc.utilities.TmcStringUtils;
 import hy.tmc.core.TmcCore;
+import hy.tmc.core.domain.Exercise;
 import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -78,22 +79,28 @@ public void actionPerformed(ActionEvent e) {
 
     public void run() {
         try {
-            ProgressHandle exerciseRefresh = ProgressHandleFactory.createSystemHandle(
-                    "Checking for new exercises");
-            exerciseRefresh.start();
             final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
             if (backgroundProcessingOrNoCurrentCourse(currentCourseBeforeUpdate)) {
                 return;
             }
+            ProgressHandle exerciseRefresh = ProgressHandleFactory.createSystemHandle(
+                    "Checking for new exercises");
+            exerciseRefresh.start();
             ListenableFuture<Course> currentCourseFuture = this.tmcCore.getCourse(
-                    NBTmcSettings.getDefault(), currentCourseBeforeUpdate.getDetailsUrl()
+                    NBTmcSettings.getDefault(), detailUrl(currentCourseBeforeUpdate)
             );
             Futures.addCallback(currentCourseFuture, new UpdateCourseForExerciseUpdate(exerciseRefresh));
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);
         }
     }
 
+    private String detailUrl(final Course currentCourseBeforeUpdate) {
+        return ServerAccess.addApiCallQueryParameters(
+                currentCourseBeforeUpdate.getDetailsUrl()
+        );
+    }
+
     /**
      * If there is something at background or no current course is chosen,
      * return true.
@@ -127,15 +134,21 @@ public UpdateCourseForExerciseUpdate(ProgressHandle lastAction) {
         public void onSuccess(Course receivedCourse) {
             lastAction.finish();
             if (receivedCourse != null) {
+                setCourseNameToAllExercises(receivedCourse);
                 courseDb.putDetailedCourse(receivedCourse);
                 final LocalExerciseStatus status = LocalExerciseStatus.get(receivedCourse.getExercises());
                 updateGUI(status);
             }
         }
 
+        private void setCourseNameToAllExercises(Course receivedCourse) {
+            for (Exercise exercise : receivedCourse.getExercises()) {
+                exercise.setCourseName(receivedCourse.getName());
+            }
+        }
+
         private void updateGUI(final LocalExerciseStatus status) {
             boolean thereIsSomethingToDownload = status.thereIsSomethingToDownload(false);
-            System.out.println("on ladattavaa: " + thereIsSomethingToDownload);
             if (thereIsSomethingToDownload) {
                 if (beQuiet) {
                     displayNotification(status, new ActionListener() {

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java

@@ -3,6 +3,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import fi.helsinki.cs.tmc.model.CourseDb;
 import hy.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
@@ -11,12 +12,15 @@
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import hy.tmc.core.TmcCore;
 import hy.tmc.core.exceptions.TmcCoreException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.SwingUtilities;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
+import org.openide.util.Exceptions;
 
 /**
  * Downloads and opens the given exercises in the background.
@@ -46,20 +50,26 @@ public void run() throws TmcCoreException {
         //         = new AggregatingBgTaskListener<TmcProjectInfo>(exercisesToDownload.size(), whenAllDownloadsFinished);
 
         ProgressHandle exerciseDownload = ProgressHandleFactory.createSystemHandle(
-                    "Downloading " + exercisesToDownload.size() + " exercises.");
+                "Downloading " + exercisesToDownload.size() + " exercises.");
         exerciseDownload.start();
         ListenableFuture<List<Exercise>> dlFuture = tmcCore.downloadExercises(exercisesToDownload, settings);
 
         Futures.addCallback(dlFuture, new ProjectOpener(exerciseDownload));
     }
 
     private class ProjectOpener implements FutureCallback<List<Exercise>> {
-        private ProgressHandle lastAction;
 
+        private ProgressHandle lastAction;
+        
+        /**
+         * Converts Exercise objects to TmcProjectInfo objects.
+         * Saves them to CourseDb and opens them.
+         * @param lastAction 
+         */
         public ProjectOpener(ProgressHandle lastAction) {
             this.lastAction = lastAction;
         }
-        
+
         @Override
         public void onSuccess(List<Exercise> downloadedExercises) {
             lastAction.finish();
@@ -71,9 +81,25 @@ public void onSuccess(List<Exercise> downloadedExercises) {
                 }
                 projects.add(info);
             }
+            saveDownloadedExercisesToCourseDb(downloadedExercises);
             projectMediator.openProjects(projects);
         }
 
+        private void saveDownloadedExercisesToCourseDb(final List<Exercise> downloadedExercises) {
+            try {
+                SwingUtilities.invokeAndWait(new Runnable() {
+                    @Override
+                    public void run() {
+                        CourseDb.getInstance().multipleExerciseDownloaded(downloadedExercises);
+                    }
+                });
+            } catch (InterruptedException ex) {
+                Exceptions.printStackTrace(ex);
+            } catch (InvocationTargetException ex) {
+                Exceptions.printStackTrace(ex);
+            }
+        }
+
         @Override
         public void onFailure(Throwable thrwbl) {
             lastAction.finish();

tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java

@@ -166,7 +166,21 @@ public String getDownloadedExerciseChecksum(ExerciseKey ex) {
      * Sets the downloaded checksum of the exercise to be the one reported by the server.
      */
     public void exerciseDownloaded(Exercise ex) {
-        downloadedExerciseChecksums.put(ex.getKey(), ex.getChecksum());
+        List<Exercise> exercises = new ArrayList<Exercise>();
+        exercises.add(ex);
+        this.multipleExerciseDownloaded(exercises);
+    }
+    
+    /**
+     * Informs the course database that the exercises are considered downloaded.
+     * 
+     * <p>
+     * Sets the downloaded checksums of the exercises to be the ones reported by the server.
+     */
+    public void multipleExerciseDownloaded(List<Exercise> exercises) {
+        for (Exercise ex : exercises) {
+            downloadedExerciseChecksums.put(ex.getKey(), ex.getChecksum());
+        }
         save();
     }
 

tmc-plugin/src/fi/helsinki/cs/tmc/model/LocalExerciseStatus.java

@@ -31,7 +31,6 @@ private LocalExerciseStatus(CourseDb courseDb, ProjectMediator projectMediator,
 
         for (Exercise ex : allExercises) {
             if (!ex.hasDeadlinePassed()) {
-                System.out.println("Exercise: " + ex);
                 TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(ex);
                 boolean isDownloaded = proj != null;
                 if (courseDb.isUnlockable(ex)) {

tmc-plugin/src/fi/helsinki/cs/tmc/model/ProjectMediator.java

@@ -161,16 +161,12 @@ public TmcProjectInfo tryGetProjectOwningFile(FileObject fo) {
      */
     public TmcProjectInfo tryGetProjectForExercise(Exercise exercise) {
         projectManager.clearNonProjectCache(); // Just to be sure.
-        Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); 
 
         File path = getProjectDirForExercise(exercise);
         FileObject fo = FileUtil.toFileObject(path);
-        System.out.println("PATH: " + path);
-        System.out.println("FIlEOBJECT: " + fo);
         if (fo != null) {
             try {
                 Project project = projectManager.findProject(fo);
-                System.out.println("PROJECT: " + project);
                 if (project != null) {
                     return wrapProject(project);
                 } else {
@@ -185,9 +181,6 @@ public TmcProjectInfo tryGetProjectForExercise(Exercise exercise) {
                 return null;
             }
         } else {
-            logger.log(Level.WARNING, "ProjectMediator failed to convert "
-                    + "File to org.openide.filesystems.FileObject. Check "
-                    + "http://bits.netbeans.org/7.4/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#toFileObject(java.io.File)");
             return null;
         }
     }

tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java

@@ -84,10 +84,10 @@ private String getCourseListUrl() {
         return addApiCallQueryParameters(settings.getServerAddress() + "/courses.json");
     }
 
-    private String addApiCallQueryParameters(String url) {
+    public static String addApiCallQueryParameters(String url) {
         url = UriUtils.withQueryParam(url, "api_version", ""+API_VERSION);
         url = UriUtils.withQueryParam(url, "client", "netbeans_plugin");
-        url = UriUtils.withQueryParam(url, "client_version", clientVersion);
+        url = UriUtils.withQueryParam(url, "client_version", getClientVersion());
         return url;
     }