Merge branch 'MDLSITE-6243_storage-upgrade'

Author: mudrd8mz

admin/newlanguage.php

@@ -30,6 +30,9 @@
 require_login(SITEID, false);
 require_capability('local/amos:manage', context_system::instance());
 
+$cache = cache::make('local_amos', 'listlanguages');
+$cache->delete('langs');
+
 $PAGE->set_pagelayout('standard');
 $PAGE->set_url('/local/amos/admin/newlanguage.php');
 $PAGE->set_title('AMOS ' . get_string('newlanguage', 'local_amos'));
@@ -38,7 +41,7 @@
 $form = new local_amos_newlanguage_form();
 
 if ($data = $form->get_data()) {
-    $component = new mlang_component('langconfig', $data->langcode, mlang_version::by_code(mlang_version::MOODLE_40));
+    $component = new mlang_component('langconfig', $data->langcode, mlang_version::latest_version());
     $data->langname = mlang_string::fix_syntax($data->langname);
     $data->langnameint = mlang_string::fix_syntax($data->langnameint);
     $component->add_string(new mlang_string('thislanguage', $data->langname));

classes/external/update_strings_file.php

@@ -99,7 +99,7 @@ public static function update_strings_file($userinfo, $message, $components) {
             $componentlanguage = $component['language'];
 
             $componentversion = \mlang_version::by_dir($component['moodlebranch']);
-            if (is_null($componentversion) or $componentversion->code < \mlang_version::MOODLE_20) {
+            if (is_null($componentversion) || $componentversion->code <= 19) {
                 throw new \invalid_parameter_exception('Unsupported Moodle branch');
             }
 
@@ -162,7 +162,7 @@ public static function update_strings_file($userinfo, $message, $components) {
 
         // Populate the list of staged components for later auto-merge.
         $componentnames = array();
-        foreach ($stage->get_iterator() as $component) {
+        foreach ($stage as $component) {
             $componentnames[] = $component->name;
         }
 
@@ -171,12 +171,9 @@ public static function update_strings_file($userinfo, $message, $components) {
         // The following will throw exception if the commit fails.
         $stage->commit($message, array('source' => 'import', 'userinfo' => $userinfo), true);
 
-        // The import might have introduce a new component, clear the caches.
-        \mlang_tools::list_components(false);
-
         // Auto-merge updated components.
         foreach ($componentnames as $componentname) {
-            \mlang_tools::auto_merge($componentname);
+            \mlang_tools::backport_translations($componentname);
         }
 
         // Done! Thank you for calling this web service.

classes/privacy/provider.php

@@ -301,8 +301,8 @@ protected static function export_user_data_contributions(int $userid) {
 
             $strings = [];
 
-            foreach ($stage->get_iterator() as $component) {
-                foreach ($component->get_iterator() as $string) {
+            foreach ($stage as $component) {
+                foreach ($component as $string) {
                     $strings[] = [
                         'branch' => $string->component->version->code,
                         'lang' => $string->component->lang,
@@ -392,8 +392,8 @@ protected static function export_user_data_stashes(int $userid) {
 
             $strings = [];
 
-            foreach ($stage->get_iterator() as $component) {
-                foreach ($component->get_iterator() as $string) {
+            foreach ($stage as $component) {
+                foreach ($component as $string) {
                     $strings[] = [
                         'branch' => $string->component->version->code,
                         'lang' => $string->component->lang,

cli/automerge.php renamed to cli/backport.php

@@ -1,6 +1,5 @@
 <?php
-
-// This file is part of Moodle - http://moodle.org/
+// This file is part of Moodle - https://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -16,17 +15,16 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automerge components
+ * CLI utility to backport all translations for all components on all branches.
  *
  * @package     local_amos
- * @subpackage  cli
- * @copyright   2013 David Mudrak <[email protected]>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright   2020 David Mudrák <[email protected]>
+ * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 define('CLI_SCRIPT', true);
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
+require(__DIR__ . '/../../../config.php');
 require_once($CFG->dirroot . '/local/amos/mlanglib.php');
 require_once($CFG->dirroot . '/local/amos/cli/utilslib.php');
 require_once($CFG->libdir.'/clilib.php');
@@ -56,27 +54,17 @@
 
 $logger = new amos_cli_logger();
 
-$logger->log('automerge', 'Loading list of components ...', amos_cli_logger::LEVEL_DEBUG);
-
-$sql = "SELECT DISTINCT component
-          FROM {amos_snapshot}
-         WHERE lang = :lang";
-
-$params = ['lang' => 'en'];
-
-if (!empty($options['component'])) {
-    $sql .= " AND component = :component";
-    $params['component'] = $options['component'];
-}
-
-$components = $DB->get_fieldset_sql($sql, $params);
+$logger->log('backport', 'Loading list of components ...', amos_cli_logger::LEVEL_DEBUG);
 
+$components = array_keys(mlang_tools::list_components());
 $count = count($components);
 $i = 1;
+
 foreach ($components as $component) {
-    $logger->log('automerge', $i.'/'.$count.' automerging '.$component.' ...');
-    mlang_tools::auto_merge($component);
+    $logger->log('backport', sprintf('%d%% %d/%d backporting %s translations ...',
+        floor($i / $count * 100), $i, $count, $component));
+    mlang_tools::backport_translations($component);
     $i++;
 }
 
-$logger->log('automerge', 'Done!');
+$logger->log('backport', 'Done!');

cli/clean-texts.php

@@ -38,7 +38,7 @@
 
 $tree = mlang_tools::components_tree();
 foreach ($tree as $vercode => $languages) {
-    if ($vercode <= mlang_version::MOODLE_19) {
+    if ($vercode <= 19) {
         continue;
     }
     $version = mlang_version::by_code($vercode);

cli/contrib-bulk.php

@@ -0,0 +1,105 @@
+<?php
+// This file is part of Moodle - https://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * CLI script allowing to perform bulk operations over AMOS contributions.
+ *
+ * @package     local_amos
+ * @copyright   2020 David Mudrák <[email protected]>
+ * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(__DIR__ . '/../../../config.php');
+require_once($CFG->libdir . '/clilib.php');
+require_once($CFG->dirroot . '/local/amos/locallib.php');
+
+$usage = "Perform bulk operations over AMOS contributed translations.
+
+Usage:
+    # php contrib-bulk.php --user=<userid> --approve
+
+Options:
+    --author=<userid>   User ID of the contributor.
+    --approve           Approve all the pending contributions by the user.
+
+";
+
+define('AMOS_BOT_USERID', 2);
+
+[$options, $unrecognised] = cli_get_params([
+    'help' => false,
+    'author' => null,
+    'approve' => false,
+], [
+    'h' => 'help',
+    'e' => 'execute',
+]);
+
+if ($unrecognised) {
+    $unrecognised = implode(PHP_EOL . '  ', $unrecognised);
+    cli_error(get_string('cliunknowoption', 'core_admin', $unrecognised));
+}
+
+if ($options['help']) {
+    cli_writeln($usage);
+    exit(2);
+}
+
+if (empty($options['author'])) {
+    cli_error('Missing mandatory argument: author', 2);
+}
+
+$sql = "SELECT c.id, c.lang, c.subject, c.stashid, c.status, c.timecreated,
+               s.components, s.strings, " .
+               user_picture::fields('a', null, 'authorid', 'author') . "
+          FROM {amos_contributions} c
+          JOIN {amos_stashes} s ON (c.stashid = s.id)
+          JOIN {user} a ON c.authorid = a.id
+         WHERE c.status < :rejected
+           AND a.id = :authorid
+      ORDER BY c.timemodified";
+
+$contributions = $DB->get_records_sql($sql, [
+    'rejected' => local_amos_contribution::STATE_REJECTED,
+    'authorid' => $options['author'],
+]);
+
+$stage = new mlang_stage();
+
+foreach ($contributions as $contribution) {
+    echo sprintf("#%d\t%s\t%s\t%d\n", $contribution->id, $contribution->subject, $contribution->components, $contribution->strings);
+
+    if ($options['approve']) {
+        $stash = mlang_stash::instance_from_id($contribution->stashid);
+        $stash->apply($stage);
+
+        $stage->commit('Bulk approval - contribution #' . $contribution->id, [
+            'source' => 'bot',
+            'userinfo' => 'AMOS-bot <[email protected]>'
+        ]);
+
+        $update = [
+            'id' => $contribution->id,
+            'timemodified' => time(),
+            'assignee' => AMOS_BOT_USERID,
+            'status' => local_amos_contribution::STATE_ACCEPTED,
+        ];
+
+        $DB->update_record('amos_contributions', $update);
+    }
+}