diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 2b9d787..9e18ded 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -115,6 +115,7 @@ jobs: fi docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php maintenance/run.php update --quick + docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php maintenance/run.php /var/www/html/scripts/migrate-html5media-tags.php if ! docker compose -f docker-compose.dev-env.yml up -d --wait; then echo "compose up --wait failed — mediawiki logs:" docker compose -f docker-compose.dev-env.yml logs mediawiki --tail 150 || true diff --git a/.gitea/workflows/deploy-prod.yml b/.gitea/workflows/deploy-prod.yml index 98c31b7..a28d7a3 100644 --- a/.gitea/workflows/deploy-prod.yml +++ b/.gitea/workflows/deploy-prod.yml @@ -63,6 +63,7 @@ jobs: done docker compose run --rm --no-deps mediawiki php /usr/local/bin/ensure-db-schema.php docker compose run --rm --no-deps mediawiki php maintenance/run.php update --quick + docker compose run --rm --no-deps mediawiki php maintenance/run.php /var/www/html/scripts/migrate-html5media-tags.php if ! docker compose up -d --wait; then echo "compose up --wait failed — mediawiki logs:" docker compose logs mediawiki --tail 150 || true @@ -104,20 +105,26 @@ jobs: tar -czf - \ config/LocalSettings.php \ config/php-uploads.ini \ + scripts/migrate-html5media-tags.php \ assets/ \ extensions-custom/KarateMedia/ \ | ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" ' set -e - TMP_DEPLOY="$(mktemp -d)" + TMP_DEPLOY=~/karatewiki-shared/tmp_deploy + rm -rf "$TMP_DEPLOY" + mkdir -p "$TMP_DEPLOY" tar -xzf - -C "$TMP_DEPLOY" cp "$TMP_DEPLOY/config/LocalSettings.php" ~/Karatewiki/LocalSettings.php cp "$TMP_DEPLOY/config/php-uploads.ini" ~/Karatewiki/php.ini cp "$TMP_DEPLOY/config/php-uploads.ini" ~/Karatewiki/.user.ini + mkdir -p ~/Karatewiki/scripts + cp "$TMP_DEPLOY/scripts/migrate-html5media-tags.php" ~/Karatewiki/scripts/migrate-html5media-tags.php cp -r "$TMP_DEPLOY/assets/"* ~/Karatewiki/resources/assets/ rm -rf ~/Karatewiki/extensions/KarateMedia cp -r "$TMP_DEPLOY/extensions-custom/KarateMedia" ~/Karatewiki/extensions/KarateMedia rm -rf "$TMP_DEPLOY" /opt/RZphp84/bin/php-cli ~/Karatewiki/maintenance/run.php update --quick + /opt/RZphp84/bin/php-cli ~/Karatewiki/maintenance/run.php ~/Karatewiki/scripts/migrate-html5media-tags.php ' echo "=== Strato ~/Karatewiki erfolgreich aktualisiert! ===" else diff --git a/Dockerfile b/Dockerfile index 5b9a573..140a195 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,9 @@ COPY config/php-uploads.ini /usr/local/etc/php/conf.d/zz-karate-uploads.ini # Vereins-Logos & Favicon ins Image kopieren COPY assets/ /var/www/html/resources/assets/ -# DB-Initialisierungshilfe fuer Erst-Deployments auf dem Raspberry Pi +# DB-Initialisierungshilfe & Tag-Migration fuer Deployments COPY scripts/ensure-db-schema.php /usr/local/bin/ensure-db-schema.php +COPY scripts/migrate-html5media-tags.php /var/www/html/scripts/migrate-html5media-tags.php # Unsere eigene, wartungsfreie Video- & Vereins-Extension COPY extensions-custom/KarateMedia /var/www/html/extensions/KarateMedia diff --git a/extensions-custom/KarateMedia/src/KarateVideoHandler.php b/extensions-custom/KarateMedia/src/KarateVideoHandler.php index df3d7cb..c27ce13 100644 --- a/extensions-custom/KarateMedia/src/KarateVideoHandler.php +++ b/extensions-custom/KarateMedia/src/KarateVideoHandler.php @@ -37,6 +37,9 @@ class KarateVideoHandler extends MediaHandler { } public function normaliseParams( $image, &$params ): bool { + if ( ( !isset( $params['width'] ) || $params['width'] <= 0 ) && isset( $params['height'] ) && $params['height'] > 0 ) { + $params['width'] = (int)round( $params['height'] * 16 / 9 ); + } if ( !isset( $params['width'] ) || $params['width'] <= 0 ) { $params['width'] = 320; } diff --git a/scripts/migrate-html5media-tags.php b/scripts/migrate-html5media-tags.php new file mode 100644 index 0000000..d1cda34 --- /dev/null +++ b/scripts/migrate-html5media-tags.php @@ -0,0 +1,141 @@ +File:... Tags + * im Wikitext in den offiziellen MediaWiki-Standard [[Datei:...|...px]]. + * + * Aufruf: + * php maintenance/run.php scripts/migrate-html5media-tags.php [--dry-run] + */ + +use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Content\ContentHandler; +use MediaWiki\Content\TextContent; +use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\SlotRecord; +use MediaWiki\Title\Title; +use MediaWiki\User\User; + +require_once __DIR__ . '/../maintenance/Maintenance.php'; + +class MigrateHtml5MediaTags extends Maintenance { + + public function __construct() { + parent::__construct(); + $this->addDescription( 'Ersetzt -Tags durch MediaWiki-Standard [[Datei:...]] Syntax.' ); + $this->addOption( 'dry-run', 'Nur anzeigen, was geaendert wuerde, ohne zu speichern', false, false ); + } + + public function execute() { + $dryRun = $this->hasOption( 'dry-run' ); + $services = MediaWikiServices::getInstance(); + $dbr = $services->getConnectionProvider()->getReplicaDatabase(); + $wikiPageFactory = $services->getWikiPageFactory(); + $revisionLookup = $services->getRevisionLookup(); + + $res = $dbr->newSelectQueryBuilder() + ->select( [ 'page_id', 'page_namespace', 'page_title' ] ) + ->from( 'page' ) + ->orderBy( 'page_id' ) + ->caller( __METHOD__ ) + ->fetchResultSet(); + + $systemUser = User::newSystemUser( 'MediaWiki maintenance', [ 'steal' => true ] ); + $pagesChanged = 0; + $tagsReplacedTotal = 0; + + foreach ( $res as $row ) { + $title = Title::newFromRow( $row ); + $rev = $revisionLookup->getRevisionByTitle( $title ); + if ( !$rev ) { + continue; + } + $content = $rev->getContent( SlotRecord::MAIN ); + if ( !$content instanceof TextContent ) { + continue; + } + + $oldText = $content->getText(); + if ( stripos( $oldText, ']*)>(.*?)<\/html5media>/is', + function ( array $m ) use ( &$tagCount ): string { + $attrString = $m[1]; + $inner = trim( $m[2] ); + + // Entferne vorangestelltes File: / Datei: / Image: / Bild: + $cleanFile = preg_replace( '/^(file|datei|image|bild)\s*:\s*/i', '', $inner ); + $cleanFile = trim( $cleanFile ); + if ( $cleanFile === '' ) { + return $m[0]; + } + + $width = null; + $height = null; + if ( preg_match( '/\bwidth\s*=\s*["\']?(\d+)["\']?/i', $attrString, $wm ) ) { + $width = (int)$wm[1]; + } + if ( preg_match( '/\bheight\s*=\s*["\']?(\d+)["\']?/i', $attrString, $hm ) ) { + $height = (int)$hm[1]; + } + + $sizeParam = ''; + if ( $width && $height ) { + $sizeParam = "|{$width}x{$height}px"; + } elseif ( $width ) { + $sizeParam = "|{$width}px"; + } elseif ( $height ) { + $calcWidth = (int)round( $height * 16 / 9 ); + $sizeParam = "|{$calcWidth}x{$height}px"; + } + + $tagCount++; + return "[[Datei:{$cleanFile}{$sizeParam}]]"; + }, + $oldText + ); + + if ( $newText === null || $newText === $oldText || $tagCount === 0 ) { + continue; + } + + $pagesChanged++; + $tagsReplacedTotal += $tagCount; + + $this->output( sprintf( + "[%s] %s (%d Tag%s)\n", + $dryRun ? 'DRY-RUN' : 'UPDATE', + $title->getPrefixedText(), + $tagCount, + $tagCount === 1 ? '' : 's' + ) ); + + if ( !$dryRun ) { + $wikiPage = $wikiPageFactory->newFromTitle( $title ); + $updater = $wikiPage->newPageUpdater( $systemUser ); + $newContent = ContentHandler::makeContent( $newText, $title ); + $updater->setContent( SlotRecord::MAIN, $newContent ); + $comment = CommentStoreComment::newUnsavedComment( + 'Migration: durch MediaWiki-Standard [[Datei:...]] ersetzt' + ); + $updater->saveRevision( + $comment, + EDIT_UPDATE | EDIT_MINOR | EDIT_FORCE_BOT | EDIT_SUPPRESS_RC + ); + } + } + + $this->output( sprintf( + "\nFertig: %d Seiten (%d -Tags) %s.\n", + $pagesChanged, + $tagsReplacedTotal, + $dryRun ? 'gefunden (Dry-Run)' : 'erfolgreich auf [[Datei:...]] umgestellt' + ) ); + } +} + +$maintClass = MigrateHtml5MediaTags::class; +require_once RUN_MAINTENANCE_IF_MAIN;