Master merge ursa 21.10.0

VERSION.txt

@@ -1 +1 @@
-Ursa-21.9.0
+Ursa-21.10.0

alpha/apps/kaltura/lib/batch2/kFlowHelper.php

@@ -3330,12 +3330,12 @@ public static function handleReportExportFinished(BatchJob $dbBatchJob, kReportE
 		$expiryInDays = $expiry / 60 / 60 / 24;
 		if ($expiryInDays >= 1)
 		{
-			$params = array($dbBatchJob->getPartner()->getName(), $time, $dbBatchJob->getId(), implode('<BR>', $links), $expiryInDays, self::DAYS, $validUntil);
+			$params = array($data->getRecipientName(), $time, $dbBatchJob->getId(), implode('<BR>', $links), $expiryInDays, self::DAYS, $validUntil);
 		}
 		else
 		{
 			$expiryInHours = $expiry / 60 / 60;
-			$params = array($dbBatchJob->getPartner()->getName(), $time, $dbBatchJob->getId(), implode('<BR>', $links), $expiryInHours, self::HOURS, $validUntil);
+			$params = array($data->getRecipientName(), $time, $dbBatchJob->getId(), implode('<BR>', $links), $expiryInHours, self::HOURS, $validUntil);
 		}
 		$titleParams = array($data->getReportsGroup(), $time);
 
@@ -3349,7 +3349,8 @@ public static function handleReportExportFinished(BatchJob $dbBatchJob, kReportE
 			kConf::get("report_sender_name"),
 			$data->getRecipientEmail(),
 			$params,
-			$titleParams
+			$titleParams,
+			$data->getRecipientName()
 		);
 		return $dbBatchJob;
 	}
@@ -3358,7 +3359,7 @@ public static function handleReportExportFailed(BatchJob $dbBatchJob, kReportExp
 	{
 		$time = date("m-d-y H:i", $data->getTimeReference() + $data->getTimeZoneOffset());
 		$email_id = MailType::MAIL_TYPE_REPORT_EXPORT_FAILURE;
-		$params = array($dbBatchJob->getPartner()->getName(), $time, $dbBatchJob->getId(),
+		$params = array($data->getRecipientName(), $time, $dbBatchJob->getId(),
 			$dbBatchJob->getErrType(), $dbBatchJob->getErrNumber());
 		$titleParams = array($data->getReportsGroup(), $time);
 
@@ -3372,7 +3373,8 @@ public static function handleReportExportFailed(BatchJob $dbBatchJob, kReportExp
 			kConf::get("report_sender_name"),
 			$data->getRecipientEmail(),
 			$params,
-			$titleParams
+			$titleParams,
+			$data->getRecipientName()
 		);
 		return $dbBatchJob;
 	}
@@ -3381,7 +3383,7 @@ public static function handleReportExportAborted(BatchJob $dbBatchJob, kReportEx
 	{
 		$time = date("m-d-y H:i", $data->getTimeReference() + $data->getTimeZoneOffset());
 		$email_id = MailType::MAIL_TYPE_REPORT_EXPORT_ABORT;
-		$params = array($dbBatchJob->getPartner()->getName(), $time, $dbBatchJob->getId());
+		$params = array($data->getRecipientName(), $time, $dbBatchJob->getId());
 		$titleParams = array($data->getReportsGroup(), $time);
 
 		kJobsManager::addMailJob(
@@ -3394,7 +3396,8 @@ public static function handleReportExportAborted(BatchJob $dbBatchJob, kReportEx
 			kConf::get("report_sender_name"),
 			$data->getRecipientEmail(),
 			$params,
-			$titleParams
+			$titleParams,
+			$data->getRecipientName()
 		);
 		return $dbBatchJob;
 	}

alpha/apps/kaltura/lib/batch2/kJobsManager.php

@@ -1980,6 +1980,7 @@ public static function addExportReportJob(KalturaReportExportParams $params)
 		$coreParams = $params->toObject();
 
 		$jobData->setRecipientEmail($coreParams->getRecipientEmail());
+		$jobData->setRecipientName($coreParams->getRecipientName());
 		$jobData->setReportItems($coreParams->getReportItems());
 
 		$offset = $timeOffsetSeconds - ($params->timeZoneOffset * 60);// Convert minutes to seconds

alpha/apps/kaltura/lib/batch2/model/kReportExportJobData.php

@@ -11,6 +11,11 @@ class kReportExportJobData extends kJobData
 	 */
 	protected $recipientEmail;
 
+	/**
+	 * @var string
+	 */
+	protected $recipientName;
+
 	/**
 	 * @var array
 	 */
@@ -62,6 +67,22 @@ public function setRecipientEmail($recipientEmail)
 		$this->recipientEmail = $recipientEmail;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getRecipientName()
+	{
+		return $this->recipientName;
+	}
+
+	/**
+	 * @param string $recipientName
+	 */
+	public function setRecipientName($recipientName)
+	{
+		$this->recipientName = $recipientName;
+	}
+
 	/**
 	 * @return array
 	 */

alpha/apps/kaltura/lib/kManifestRenderers.php

@@ -1031,15 +1031,11 @@ protected function getManifestFlavors()
 
 	protected function shouldUseClosedCaptions(): bool
 	{
-		$dbEntry = entryPeer::retrieveByPK($this->entryId);
-		if($dbEntry)
+		foreach ($this->contributors as $contributor)
 		{
-			foreach ($this->contributors as $contributor)
+			if($contributor instanceof WebVttCaptionsManifestEditor)
 			{
-				if($contributor instanceof WebVttCaptionsManifestEditor && $dbEntry->getType() == entryType::LIVE_STREAM)
-				{
-					return false;
-				}
+				return false;
 			}
 		}
 		return true;

alpha/apps/kaltura/lib/reports/kKavaVpaasReports.php

@@ -47,13 +47,14 @@ class kKavaVpaasReports extends kKavaReports
 			self::REPORT_DIMENSION_MAP => array(
 				'kuser_id' => self::DIMENSION_KUSER_ID,
 				'name' => self::DIMENSION_KUSER_ID,
+				'full_name' => self::DIMENSION_KUSER_ID,
 				'partner_id' => self::DIMENSION_KUSER_ID,
 			),
 			self::REPORT_ENRICH_DEF => array(
-				self::REPORT_ENRICH_OUTPUT => array('name', 'partner_id'),
+				self::REPORT_ENRICH_OUTPUT => array('name', 'full_name', 'partner_id'),
 				self::REPORT_ENRICH_FUNC => 'kKavaVpaasReports::getUsersInfoVpaas',
 				self::REPORT_ENRICH_CONTEXT => array(
-					'columns' => array('PUSER_ID', 'PARTNER_ID'),
+					'columns' => array('PUSER_ID', 'TRIM(CONCAT(FIRST_NAME, " ", LAST_NAME))', 'PARTNER_ID'),
 				)
 			),
 		),

alpha/apps/kaltura/lib/reports/kReportExportParams.php

@@ -7,6 +7,11 @@ class kReportExportParams
 	 */
 	protected $recipientEmail;
 
+	/**
+	 * @var string
+	 */
+	protected $recipientName;
+
 	/**
 	 * @var array
 	 */
@@ -38,6 +43,22 @@ public function setRecipientEmail($recipientEmail)
 		$this->recipientEmail = $recipientEmail;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getRecipientName()
+	{
+		return $this->recipientName;
+	}
+
+	/**
+	 * @param string $recipientName
+	 */
+	public function setRecipientName($recipientName)
+	{
+		$this->recipientName = $recipientName;
+	}
+
 	/**
 	 * @return array
 	 */

alpha/lib/model/kuser.php

@@ -62,6 +62,8 @@ public function __construct()
 
 	const MAX_NAME_LEN = 40;
 
+	const MAX_ABOUT_ME_LEN = 4096;
+
 	const MAX_COUNTRY_LEN = 2;
 
 	private $roughcut_count = -1;
@@ -1686,4 +1688,15 @@ public function getCapabilities()
 		$capabilities = $this->getFromCustomData(self::CAPABILITIES, null, '');
 		return ($capabilities == '') ? array() : explode(',', $capabilities);
 	}
+
+	public function setAboutMe($v)
+	{
+		PeerUtils::setExtension($this, $v, self::MAX_ABOUT_ME_LEN, __FUNCTION__);
+		return parent::setAboutMe(kString::alignUtf8String($v, self::MAX_ABOUT_ME_LEN));
+	}
+
+	public function getAboutMe()
+	{
+		return parent::getAboutMe() . PeerUtils::getExtension($this, __FUNCTION__);
+	}
 }

api_v3/lib/types/KalturaBaseUser.php

@@ -77,6 +77,7 @@ class KalturaBaseUser extends KalturaObject implements IRelatedFilterable
 
 	/**
 	 * @var string
+	 * @maxLength 8192
 	 */
 	public $description;
 

api_v3/lib/types/batch/KalturaReportExportJobData.php

@@ -10,6 +10,11 @@ class KalturaReportExportJobData extends KalturaJobData
 	 */
 	public $recipientEmail;
 
+	/**
+	 * @var string
+	 */
+	public $recipientName;
+
 	/**
 	 * @var KalturaReportExportItemArray
 	 */

api_v3/lib/types/report/export/KalturaReportExportParams.php

@@ -11,6 +11,11 @@ class KalturaReportExportParams extends KalturaObject
 	 */
 	public $recipientEmail;
 
+	/**
+	 * @var string
+	 */
+	public $recipientName;
+
 	/**
 	 * Time zone offset in minutes (between client to UTC)
 	 * @var int
@@ -35,6 +40,7 @@ class KalturaReportExportParams extends KalturaObject
 	private static $map_between_objects = array
 	(
 		"recipientEmail",
+		"recipientName",
 		"reportItems",
 		"reportsItemsGroup",
 		"baseUrl"

api_v3/services/BatchService.php

@@ -694,4 +694,18 @@ public function deRegisterSchedulerAction($host)
 		SchedulerPeer::deleteBySchedulerConfigId($scheduler->getConfiguredId());
 		return true;
 	}
+
+	/**
+	* batch getAllChildJobs action returns all child jobs
+	*
+	* @action getAllChildJobs
+	* @param int $rootJobId root job id
+	* @return KalturaBatchJobArray
+	*/
+	function getAllChildJobsAction($rootJobId)
+	{
+            $rootJob = BatchJobPeer::retrieveByPK($rootJobId);
+			$result = KalturaBatchJobArray::fromBatchJobArray($rootJob->getChildJobs());
+            return $result;
+	}
 }

api_v3/services/ReportService.php

@@ -440,20 +440,15 @@ public function getCsvFromStringParamsAction($id, $params = null, $excludedField
 	public function exportToCsvAction(KalturaReportExportParams $params)
 	{
 		$this->validateReportExportParams($params);
-
+		$kuser = kCurrentContext::getCurrentKsKuser();
+		$partner = PartnerPeer::retrieveByPK(kCurrentContext::getCurrentPartnerId());
 		if (!$params->recipientEmail)
 		{
-			$kuser = kCurrentContext::getCurrentKsKuser();
-			if ($kuser)
-			{
-				$params->recipientEmail = $kuser->getEmail();
-			}
-			else
-			{
-				$partnerId = kCurrentContext::getCurrentPartnerId();
-				$partner = PartnerPeer::retrieveByPK($partnerId);
-				$params->recipientEmail = $partner->getAdminEmail();
-			}
+			$params->recipientEmail = $kuser ? $kuser->getEmail() : $partner->getAdminEmail();
+		}
+		if (!$params->recipientName)
+		{
+			$params->recipientName = $kuser ? $kuser->getFullName() : $partner->getName();
 		}
 
 		if (!is_null($params->reportsItemsGroup) && strlen($params->reportsItemsGroup) > self::MAX_EXPORT_GROUP_NAME_LENGTH)

batch/batches/ClipConcat/KClipConcatCloser.class.php

@@ -24,7 +24,16 @@ public static function getType()
 	 */
 	protected function exec(KalturaBatchJob $job)
 	{
-		return $this->checkTimeout($job);
+		$children = KBatchBase::$kClient->batch->getAllChildJobs($job->id);
+		$doneStatuses = array(KalturaBatchJobStatus::FINISHED, KalturaBatchJobStatus::FAILED, KalturaBatchJobStatus::ABORTED);
+		foreach ($children as $child)
+		{
+             if (!in_array($child->status, $doneStatuses))
+             {
+ 				return $this->checkTimeout($job);
+             }
+         }
+		return $this->closeJob($job, null, null, null, KalturaBatchJobStatus::FINISHED);
 	}
 
 	private function checkTimeout(KalturaBatchJob $job)

configurations/plugins.template.ini

@@ -100,6 +100,7 @@ CaptionAssetEventNotifications
 AttachmentAssetEventNotifications
 TranscriptAssetEventNotifications
 DropFolderEventNotifications
+ScheduleEventNotifications
 Kontiki
 Velocix
 Wowza
@@ -146,3 +147,4 @@ Interactivity
 ;Room
 VirtualEvent
 ;SessionCuePoint
+Rsvp

deployment/permissions/service.batch.ini

@@ -193,3 +193,11 @@ permissionItem87.param5 =
 permissionItem87.tags =
 permissionItem87.permissions = BATCH_BASE
 
+permissionItem88.service = batch
+permissionItem88.action = getAllChildJobs
+permissionItem88.partnerId = -1
+permissionItem88.param3 =
+permissionItem88.param4 =
+permissionItem88.param5 =
+permissionItem88.tags =
+permissionItem88.permissions = -1>BATCH_BASE

deployment/updates/scripts/add_permissions/2025_02_03_update_batch_permissions.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * @package deployment
+ * @subpackage ursa.roles_and_permissions
+ */
+
+$script = realpath(dirname(__FILE__) . '/../../../../') . '/alpha/scripts/utils/permissions/addPermissionsAndItems.php';
+$config = realpath(dirname(__FILE__)) . '/../../../permissions/service.batch.ini';
+passthru("php $script $config");

infra/cdl/kdl/KDLOperatorFfmpeg6_0.php

@@ -36,28 +36,31 @@ public function generateSinglePassCommandLine(KDLFlavor $design, KDLFlavor $targ
 				$keyVidFilters = $flGrKey+1;
 			}
 		}
-
-		if(isset($target->_forGenericSource) && $target->_forGenericSource==true) {
-			$target->multyAudioMapping = null;
-			$generalAudMapping = 'a';
+			// Audio mapping handling is needed only if there is an audio stream to generate ...
+		if(isset($target->_audio)) {
+			if(isset($target->_forGenericSource) && $target->_forGenericSource==true) {
+				$target->multyAudioMapping = null;
+				$generalAudMapping = 'a';
+			}
+			else $generalAudMapping = 'a:0';
 		}
-		else $generalAudMapping = 'a:0';
 
 		$mappingStr = null;
 		/*
-		 * Following code adapts the FFM4.4 and earlier) cmdLines to FFM6 standard.
+		 * Following code adapts the FFM4.4 (and earlier) cmdLines to FFM6 standard.
 		 * FFM6 'resolves' the ambiguity in previous versions while using both 
 		 * the filter_complex and stream mappings. 
 		 * Starting with FFM6 the streams that are used by the filter_complex are 
 		 * 'mapped' automatically. When in this case explicit '-map' is used as well, 
 		 * it is ADDED to the filter_complex 'mapped' streams, resulting converted 
 		 * streams duplication. FFM4 and older versions don't duplicate the 
 		 * transcodided streams.
-		 * The solution is to use 'named' filter graphs out connections and explicitly 
-		 * to map them, and to avoid mapping of the source streams.
+		 * The solution is -
+		 * - using 'named' filter graphs out connections and explicitly mapping them
+		 * - avoiding 'redundant' source stream mapping
 		 *
-		 * Another task is to force the output vid stream as the 1st stream, 
-		 * and the aud as the 2nd. It is needed for the multy-entry-edit feature.
+		 * Another task is to force the output vid stream to be the 1st stream, 
+		 * and the aud to be the 2nd. It is needed for the multy-entry-edit feature.
 		 * 
 		 * !!! IMPORTANT !!!
 		 *		This syntax is fully compatibale with the FFM4.4 as well.
@@ -81,7 +84,8 @@ public function generateSinglePassCommandLine(KDLFlavor $design, KDLFlavor $targ
 			$mappingStr = '-map \'[vout]\' ';
 			if(isset($target->multyAudioMapping)) 
 				$mappingStr.= implode(' ', $target->multyAudioMapping);
-			else $mappingStr.= "-map $generalAudMapping";
+			else if(isset($generalAudMapping))
+				$mappingStr.= "-map $generalAudMapping";
 		}
 			// only aud filters are used ==> 
 			//	add aout connection to the audio filter graph.