Changeset 5444

Timestamp:

04/30/2017 04:00:54 PM (9 years ago)

Author:

ocean90

Message:

Plugin Directory: Introduce I18n_Import::get_plugin_svn_url() and use it in the code/readme importers.

Also move the constructor to the parent class.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n

Files:

• class-code-import.php (modified) (8 diffs)
• class-i18n-import.php (modified) (2 diffs)
• class-readme-import.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\CLI\I18N;
 
+use Exception;
 use WordPressdotorg\Plugin_Directory\Readme\Parser;
+use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
 use WordPressdotorg\Plugin_Directory\Tools\SVN;
-use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
-use Exception;
 use WP_Error;
 
@@ -14 +14 @@
  */
 class Code_Import extends I18n_Import {
-    const PLUGIN_SVN_BASE = 'https://plugins.svn.wordpress.org';
-
-    /**
-     * Slug of the plugin.
-     *
-     * @var string
-     */
-    private $plugin;
-
-    /**
-     * Constructor.
-     *
-     * @param string $plugin The plugin slug.
-     */
-    public function __construct( $plugin ) {
-        $this->plugin = $plugin;
-    }
 
     /**
@@ -40 +23 @@
      */
     public function import_from_tag( $tag ) {
-        $plugin_url = self::PLUGIN_SVN_BASE . "/{$this->plugin}/{$tag}";
+        $svn_url = $this->get_plugin_svn_url( $tag );
 
-        $files = SVN::ls( $plugin_url );
+        $files = SVN::ls( $svn_url );
         if ( ! $files ) {
             throw new Exception( "Plugin has no files in {$tag}." );
@@ -50 +33 @@
         $export_directory = $tmp_directory . '/export';
 
-        $res = SVN::export( $plugin_url, $export_directory, [ 'ignore-externals' ] );
+        $res = SVN::export( $svn_url, $export_directory, [ 'ignore-externals' ] );
         if ( ! $res['result'] ) {
             throw new Exception( 'Plugin export failed.' );
@@ -57 +40 @@
         $valid = $this->is_plugin_valid( $export_directory );
         if ( is_wp_error( $valid ) ) {
-            throw new Exception( 'Plugin is not compatible with language packs.' );
+            throw new Exception( 'Plugin is not compatible with language packs: ' . $valid->get_error_message() );
         }
 
@@ -67 +50 @@
         $makepot  = new \MakePOT;
 
-        if ( ! $makepot->wp_plugin( $export_directory, $pot_file, $this->plugin ) || ! file_exists( $pot_file ) ) {
+        if ( $makepot->wp_plugin( $export_directory, $pot_file, $this->plugin ) || ! file_exists( $pot_file ) ) {
             throw new Exception( "POT file couldn't be created." );
         }
@@ -94 +77 @@
      */
     private function is_plugin_valid( $export_directory ) {
-        $error  = new WP_Error();
         $readme = new Parser( $this->find_readme_file( $export_directory ) );
 
         // Whether plugin files should be checked for valid text domains.
         if ( empty( $readme->requires ) || version_compare( $readme->requires, '4.6', '<' ) ) {
+            $error  = new WP_Error();
             $esc_export_directory = escapeshellarg( $export_directory );
 
@@ -122 +105 @@
                 return $error;
             }
-
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-i18n-import.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\CLI\I18N;
+
+use WordPressdotorg\Plugin_Directory\CLI\Import;
 use WordPressdotorg\Plugin_Directory\Plugin_I18n;
 use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
 use WP_Error;
-
 
 /**
@@ -12 +13 @@
  */
 abstract class I18n_Import {
+
+    /**
+     * Slug of the plugin.
+     *
+     * @var string
+     */
+    protected $plugin;
+
+    /**
+     * Constructor.
+     *
+     * @param string $plugin The plugin slug.
+     */
+    public function __construct( $plugin ) {
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Imports a specific tag to GlotPress.
+     *
+     * @param string $tag SVN tag of the import.
+     *
+     * @throws Exception
+     */
+    abstract public function import_from_tag( $tag );
+
+    /**
+     * Returns the SVN URL for a plugins tag.
+     *
+     * @param string $tag SVN tag or 'trunk'.
+     * @return string Plugins SVN URL.
+     */
+    public function get_plugin_svn_url( $tag ) {
+        if ( 'trunk' === $tag ) {
+            return Import::PLUGIN_SVN_BASE . "/{$this->plugin}/trunk/";
+        } else {
+            return Import::PLUGIN_SVN_BASE . "/{$this->plugin}/tags/{$tag}/";
+        }
+    }
 
     /**

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-readme-import.php

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\CLI\I18N;
 
+use Exception;
 use PO;
 use Translation_Entry;
-use WordPressdotorg\Plugin_Directory\Tools\SVN;
 use WordPressdotorg\Plugin_Directory\Readme\Parser;
 use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
-use Exception;
+use WordPressdotorg\Plugin_Directory\Tools\SVN;
 
 /**
@@ -15 +15 @@
  */
 class Readme_Import extends I18n_Import {
-    const PLUGIN_SVN_BASE = 'https://plugins.svn.wordpress.org';
-
-    /**
-     * Slug of the plugin.
-     *
-     * @var string
-     */
-    private $plugin;
-
-    /**
-     * Constructor.
-     *
-     * @param string $plugin The plugin slug.
-     */
-    public function __construct( $plugin ) {
-        $this->plugin = $plugin;
-    }
 
     /**
@@ -41 +24 @@
      */
     public function import_from_tag( $tag ) {
-        if ( 'trunk' === $tag ) {
-            $svn_url = self::PLUGIN_SVN_BASE . "/{$this->plugin}/trunk/";
-        } else {
-            $svn_url = self::PLUGIN_SVN_BASE . "/{$this->plugin}/tags/{$tag}/";
-        }
+        $svn_url = $this->get_plugin_svn_url( $tag );
 
         $files = SVN::ls( $svn_url );