キャンセル要求が成功した場合は一旦キャンセル表示を行う(cancelledイベントが飛ばない場合があるので)

[coroid/inqubus.git] / frontend / src / yukihane / inqubus / manager / TaskManage.java

diff --git a/frontend/src/yukihane/inqubus/manager/TaskManage.java b/frontend/src/yukihane/inqubus/manager/TaskManage.java
index 47d4f10..67c219b 100644 (file)
--- a/frontend/src/yukihane/inqubus/manager/TaskManage.java
+++ b/frontend/src/yukihane/inqubus/manager/TaskManage.java
@@ -1,5 +1,6 @@
 package yukihane.inqubus.manager;
 
 package yukihane.inqubus.manager;
 

+import java.io.File;

 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;


@@ -8,6 +9,8 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import saccubus.worker.WorkerListener;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import saccubus.worker.WorkerListener;

+import saccubus.worker.impl.MessageReportable;
+import saccubus.worker.impl.PercentageReportable;

 import saccubus.worker.impl.convert.Convert;
 import saccubus.worker.impl.convert.ConvertProgress;
 import saccubus.worker.impl.convert.ConvertResult;
 import saccubus.worker.impl.convert.Convert;
 import saccubus.worker.impl.convert.ConvertProgress;
 import saccubus.worker.impl.convert.ConvertResult;


@@ -22,24 +25,27 @@ import saccubus.worker.profile.DownloadProfile;
  * @author yuki
  */
 public class TaskManage {
  * @author yuki
  */
 public class TaskManage {

+

     private static final Logger logger = Logger.getLogger(TaskManage.class.getName());
     private final ExecutorService downloadExecutorService;
     private final ExecutorService convertExecutorService;
     private final Map<Integer, ManageTarget<DownloadResult>> downloadTargets = new HashMap<>();
     private final Map<Integer, ManageTarget<ConvertResult>> convertTargets = new HashMap<>();
     private final TaskManageListener clientListener;
     private static final Logger logger = Logger.getLogger(TaskManage.class.getName());
     private final ExecutorService downloadExecutorService;
     private final ExecutorService convertExecutorService;
     private final Map<Integer, ManageTarget<DownloadResult>> downloadTargets = new HashMap<>();
     private final Map<Integer, ManageTarget<ConvertResult>> convertTargets = new HashMap<>();
     private final TaskManageListener clientListener;

+    private final int waitDownload;

 
     public TaskManage() {
 
     public TaskManage() {

-        this(1, 1, null);
+        this(1, 30, 1, null);

     }
 
     public TaskManage(int maxDownload, int maxConvert) {
     }
 
     public TaskManage(int maxDownload, int maxConvert) {

-        this(maxDownload, maxConvert, null);
+        this(maxDownload, 30, maxConvert, null);

     }
 
     }
 

-    public TaskManage(int maxDownload, int maxConvert, TaskManageListener listener) {
+    public TaskManage(int maxDownload, int waitDownload, int maxConvert, TaskManageListener listener) {

         downloadExecutorService = Executors.newFixedThreadPool(maxDownload);
         convertExecutorService = Executors.newFixedThreadPool(maxConvert);
         downloadExecutorService = Executors.newFixedThreadPool(maxDownload);
         convertExecutorService = Executors.newFixedThreadPool(maxConvert);

+        this.waitDownload = waitDownload;

         this.clientListener = listener;
     }
 
         this.clientListener = listener;
     }
 


@@ -49,7 +55,7 @@ public class TaskManage {
         if (dp != null && (dp.getVideoProfile().isDownload() || dp.getCommentProfile().isDownload())) {
             // ダウンロードするものがあればまずダウンロード処理
             final Download task = new Download(dp, request.getVideoId(),
         if (dp != null && (dp.getVideoProfile().isDownload() || dp.getCommentProfile().isDownload())) {
             // ダウンロードするものがあればまずダウンロード処理
             final Download task = new Download(dp, request.getVideoId(),

-                    new DownloadListener(request.getRowId()));
+                    new DownloadListener(request.getRowId()), waitDownload);

             final Future<DownloadResult> future = downloadExecutorService.submit(task);
             downloadTargets.put(request.getRowId(), new ManageTarget<>(request, future));
             return true;
             final Future<DownloadResult> future = downloadExecutorService.submit(task);
             downloadTargets.put(request.getRowId(), new ManageTarget<>(request, future));
             return true;


@@ -64,6 +70,20 @@ public class TaskManage {
         return false;
     }
 
         return false;
     }
 

+    public synchronized boolean cancel(int rowId) {
+        // FIXME 実行前にキャンセルした場合にはcancelledイベントが飛ばないのでMapからリクエストを削除できない
+        final ManageTarget<DownloadResult> down = downloadTargets.get(rowId);
+        if (down != null) {
+            return down.getFuture().cancel(true);
+        }
+        final ManageTarget<ConvertResult> conv = convertTargets.get(rowId);
+        if (conv != null) {
+            return conv.getFuture().cancel(true);
+        }
+
+        return false;
+    }
+

     private class DownloadListener extends TaskManageInnerListener<DownloadResult, DownloadProgress> {
 
         private DownloadListener(int rowId) {
     private class DownloadListener extends TaskManageInnerListener<DownloadResult, DownloadProgress> {
 
         private DownloadListener(int rowId) {


@@ -73,13 +93,34 @@ public class TaskManage {
         @Override
         public void done(DownloadResult result) {
             super.done(result);
         @Override
         public void done(DownloadResult result) {
             super.done(result);

-            // TODO 変換が必要なら変換キューに入れる
+            synchronized (TaskManage.this) {
+                final ManageTarget<DownloadResult> mt = removeRequest(getRowId());
+                final RequestProcess request = mt.getRequest();
+                if (request.getConvertProfile().isConvert()) {
+                    final DownloadProfile dp = request.getDownloadProfile();
+                    final File video = (dp.getVideoProfile().isDownload()) ? result.getDownloadVideo() : dp.
+                            getVideoProfile().getLocalFile();
+                    final File comment = (dp.getCommentProfile().isDownload()) ? result.getDownloadComment() : dp.
+                            getCommentProfile().getLocalFile();
+                    final ConvertProfile cp = request.getConvertProfile();
+                    final Convert task = new Convert(cp, video, comment, new ConvertListener(getRowId()));
+                    final Future<ConvertResult> future = convertExecutorService.submit(task);
+                    convertTargets.put(request.getRowId(), new ManageTarget<>(request, future));
+                }
+                // TODO 変換が必要なら変換キューに入れる
+            }
+

         }
 
         @Override
         protected TaskKind getKind() {
             return TaskKind.DOWNLOAD;
         }
         }
 
         @Override
         protected TaskKind getKind() {
             return TaskKind.DOWNLOAD;
         }

+
+        @Override
+        protected ManageTarget<DownloadResult> removeRequest(int rowId) {
+            return downloadTargets.remove(rowId);
+        }

     }
 
     private class ConvertListener extends TaskManageInnerListener<ConvertResult, ConvertProgress> {
     }
 
     private class ConvertListener extends TaskManageInnerListener<ConvertResult, ConvertProgress> {


@@ -92,9 +133,22 @@ public class TaskManage {
         protected TaskKind getKind() {
             return TaskKind.CONVERT;
         }
         protected TaskKind getKind() {
             return TaskKind.CONVERT;
         }

+
+        @Override
+        public void done(ConvertResult result) {
+            super.done(result);
+            synchronized (TaskManage.this) {
+                removeRequest(getRowId());
+            }
+        }
+
+        @Override
+        protected ManageTarget<ConvertResult> removeRequest(int rowId) {
+            return convertTargets.remove(rowId);
+        }

     }
 
     }
 

-    abstract class TaskManageInnerListener<T, V> implements WorkerListener<T, V> {
+    abstract class TaskManageInnerListener<T, V extends PercentageReportable & MessageReportable> implements WorkerListener<T, V> {

 
         private final int rowId;
 
 
         private final int rowId;
 


@@ -102,8 +156,12 @@ public class TaskManage {
             this.rowId = rowId;
         }
 
             this.rowId = rowId;
         }
 

+        protected int getRowId() {
+            return rowId;
+        }
+

         private void notify(TaskStatus status) {
         private void notify(TaskStatus status) {

-            notify(status, 0.0, "");
+            notify(status, -1.0, "");

         }
 
         private void notify(TaskStatus status, double percentage, String message) {
         }
 
         private void notify(TaskStatus status, double percentage, String message) {


@@ -122,16 +180,22 @@ public class TaskManage {
         @Override
         public void process(V progress) {
             logger.log(Level.FINEST, "process: {0}", progress);
         @Override
         public void process(V progress) {
             logger.log(Level.FINEST, "process: {0}", progress);

-            // TOOD
-            notify(TaskStatus.DOING, 0.0, "");
+            notify(TaskStatus.DOING, progress.getPercentage(), progress.getMessage());

         }
 
         @Override
         }
 
         @Override

-        public void cancelled() {
+        public final void cancelled() {

             logger.log(Level.FINE, "cancelled: {0}", toString());
             logger.log(Level.FINE, "cancelled: {0}", toString());

+            synchronized (TaskManage.this) {
+                removeRequest(rowId);
+            }

             notify(TaskStatus.CANCELLED);
         }
 
             notify(TaskStatus.CANCELLED);
         }
 

+        /**
+         * この処理をオーバライドしてキューからリクエストを削除する必要があります.
+         * @param result 処理結果.
+         */

         @Override
         public void done(T result) {
             logger.log(Level.FINE, "done: {0}", result);
         @Override
         public void done(T result) {
             logger.log(Level.FINE, "done: {0}", result);


@@ -139,10 +203,15 @@ public class TaskManage {
         }
 
         @Override
         }
 
         @Override

-        public void error(Throwable th) {
+        public final void error(Throwable th) {

             logger.log(Level.SEVERE, "error", th);
             logger.log(Level.SEVERE, "error", th);

+            synchronized (TaskManage.this) {
+                removeRequest(rowId);
+            }

             notify(TaskStatus.ERROR, 0.0, th.getMessage());
         }
             notify(TaskStatus.ERROR, 0.0, th.getMessage());
         }

+
+        protected abstract ManageTarget<T> removeRequest(int rowId);

     }
 
     class ManageTarget<T> {
     }
 
     class ManageTarget<T> {