Skip to content

Commit

Permalink
Merge branch 'master' into fix/download-filename
Browse files Browse the repository at this point in the history
  • Loading branch information
justusdieckmann authored Nov 15, 2023
2 parents 25ccb6d + acb7b14 commit 9457f68
Show file tree
Hide file tree
Showing 54 changed files with 4,061 additions and 2,796 deletions.
192 changes: 9 additions & 183 deletions .github/workflows/moodle-ci.yml
Original file line number Diff line number Diff line change
@@ -1,188 +1,14 @@
name: Moodle Plugin CI

on: [push, pull_request]

jobs:
static:
runs-on: ubuntu-latest

outputs:
has_tests: ${{ steps.check_tests.outputs.has_tests }}

strategy:
matrix:
php: ['7.4']
moodle-branch: ['MOODLE_400_STABLE']
database: ['pgsql']
opencast: ['11.4']

steps:
- name: Start PostgreSQL
run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:10

- name: Check out repository code
uses: actions/checkout@v2
with:
path: plugin

- name: Check for test folder
id: check_tests
run: |
echo "::set-output name=has_tests::${{ hashFiles('plugin/tests') != '' }}"
- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Composer cache
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Initialise moodle-plugin-ci
run: |
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
echo $(cd ci/bin; pwd) >> $GITHUB_PATH
echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
sudo locale-gen en_AU.UTF-8
echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
- name: Install moodle-plugin-ci
run: |
moodle-plugin-ci add-plugin unirz-tu-ilmenau/moodle-tool_opencast
moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1 --no-init
env:
DB: ${{ matrix.database }}
MOODLE_BRANCH: ${{ matrix.moodle-branch }}

- name: PHP Lint
if: ${{ always() }}
run: moodle-plugin-ci phplint

- name: PHP Copy/Paste Detector
if: ${{ always() }}
run: moodle-plugin-ci phpcpd

- name: PHP Mess Detector
if: ${{ always() }}
run: moodle-plugin-ci phpmd

- name: Moodle Code Checker
if: ${{ always() }}
run: moodle-plugin-ci codechecker

- name: Moodle PHPDoc Checker
if: ${{ always() }}
run: moodle-plugin-ci phpdoc
########################################################################################################################

- name: Validating
if: ${{ always() }}
run: moodle-plugin-ci validate

- name: Check upgrade savepoints
if: ${{ always() }}
run: moodle-plugin-ci savepoints

- name: Mustache Lint
if: ${{ always() }}
run: moodle-plugin-ci mustache

- name: Grunt
if: ${{ always() }}
run: moodle-plugin-ci grunt --max-lint-warnings 0

test:
runs-on: ubuntu-latest
needs: static
if: ${{ needs.static.outputs.has_tests == 'true' }}

strategy:
fail-fast: false
matrix:
php: ['7.4']
moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE']
database: ['mariadb', 'pgsql']
opencast: ['11.4']

steps:
- name: Start MariaDB
if: matrix.database == 'mariadb'
run: docker run -p 3306:3306 -e MYSQL_USER=root -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mariadb:10

- name: Start PostgreSQL
if: matrix.database == 'pgsql'
run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:10

- name: Check out opencast-docker
uses: actions/checkout@v2
with:
repository: opencast/opencast-docker
ref: ${{ matrix.opencast }}
path: opencast-docker

- name: Start Opencast
run: docker-compose -p opencast-allinone -f opencast-docker/docker-compose/docker-compose.allinone.h2.yml up -d

- name: Check out repository code
uses: actions/checkout@v2
with:
path: plugin

- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Composer cache
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Initialise moodle-plugin-ci
run: |
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
echo $(cd ci/bin; pwd) >> $GITHUB_PATH
echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
sudo locale-gen en_AU.UTF-8
echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
- name: Install moodle-plugin-ci
run: |
moodle-plugin-ci add-plugin unirz-tu-ilmenau/moodle-tool_opencast
moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
env:
DB: ${{ matrix.database }}
MOODLE_BRANCH: ${{ matrix.moodle-branch }}
on: [push, pull_request]

- name: PHPUnit tests
if: ${{ always() }}
run: moodle-plugin-ci phpunit
########################################################################################################################

- name: Behat features
if: ${{ always() }}
run: moodle-plugin-ci behat --profile chrome --auto-rerun 0
jobs:
call-moodle-ci-workflow:
uses: Opencast-Moodle/moodle-workflows-opencast/.github/workflows/moodle-ci.yml@master
with:
requires-tool-plugin: true
branch-tool-plugin: master
56 changes: 9 additions & 47 deletions .github/workflows/moodle-release.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,16 @@
#
# Whenever a new tag starting with "v" is pushed, add the tagged version
# to the Moodle Plugins directory at https://moodle.org/plugins
#
# revision: 2021070201
# Changed to be released on Github release with the release notes.
#
name: Releasing in the Plugins directory
name: Moodle Plugin Release

########################################################################################################################

on:
release:
types: [published]

defaults:
run:
shell: bash
########################################################################################################################

jobs:
release-at-moodle-org:
runs-on: ubuntu-latest
env:
PLUGIN: mod_opencast
CURL: curl -s
ENDPOINT: https://moodle.org/webservice/rest/server.php
TOKEN: ${{ secrets.MOODLE_ORG_TOKEN }}
FUNCTION: local_plugins_add_version

steps:
- name: Call the service function
id: add-version
run: |
TAGNAME="${{ github.event.release.tag_name }}"
BODY="${{ github.event.release.body }}"
ZIPURL="${{ github.event.release.zipball_url }}"
RESPONSE=$(${CURL} ${ENDPOINT} --data-urlencode "wstoken=${TOKEN}" \
--data-urlencode "wsfunction=${FUNCTION}" \
--data-urlencode "moodlewsrestformat=json" \
--data-urlencode "frankenstyle=${PLUGIN}" \
--data-urlencode "zipurl=${ZIPURL}" \
--data-urlencode "vcssystem=git" \
--data-urlencode "vcsrepositoryurl=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \
--data-urlencode "vcstag=${TAGNAME}" \
--data-urlencode "changelogurl=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commits/${TAGNAME}" \
--data-urlencode "altdownloadurl=${ZIPURL}" \
--data-urlencode "releasenotes=${BODY}" \
--data-urlencode "releasenotesformat=4")
echo "::set-output name=response::${RESPONSE}"
- name: Evaluate the response
id: evaluate-response
env:
RESPONSE: ${{ steps.add-version.outputs.response }}
run: |
jq <<< ${RESPONSE}
jq --exit-status ".id" <<< ${RESPONSE} > /dev/null
call-moodle-release-workflow:
uses: Opencast-Moodle/moodle-workflows-opencast/.github/workflows/moodle-release.yml@master
with:
plugin-name: 'mod_opencast'
secrets: inherit
2 changes: 1 addition & 1 deletion amd/build/opencast_player.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion amd/build/opencast_player.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions amd/src/opencast_player.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export const init = (configUrl) => {
export const init = (configUrl, themeUrl) => {
const iframeWindow = document.getElementById('player-iframe').contentWindow;

if (!iframeWindow.MoodlePaellaPlayer || !window.episode) {
setTimeout(init, 20, configUrl);
setTimeout(init, 20, configUrl, themeUrl);
} else {
iframeWindow.MoodlePaellaPlayer.initPaella(configUrl, window.episode);
iframeWindow.MoodlePaellaPlayer.initPaella(configUrl, themeUrl, window.episode);
}
};
15 changes: 13 additions & 2 deletions classes/local/apibridge.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,18 @@ public static function get_instance($ocinstanceid, $forcenewinstance = false) {
/**
* Get all events in the specified series.
* @param string $seriesid
* @param int|null $sortseriesby 1 for sorting by title. Everything else for sorting by date.
* @return false|mixed
*/
public function get_episodes_in_series($seriesid) {
public function get_episodes_in_series($seriesid, $sortseriesby = null) {

$sortstring = 'start_date:DESC,title:ASC';
if ($sortseriesby == 1) {
$sortstring = 'title:ASC,start_date:DESC';
}

$api = new api($this->ocinstanceid);
$resource = "/api/events?filter=is_part_of:$seriesid&withpublications=true&sort=start_date:DESC,title:ASC&sign=true";
$resource = "/api/events?filter=is_part_of:$seriesid&withpublications=true&sort=$sortstring&sign=true";
$response = $api->oc_get($resource);

if ($api->get_http_code() != 200) {
Expand Down Expand Up @@ -187,6 +194,10 @@ public function find_opencast_type_for_id($id) {
return opencasttype::SERIES;
}

if ($id == 'newfileupload') {
return opencasttype::UPLOAD;
}

return opencasttype::UNDEFINED;
}
}
5 changes: 4 additions & 1 deletion classes/local/opencasttype.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,8 @@ class opencasttype {
const EPISODE = 1;
/** @var int The ID specifies a Series */
const SERIES = 2;

/** @var int The ID specifies an Upload */
const UPLOAD = 3;
/** @var int The ID specifies an uploaded Episode waiting to get its opencastid */
const UPLOADED = 4;
}
33 changes: 21 additions & 12 deletions classes/local/output_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,19 @@ class output_helper {

/**
* Prints output for series view.
* @param int $ocinstanceid Opencast instance id
* @param string $seriesid opencast id of series.
* @param string $activityname name of Activity.
* @param stdClass $moduleinstance
* @throws \coding_exception
*/
public static function output_series($ocinstanceid, $seriesid, $activityname): void {
public static function output_series(stdClass $moduleinstance): void {
global $OUTPUT, $PAGE;

$ocinstanceid = $moduleinstance->ocinstanceid;
$seriesid = $moduleinstance->opencastid;
$activityname = $moduleinstance->name;
$sortseriesby = $moduleinstance->sortseriesby;

$api = apibridge::get_instance($ocinstanceid);
$response = $api->get_episodes_in_series($seriesid);
$response = $api->get_episodes_in_series($seriesid, $sortseriesby);

if ($response === false) {
throw new \exception('There was a problem reaching opencast!');
Expand Down Expand Up @@ -124,6 +127,7 @@ public static function output_episode($ocinstanceid, $episodeid, $modinstanceid,
echo $OUTPUT->header();

$configurl = new \moodle_url(get_config('mod_opencast', 'configurl_' . $ocinstanceid));
$themeurl = new \moodle_url(get_config('mod_opencast', 'themeurl_' . $ocinstanceid));
echo \html_writer::script('window.episode = ' . json_encode($data));

echo $OUTPUT->heading($title);
Expand All @@ -143,7 +147,8 @@ public static function output_episode($ocinstanceid, $episodeid, $modinstanceid,
echo '<iframe src="player.html" id="player-iframe" class="mod-opencast-paella-player" allowfullscreen"></iframe>';
echo \html_writer::end_div();

$PAGE->requires->js_call_amd('mod_opencast/opencast_player', 'init', [$configurl->out(false)]);
$PAGE->requires->js_call_amd('mod_opencast/opencast_player', 'init',
[$configurl->out(false), $themeurl->out(false)]);

$moduleinstance = $DB->get_record('opencast', array('id' => $modinstanceid), '*', MUST_EXIST);
if (get_config('mod_opencast', 'global_download_' . $ocinstanceid) || $moduleinstance->allowdownload) {
Expand Down Expand Up @@ -215,16 +220,20 @@ public static function create_template_context_for_series($ocinstanceid, $series
$url = null;
foreach ($event->publications as $publication) {
if ($publication->channel == $channel) {
$presenterpreview = null;
$presentationpreview = null;
$otherpreview = null;
foreach ($publication->attachments as $attachment) {
// If presentation preview available, use that, else use presenter preview.
if ($attachment->flavor == 'presentation/search+preview') {
$url = $attachment->url;
break;
}
if ($attachment->flavor == 'presenter/search+preview') {
$url = $attachment->url;
$presenterpreview = $attachment->url;
} else if ($attachment->flavor == 'presentation/search+preview') {
$presentationpreview = $attachment->url;
} else if (substr($attachment->flavor, -15) === '/search+preview') {
$otherpreview = $attachment->url;
}
}
$url = $presentationpreview ?? $presenterpreview ?? $otherpreview;

$video->haspresenter = false;
$video->haspresentation = false;
foreach ($publication->media as $media) {
Expand Down
Loading

0 comments on commit 9457f68

Please sign in to comment.