Send paste

Author: jamo

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

@@ -1,21 +1,20 @@
 package fi.helsinki.cs.tmc.actions;
 
+import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.PastebinDialog;
 import fi.helsinki.cs.tmc.ui.PastebinResponseDialog;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
-import fi.helsinki.cs.tmc.utilities.CancellableCallable;
-import fi.helsinki.cs.tmc.utilities.zip.RecursiveZipper;
 
 import org.netbeans.api.project.Project;
 import org.openide.awt.ActionID;
@@ -27,9 +26,8 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.HashMap;
+import java.net.URI;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -39,15 +37,13 @@
 @ActionReferences({
     @ActionReference(path = "Menu/TM&C", position = -17),
     @ActionReference(
-        path = "Projects/Actions",
-        position = 1340,
-        separatorBefore = 1330,
-        separatorAfter = 1360
+            path = "Projects/Actions",
+            position = 1340,
+            separatorBefore = 1330,
+            separatorAfter = 1360
     )
 })
 @Messages("CTL_PastebinAction=Send code to Pastebin")
-//TODO: This is a horribly copypasted, then mangled version of RequestReviewAction
-//plz remove everything that isn't needed here. --kviiri
 public final class PastebinAction extends AbstractExerciseSensitiveAction {
 
     private static final Logger log = Logger.getLogger(RequestReviewAction.class.getName());
@@ -58,7 +54,7 @@ public final class PastebinAction extends AbstractExerciseSensitiveAction {
     private TmcEventBus eventBus;
 
     public PastebinAction() {
-        this.settings = ((TmcCoreSettingsImpl)TmcSettingsHolder.get());
+        this.settings = ((TmcCoreSettingsImpl) TmcSettingsHolder.get());
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
@@ -92,7 +88,7 @@ protected void performAction(Node[] nodes) {
             Exercise exercise = projectMediator.tryGetExerciseForProject(projectInfo, courseDb);
             if (exercise != null) {
                 eventBus.post(new PastebinAction.InvokedEvent(projectInfo));
-                showPasteRequestDialog(projectInfo, exercise);
+                showPasteRequestDialog(exercise);
             } else {
                 log.log(
                         Level.WARNING,
@@ -106,83 +102,45 @@ protected void performAction(Node[] nodes) {
         }
     }
 
-    private void showPasteRequestDialog(final TmcProjectInfo projectInfo, final Exercise exercise) {
+    private void showPasteRequestDialog(final Exercise exercise) {
         final PastebinDialog dialog = new PastebinDialog(exercise);
         dialog.setOkListener(
                 new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        String message = dialog.getMessageForReviewer().trim();
-                        submitPaste(projectInfo, exercise, message);
-                    }
-                });
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String message = dialog.getMessageForReviewer().trim();
+                submitPaste(exercise, message);
+            }
+        });
         dialog.setVisible(true);
     }
 
     private void submitPaste(
-            final TmcProjectInfo projectInfo,
             final Exercise exercise,
             final String messageForReviewer) {
         projectMediator.saveAllFiles();
 
-        final String errorMsgLocale = settings.getErrorMsgLocale().toString();
+        Callable<URI> pasteTask = TmcCore.get()
+                .pasteWithComment(ProgressObserver.NULL_OBSERVER, exercise, messageForReviewer);
 
         BgTask.start(
-                "Zipping up " + exercise.getName(),
-                new Callable<byte[]>() {
-                    @Override
-                    public byte[] call() throws Exception {
-                        RecursiveZipper zipper =
-                                new RecursiveZipper(
-                                        projectInfo.getProjectDirAsFile(),
-                                        projectInfo.getZippingDecider());
-                        return zipper.zipProjectSources();
-                    }
-                },
-                new BgTaskListener<byte[]>() {
-                    @Override
-                    public void bgTaskReady(byte[] zipData) {
-                        Map<String, String> extraParams = new HashMap<String, String>();
-                        extraParams.put("error_msg_locale", errorMsgLocale);
-                        extraParams.put("paste", "1");
-                        if (!messageForReviewer.isEmpty()) {
-                            extraParams.put("message_for_paste", messageForReviewer);
-                        }
-
-                        final ServerAccess sa = new ServerAccess();
-                        CancellableCallable<ServerAccess.SubmissionResponse> submitTask =
-                                sa.getSubmittingExerciseTask(exercise, zipData, extraParams);
-
-                        BgTask.start(
-                                "Sending " + exercise.getName(),
-                                submitTask,
-                                new BgTaskListener<ServerAccess.SubmissionResponse>() {
-                                    @Override
-                                    public void bgTaskReady(
-                                            ServerAccess.SubmissionResponse result) {
-                                        new PastebinResponseDialog(result.pasteUrl.toString())
-                                                .setVisible(true);
-                                    }
-
-                                    @Override
-                                    public void bgTaskCancelled() {}
-
-                                    @Override
-                                    public void bgTaskFailed(Throwable ex) {
-                                        dialogs.displayError(
-                                                "Failed to send exercise to pastebin", ex);
-                                    }
-                                });
-                    }
-
-                    @Override
-                    public void bgTaskCancelled() {}
-
-                    @Override
-                    public void bgTaskFailed(Throwable ex) {
-                        dialogs.displayError("Failed to zip up exercise", ex);
-                    }
-                });
+                "Sending " + exercise.getName(), pasteTask, new BgTaskListener<URI>() {
+            @Override
+            public void bgTaskReady(URI result) {
+                new PastebinResponseDialog(result.toString())
+                        .setVisible(true);
+            }
+
+            @Override
+            public void bgTaskCancelled() {
+            }
+
+            @Override
+            public void bgTaskFailed(Throwable ex) {
+                dialogs.displayError(
+                        "Failed to send exercise to pastebin", ex);
+            }
+        });
     }
 
     @Override