jenkins-bot has submitted this change and it was merged.
Change subject: Trigger transcode jobs from FileUpload hook
......................................................................
Trigger transcode jobs from FileUpload hook
We only do transcodes for local files. The previously used
UploadComplete hook is really just a wrapper around this FileUpload
hook, but then not specific to LocalFile. Using this lower level hook,
allows it to be triggered by importImages.php, which only uploads
local files using the lower level recordUpload2.
Bug: T127597
Change-Id: Id79fad222d8d27ce7ecf77b7eb59bca54bebff3c
---
M TimedMediaHandler.hooks.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index f09c13a..b37a70e 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -255,7 +255,7 @@
$wgHooks['ArticleFromTitle'][] =
'TimedMediaIframeOutput::iframeHook';
// When an upload completes ( check clear any existing
transcodes )
- $wgHooks['UploadComplete'][] =
'TimedMediaHandlerHooks::checkUploadComplete';
+ $wgHooks['FileUpload'][] =
'TimedMediaHandlerHooks::onFileUpload';
// When an image page is moved:
$wgHooks['TitleMove'][] =
'TimedMediaHandlerHooks::checkTitleMove';
@@ -457,11 +457,10 @@
}
/**
- * @param $image UploadBase
+ * @param $file LocalFile object
* @return bool
*/
- public static function checkUploadComplete( $upload ) {
- $file = $upload->getLocalFile();
+ public static function onFileUpload( $file, $reupload,
$hasNewPageContent ) {
// Check that the file is a transcodable asset:
if ( $file && self::isTranscodableFile( $file ) ) {
// Remove all the transcode files and db states for
this asset
--
To view, visit https://gerrit.wikimedia.org/r/273140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id79fad222d8d27ce7ecf77b7eb59bca54bebff3c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
