reduce access of read thread in webDeployment jobs #694

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentProjectComponent.java

@@ -4,6 +4,8 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.extensions.PluginId;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
@@ -44,10 +46,12 @@ public void projectOpened() {
 
         // remote file downloader
         if(Settings.getInstance(project).remoteDevFileScheduler) {
+            Symfony2ProjectComponent.getLogger().info("Starting Symfony webDeployment background scheduler");
+
             DumbService.getInstance(project).smartInvokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    new Timer().schedule(new MyTimerTask(), 10000, 300000);
+                    new Timer().schedule(new MyTimerTask(), 1000, 300000);
                 }
             });
         }
@@ -63,19 +67,22 @@ private class MyTimerTask extends TimerTask {
 
         @Override
         public void run() {
+            if(!RemoteWebServerUtil.hasConfiguredRemoteFile(project)) {
+                return;
+            }
 
             DumbService.getInstance(project).smartInvokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    ApplicationManager.getApplication().runReadAction(new Runnable() {
+                    new Task.Backgroundable(project, "Symfony: Remote File Download", false) {
                         @Override
-                        public void run() {
+                        public void run(@NotNull ProgressIndicator indicator) {
+                            Symfony2ProjectComponent.getLogger().info("Running background webDeployment dev download");
                             RemoteWebServerUtil.collectRemoteFiles(project);
                         }
-                    });
+                    }.queue();
                 }
             });
-
         }
     }
 }

src/fr/adrienbrault/idea/symfony2plugin/webDeployment/actions/SymfonyWebDeploymentDownloadAction.java

@@ -11,6 +11,7 @@
 import com.jetbrains.plugins.webDeployment.config.PublishConfig;
 import com.jetbrains.plugins.webDeployment.config.WebServerConfig;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
+import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.webDeployment.utils.RemoteWebServerUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -50,11 +51,8 @@ public void actionPerformed(AnActionEvent e) {
         new Task.Backgroundable(project, "Symfony: Downloading Files", false) {
             @Override
             public void run(@NotNull ProgressIndicator indicator) {
-                ApplicationManager.getApplication().runReadAction(new Runnable() {
-                    public void run() {
-                        RemoteWebServerUtil.collectRemoteFiles(project);
-                    }
-                });
+                Symfony2ProjectComponent.getLogger().info("Running webDeployment dev download");
+                RemoteWebServerUtil.collectRemoteFiles(project);
             }
         }.queue();
     }

src/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java

@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.webDeployment.utils;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Condition;
 import com.intellij.util.Function;
@@ -59,7 +60,7 @@ public static <T> T getExtensionInstance(@Nullable Project project, @NotNull Cla
         return null;
     }
 
-    public static void collectRemoteFiles(@NotNull Project project) {
+    public static void collectRemoteFiles(final @NotNull Project project) {
         WebServerConfig defaultServer = PublishConfig.getInstance(project).findDefaultServer();
         if(defaultServer == null) {
             return;
@@ -72,8 +73,8 @@ public static void collectRemoteFiles(@NotNull Project project) {
             return;
         }
 
-        for (RemoteFileStorageInterface fileStorage : RemoteWebServerUtil.getExtension(project)) {
-            Collection<FileObject> contents = new ArrayList<FileObject>();
+        for (final RemoteFileStorageInterface fileStorage : RemoteWebServerUtil.getExtension(project)) {
+            final Collection<FileObject> contents = new ArrayList<FileObject>();
 
             for (Object s : fileStorage.files(project)) {
 
@@ -88,7 +89,12 @@ public static void collectRemoteFiles(@NotNull Project project) {
             }
 
             fileStorage.clear();
-            fileStorage.build(project, contents);
+
+            ApplicationManager.getApplication().runReadAction(new Runnable() {
+                public void run() {
+                    fileStorage.build(project, contents);
+                }
+            });
         }
 
         connection.clone();