integrated downloading of exercises.

Author: zinkko

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

@@ -4,26 +4,17 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import hy.tmc.core.domain.Exercise;
-import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
-import fi.helsinki.cs.tmc.utilities.AggregatingBgTaskListener;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
-import fi.helsinki.cs.tmc.utilities.zip.NbProjectUnzipper;
 import hy.tmc.core.TmcCore;
 import hy.tmc.core.exceptions.TmcCoreException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.SwingUtilities;
 
 /**
  * Downloads and opens the given exercises in the background.
@@ -32,8 +23,6 @@ public class DownloadExercisesAction {
 
     private static final Logger logger = Logger.getLogger(DownloadExercisesAction.class.getName());
 
-    private ServerAccess serverAccess;
-    private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private ConvenientDialogDisplayer dialogs;
 
@@ -42,8 +31,6 @@ public class DownloadExercisesAction {
     private NBTmcSettings settings;
 
     public DownloadExercisesAction(List<Exercise> exercisesToOpen) {
-        this.serverAccess = new ServerAccess();
-        this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
 
@@ -58,89 +45,31 @@ public void run() throws TmcCoreException {
 
         ListenableFuture<List<Exercise>> dlFuture = tmcCore.donwloadExercises(exercisesToDownload, settings);
 
-        Futures.addCallback(dlFuture,
-                new FutureCallback<List<Exercise>>() {
-
-                    @Override
-                    public void onSuccess(List<Exercise> downloadedExercises) {
-                        List<TmcProjectInfo> projects = new ArrayList<TmcProjectInfo>();
-                        for (Exercise exercise : downloadedExercises) {
-                            projects.add(projectMediator.tryGetProjectForExercise(exercise));
-                        }
-                        projectMediator.openProjects(projects);
-                    }
-
-                    @Override
-                    public void onFailure(Throwable thrwbl) {
-                        logger.log(Level.INFO, "Failed to download exercise file.", thrwbl);
-                        dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(thrwbl));
-
-                    }
-                }
-        );
-
-        //for (final Exercise exercise : exercisesToDownload) {
-        //    startDownloading(exercise, aggregator);
-        //}
+        Futures.addCallback(dlFuture, new ProjectOpener());
     }
 
-    /*
-    private void startDownloading(final Exercise exercise, final BgTaskListener<TmcProjectInfo> listener) {
-        BgTask.start("Downloading " + exercise.getName(), serverAccess.getDownloadingExerciseZipTask(exercise), new BgTaskListener<byte[]>() {
-            @Override
-            public void bgTaskReady(final byte[] zipData) {
-                BgTask.start("Extracting project", new Callable<TmcProjectInfo>() {
-                    @Override
-                    public TmcProjectInfo call() throws Exception {
-                        NbProjectUnzipper unzipper = new NbProjectUnzipper();
-                        unzipper.unzipProject(zipData, projectMediator.getProjectDirForExercise(exercise));
-                        TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(exercise);
+    private class ProjectOpener implements FutureCallback<List<Exercise>> {
 
-                        if (proj == null) {
-                            throw new RuntimeException("Failed to open project for exercise " + exercise.getName());
-                        }
-
-                        // Need to invoke courseDb in swing thread to avoid races
-                        SwingUtilities.invokeAndWait(new Runnable() {
-                            @Override
-                            public void run() {
-                                courseDb.exerciseDownloaded(exercise);
-                            }
-                        });
-
-                        return proj;
-                    }
-                }, listener);
-            }
-
-            @Override
-            public void bgTaskCancelled() {
-                listener.bgTaskCancelled();
-            }
-
-            @Override
-            public void bgTaskFailed(Throwable ex) {
-                listener.bgTaskFailed(ex);
-            }
-        });
-    }
-    /*
-    private BgTaskListener<Collection<TmcProjectInfo>> whenAllDownloadsFinished = new BgTaskListener<Collection<TmcProjectInfo>>() {
         @Override
-        public void bgTaskReady(Collection<TmcProjectInfo> projects) {
+        public void onSuccess(List<Exercise> downloadedExercises) {
+            List<TmcProjectInfo> projects = new ArrayList<TmcProjectInfo>();
+            for (Exercise exercise : downloadedExercises) {
+                TmcProjectInfo info = projectMediator.tryGetProjectForExercise(exercise);
+                if (info == null) {
+                    dialogs.displayError(
+                            "Could not find exercise " + exercise.getName() + " from the filesystem");
+                    continue;
+                }
+                projects.add(info);
+            }
             projectMediator.openProjects(projects);
         }
 
         @Override
-        public void bgTaskCancelled() {
-        }
+        public void onFailure(Throwable thrwbl) {
+            logger.log(Level.INFO, "Failed to download exercise file.", thrwbl);
+            dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(thrwbl));
 
-        @Override
-        public void bgTaskFailed(Throwable ex) {
-            logger.log(Level.INFO, "Failed to download exercise file.", ex);
-            dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
         }
-    };
-    */
-
+    }
 }

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

@@ -55,7 +55,7 @@ public void run() {
         prefUI.setPassword(settings.getPassword());
         prefUI.setShouldSavePassword(settings.isSavingPassword());
         prefUI.setServerBaseUrl(settings.getServerAddress());
-        prefUI.setProjectDir(settings.getProjectRootDir());
+        prefUI.setProjectDir(settings.getTmcMainDirectory());
         prefUI.setCheckForUpdatesInTheBackground(settings.isCheckingForUpdatesInTheBackground());
         prefUI.setCheckForUnopenedExercisesAtStartup(settings.isCheckingForUnopenedAtStartup());
         prefUI.setAvailableCourses(courseDb.getAvailableCourses());

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

@@ -142,7 +142,8 @@ public boolean isSavingPassword() {
         return settings.get(PREF_PASSWORD, null) != null;
     }
 
-    public String getProjectRootDir() {
+    @Override
+    public String getTmcMainDirectory() {
         String path = settings.get(PREF_PROJECT_ROOT_DIR, null);
         if (path != null) {
             return path;

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

@@ -63,7 +63,7 @@ public List<TmcProjectInfo> wrapProjects(List<Project> projects) {
     }
 
     public String getProjectRootDir() {
-        return NBTmcSettings.getDefault().getProjectRootDir();
+        return NBTmcSettings.getDefault().getTmcMainDirectory();
     }
 
     public static String getDefaultProjectRootDir() {
@@ -115,7 +115,7 @@ public File getProjectDirForExercise(Exercise ex) {
         String path = 
                 getProjectRootDir() + File.separator +
                 ex.getCourseName() + File.separator +
-                ex.getName().replaceAll("/", "-");
+                ex.getName().replaceAll("-", "/");
         return new File(path);
     }