Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Orion-15.14.0-SUP-19947-Zoom-source-file-missing-file-extensions #9074

Merged
merged 3 commits into from
Dec 30, 2019
Merged

Orion-15.14.0-SUP-19947-Zoom-source-file-missing-file-extensions #9074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebc15ea
Orion-15.14.0-SUP-19947-Zoom-source-file-missing-file-extensions
ZurPHP Dec 30, 2019
db4accc
Orion-15.14.0-SUP-19947-Zoom file extension fixing Anatol comments
ZurPHP Dec 30, 2019
0450e66
Orion-15.14.0-SUP-19947-zoom file extension-fixing Moshe code review …
ZurPHP Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions alpha/apps/kaltura/lib/kAssetUtils.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ public static function createAssets ( $list , $list_name )
}

/**
* @param entry $entry
* @param asset $asset
* @return array
* @throws PropelException
* @params entry $entry
* @return string
*/

public static function getFileName(entry $entry, asset $asset = null)
{
$fileExt = "";
Expand Down Expand Up @@ -180,4 +181,61 @@ public static function getLocalImagePath($syncKey)

return $filePath;
}

public static function getFileExtension($containerFormat)
{
$result = null;
switch ($containerFormat)
{
case assetParams::CONTAINER_FORMAT_MP42:
case assetParams::CONTAINER_FORMAT_ISOM:
case assetParams::CONTAINER_FORMAT_MP42_ISOM:
$result = assetParams::CONTAINER_FORMAT_MP4;
break;
case assetParams::CONTAINER_FORMAT_WEBM:
$result = assetParams::CONTAINER_FORMAT_MKV;
break;
case assetParams::CONTAINER_FORMAT_MPEGTS:
case assetParams::CONTAINER_FORMAT_M2TS:
$result = assetParams::TS_FILE_EXTENSION;
break;
case assetParams::CONTAINER_FORMAT_HLS:
case assetParams::CONTAINER_FORMAT_APPLEHTTP:
$result = assetParams::M3U8_FILE_EXTENSION;
break;
case assetParams::CONTAINER_FORMAT_MPEG:
$result = assetParams::MPG_FILE_EXTENSION;
break;
case assetParams::CONTAINER_FORMAT_FLV:
case assetParams::CONTAINER_FORMAT_MP4:
case assetParams::CONTAINER_FORMAT_AVI:
case assetParams::CONTAINER_FORMAT_MOV:
case assetParams::CONTAINER_FORMAT_MP3:
case assetParams::CONTAINER_FORMAT_3GP:
case assetParams::CONTAINER_FORMAT_OGG:
case assetParams::CONTAINER_FORMAT_OGV:
case assetParams::CONTAINER_FORMAT_WMV:
case assetParams::CONTAINER_FORMAT_WMA:
case assetParams::CONTAINER_FORMAT_ISMV:
case assetParams::CONTAINER_FORMAT_ISMA:
case assetParams::CONTAINER_FORMAT_MKV:
case assetParams::CONTAINER_FORMAT_WAV:
case assetParams::CONTAINER_FORMAT_M4V:
case assetParams::CONTAINER_FORMAT_MXF:
case assetParams::CONTAINER_FORMAT_F4V:
case assetParams::CONTAINER_FORMAT_PDF:
case assetParams::CONTAINER_FORMAT_SWF:
case assetParams::CONTAINER_FORMAT_JPG:
case assetParams::CONTAINER_FORMAT_BMP:
case assetParams::CONTAINER_FORMAT_PNG:
$result = $containerFormat;
break;
case assetParams::CONTAINER_FORMAT_COPY:
case assetParams::CONTAINER_FORMAT_WIDEVINE:
default:
break;
}

return $result;
}
}
7 changes: 6 additions & 1 deletion alpha/lib/model/assetParams.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class assetParams extends BaseassetParams implements IBaseObject
const CONTAINER_FORMAT_MXF = "mxf";
const CONTAINER_FORMAT_COPY = "copy";
const CONTAINER_FORMAT_MP42 = "mp42";
const CONTAINER_FORMAT_MP42_ISOM = 'mp42 (isom/mp42)';
const CONTAINER_FORMAT_ISOM = "isom";
const CONTAINER_FORMAT_F4V = "f4v";

Expand All @@ -45,7 +46,11 @@ class assetParams extends BaseassetParams implements IBaseObject
const CONTAINER_FORMAT_PNG = 'png';

const CONTAINER_FORMAT_WIDEVINE = 'wvm';


const TS_FILE_EXTENSION = 'ts';
const M3U8_FILE_EXTENSION = 'm3u8';
const MPG_FILE_EXTENSION = 'mpg';

const TAG_SOURCE = "source";
const TAG_SAVE_SOURCE = "save_source";
const TAG_WEB = "web";
Expand Down
10 changes: 10 additions & 0 deletions alpha/lib/model/flavorAsset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,17 @@ public function getServeFlavorUrl($previewLength = null, $fileName = null)
$fileName = kString::keepOnlyValidUrlChars($fileName);

if ($extension)
{
$fileName .= ".$extension";
}
else if($this->getContainerFormat())
{
$extension = kAssetUtils::getFileExtension($this->getContainerFormat());
if ($extension)
{
$fileName .= ".$extension";
}
}
}

//adding a serveFlavor download parameter
Expand Down