L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-64882-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2019-03-07 10:40:16 +08:00
parent 1eb1087748 4ce27477fb
commit 30bb29dae4
10 changed files with 193 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/dropbox/classes/task/cron_task.php
+49
View File
@@ -0,0 +1,49 @@
<?php
// This file is part of Moodle - http://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/>.
namespace repository_dropbox\task;
defined('MOODLE_INTERNAL') || die();
/**
* A schedule task for dropbox repository cron.
*
* @package repository_dropbox
* @copyright 2019 Simey Lameze <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class cron_task extends \core\task\scheduled_task {
/**
* Get a descriptive name for this task (shown to admins).
*
* @return string
*/
public function get_name() {
return get_string('crontask', 'repository_dropbox');
}
/**
* Run dropbox repository cron.
*/
public function execute() {
global $CFG;
require_once($CFG->dirroot . '/repository/lib.php');
$instances = \repository::get_instances(['type' => 'dropbox']);
foreach ($instances as $instance) {
$instance->cron();
}
}
}
repository/dropbox/db/tasks.php
+34
View File
@@ -0,0 +1,34 @@
<?php
// This file is part of Moodle - http://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/>.
/**
* Definition of dropbox repository scheduled tasks.
*
* @package repository_dropbox
* @copyright 2019 Simey Lameze <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
$tasks = array(
array(
'classname' => '\repository_dropbox\task\cron_task',
'blocking' => 0,
'minute' => '*',
'hour' => '*',
'day' => '*',
'month' => '*',
'dayofweek' => '*'
)
);
repository/dropbox/lang/en/repository_dropbox.php
+1
View File
@@ -23,6 +23,7 @@
*/
$string['configplugin'] = 'Dropbox configuration';
$string['crontask'] = 'Background processing for dropbox repository';
$string['notitle'] = 'notitle';
$string['remember'] = 'Remember me';
$string['pluginname'] = 'Dropbox';
repository/dropbox/lib.php
-10
View File
@@ -807,13 +807,3 @@ class repository_dropbox extends repository {
return $this->cachelimit;
}
}
/**
* Dropbox plugin cron task.
*/
function repository_dropbox_cron() {
$instances = repository::get_instances(array('type'=>'dropbox'));
foreach ($instances as $instance) {
$instance->cron();
}
}
repository/dropbox/version.php
+1 -1
View File
@@ -25,6 +25,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2018120300; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2018120301; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2018112800; // Requires this Moodle version
$plugin->component = 'repository_dropbox'; // Full name of the plugin (used for diagnostics)
repository/filesystem/classes/task/cron_task.php
+72
View File
@@ -0,0 +1,72 @@
<?php
// This file is part of Moodle - http://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/>.
namespace repository_filesystem\task;
defined('MOODLE_INTERNAL') || die();
/**
* A schedule task for file system repository cron.
*
* @package repository_filesystem
* @copyright 2019 Simey Lameze <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class cron_task extends \core\task\scheduled_task {
/**
* Get a descriptive name for this task (shown to admins).
*
* @return string
*/
public function get_name() {
return get_string('crontask', 'repository_filesystem');
}
/**
* Run file system repository cron.
*/
public function execute() {
global $CFG;
require_once($CFG->dirroot . '/repository/lib.php');
$fs = get_file_storage();
// Find all generated thumbnails and group them in array by itemid (itemid == repository instance id).
$allfiles = array_merge(
$fs->get_area_files(SYSCONTEXTID, 'repository_filesystem', 'thumb'),
$fs->get_area_files(SYSCONTEXTID, 'repository_filesystem', 'icon')
);
$filesbyitem = array();
foreach ($allfiles as $file) {
if (!isset($filesbyitem[$file->get_itemid()])) {
$filesbyitem[$file->get_itemid()] = array();
}
$filesbyitem[$file->get_itemid()][] = $file;
}
// Find all instances of repository_filesystem.
$instances = \repository::get_instances(array('type' => 'filesystem'));
// Loop through all itemids of generated thumbnails.
foreach ($filesbyitem as $itemid => $files) {
if (!isset($instances[$itemid]) || !($instances[$itemid] instanceof repository_filesystem)) {
// Instance was deleted.
$fs->delete_area_files(SYSCONTEXTID, 'repository_filesystem', 'thumb', $itemid);
$fs->delete_area_files(SYSCONTEXTID, 'repository_filesystem', 'icon', $itemid);
mtrace(" instance $itemid does not exist: deleted all thumbnails");
} else {
// Instance has some generated thumbnails, check that they are not outdated.
$instances[$itemid]->remove_obsolete_thumbnails($files);
}
}
}
}
repository/filesystem/db/tasks.php
+34
View File
@@ -0,0 +1,34 @@
<?php
// This file is part of Moodle - http://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/>.
/**
* Definition of file system repository scheduled tasks.
*
* @package repository_filesystem
* @copyright 2019 Simey Lameze <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
$tasks = array(
array(
'classname' => '\repository_filesystem\task\cron_task',
'blocking' => 0,
'minute' => '*',
'hour' => '*',
'day' => '*',
'month' => '*',
'dayofweek' => '*'
)
);
repository/filesystem/lang/en/repository_filesystem.php
+1
View File
@@ -25,6 +25,7 @@
$string['blockedpath'] = 'Blocked root path';
$string['configplugin'] = 'Configuration for file system repository';
$string['crontask'] = 'Background processing for filesystem repository';
$string['donotusesysdir'] = 'Don\'t use system directory as repository, including';
$string['filesystem:view'] = 'View file system repository';
$string['information'] = 'These folders are within the <b>{$a}</b> directory.';
repository/filesystem/lib.php
-33
View File
@@ -857,36 +857,3 @@ function repository_filesystem_pluginfile($course, $cm, $context, $filearea, $ar
}
send_stored_file($file, $lifetime, 0, $forcedownload, $options);
}
/**
* Cron callback for repository_filesystem. Deletes the thumbnails for deleted or changed files.
*/
function repository_filesystem_cron() {
$fs = get_file_storage();
// Find all generated thumbnails and group them in array by itemid (itemid == repository instance id).
$allfiles = array_merge(
$fs->get_area_files(SYSCONTEXTID, 'repository_filesystem', 'thumb'),
$fs->get_area_files(SYSCONTEXTID, 'repository_filesystem', 'icon')
);
$filesbyitem = array();
foreach ($allfiles as $file) {
if (!isset($filesbyitem[$file->get_itemid()])) {
$filesbyitem[$file->get_itemid()] = array();
}
$filesbyitem[$file->get_itemid()][] = $file;
}
// Find all instances of repository_filesystem.
$instances = repository::get_instances(array('type' => 'filesystem'));
// Loop through all itemids of generated thumbnails.
foreach ($filesbyitem as $itemid => $files) {
if (!isset($instances[$itemid]) || !($instances[$itemid] instanceof repository_filesystem)) {
// Instance was deleted.
$fs->delete_area_files(SYSCONTEXTID, 'repository_filesystem', 'thumb', $itemid);
$fs->delete_area_files(SYSCONTEXTID, 'repository_filesystem', 'icon', $itemid);
mtrace(" instance $itemid does not exist: deleted all thumbnails");
} else {
// Instance has some generated thumbnails, check that they are not outdated.
$instances[$itemid]->remove_obsolete_thumbnails($files);
}
}
}
repository/filesystem/version.php
+1 -1
View File
@@ -26,6 +26,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2018120300; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2018120301; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2018112800; // Requires this Moodle version
$plugin->component = 'repository_filesystem'; // Full name of the plugin (used for diagnostics)