Add core update-db #22

Author: junichi11

src/org/netbeans/modules/php/wordpress/WordPressCoreUpgradeChecker.java

@@ -46,14 +46,16 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Collections;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.util.StringUtils;
-import org.netbeans.modules.php.wordpress.wpapis.WordPressVersionCheckApi;
 import org.netbeans.modules.php.wordpress.commands.WordPressCli;
 import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
+import org.netbeans.modules.php.wordpress.wpapis.WordPressVersionCheckApi;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.awt.NotificationDisplayer;
@@ -161,7 +163,7 @@ public CoreUpdateActionListener(PhpModule phpModule) {
             this.phpModule = phpModule;
         }
 
-        @NbBundle.Messages("CoreUpdateActionListener.comfirmation=Do you want to update? (run wp core update)")
+        @NbBundle.Messages("CoreUpdateActionListener.comfirmation=Do you want to update? (run wp core update, update-db)")
         @Override
         public void actionPerformed(ActionEvent e) {
             if (StringUtils.isEmpty(WordPressOptions.getInstance().getWpCliPath())) {
@@ -176,12 +178,31 @@ public void actionPerformed(ActionEvent e) {
             if (DialogDisplayer.getDefault().notify(comfirmation) != NotifyDescriptor.OK_OPTION) {
                 return;
             }
-            try {
-                WordPressCli wpCli = WordPressCli.getDefault(true);
-                wpCli.coreUpdate(phpModule, Collections.<String>emptyList());
-            } catch (InvalidPhpExecutableException ex) {
-                Exceptions.printStackTrace(ex);
-            }
+
+            new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        // core update, update-db
+                        WordPressCli wpCli = WordPressCli.getDefault(true);
+                        Future<Integer> result = wpCli.coreUpdate(phpModule, Collections.<String>emptyList());
+                        if (result != null) {
+                            result.get();
+                        }
+                        result = wpCli.coreUpdateDb(phpModule);
+                        if (result != null) {
+                            result.get();
+                        }
+                    } catch (InvalidPhpExecutableException ex) {
+                        Exceptions.printStackTrace(ex);
+                    } catch (InterruptedException ex) {
+                        Exceptions.printStackTrace(ex);
+                    } catch (ExecutionException ex) {
+                        Exceptions.printStackTrace(ex);
+                    }
+                }
+            }).start();
         }
     }
 

src/org/netbeans/modules/php/wordpress/WordPressVersion.java

@@ -41,14 +41,18 @@
  */
 package org.netbeans.modules.php.wordpress;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
+import org.netbeans.modules.php.wordpress.ui.status.DebugStatusLineElement;
 import org.netbeans.modules.php.wordpress.util.WPFileUtils;
 import org.netbeans.modules.php.wordpress.util.WPUtils;
+import org.openide.awt.StatusLineElementProvider;
 import org.openide.filesystems.FileChangeAdapter;
 import org.openide.filesystems.FileEvent;
 import org.openide.filesystems.FileObject;
+import org.openide.util.Lookup;
 
 /**
  *
@@ -96,6 +100,16 @@ private WordPressVersion(String versionNumber, FileObject versionFile) {
             public void fileChanged(FileEvent fe) {
                 FileObject versionFile = fe.getFile();
                 initVersion(WPUtils.getVersion(versionFile));
+
+                // reset status bar
+                Collection<? extends StatusLineElementProvider> elements = Lookup.getDefault().lookupAll(StatusLineElementProvider.class);
+                for (StatusLineElementProvider element : elements) {
+                    if (element instanceof DebugStatusLineElement) {
+                        DebugStatusLineElement debugElement = (DebugStatusLineElement) element;
+                        debugElement.setPhpModule(null);
+                        break;
+                    }
+                }
             }
         });
     }

src/org/netbeans/modules/php/wordpress/commands/WordPressCli.java

@@ -84,6 +84,7 @@ public final class WordPressCli {
     public static String LONG_NAME = "wp-cli.phar"; // NOI18N
 
     private final String wpCliPath;
+    private boolean noReset = false;
     private static final Logger LOGGER = Logger.getLogger(WordPressCli.class.getName());
 
     // commands
@@ -93,6 +94,7 @@ public final class WordPressCli {
     private static final String CORE_COMMAND = "core"; // NOI18N
     private static final String DOWNLOAD_COMMAND = "download"; // NOI18N
     private static final String UPDATE_COMMAND = "update"; // NOI18N
+    private static final String UPDATE_DB_COMMAND = "update-db"; // NOI18N
 
     // params
     private static final String HELP_PARAM = "--help"; // NOI18N
@@ -161,6 +163,19 @@ public Future<Integer> coreUpdate(PhpModule phpModule, List<String> options) {
         return runCommand(phpModule, allCommands);
     }
 
+    /**
+     * Core update-db.
+     *
+     * @param phpModule
+     * @return
+     */
+    public Future<Integer> coreUpdateDb(PhpModule phpModule) {
+        ArrayList<String> allCommands = new ArrayList<String>(2);
+        allCommands.add(CORE_COMMAND);
+        allCommands.add(UPDATE_DB_COMMAND);
+        return runCommand(phpModule, allCommands);
+    }
+
     /**
      * Get wp-cli version.
      *
@@ -362,7 +377,7 @@ public Future<Integer> runCommand(PhpModule phpModule, List<String> parameters)
         if (executable == null) {
             return null;
         }
-        return executable.displayName(getDisplayName(phpModule, parameters.get(0)))
+        return executable.displayName(getDisplayName(phpModule, StringUtils.implode(parameters, " "))) // NOI18N
                 .additionalParameters(getAllParameters(parameters))
                 .run(getExecutionDescriptor(null));
     }