Created a new Metadata class to hold static functions which parse audio
file metadata. This got rid of the "camp_" prefixes on the function names.
This commit is contained in:
paul.baranowski
parent
1c2ff6c150
commit
95a4694b5a
|
|
@ -124,7 +124,7 @@ class PluploadController extends Zend_Controller_Action
|
|||
}
|
||||
}
|
||||
|
||||
$metadata = camp_get_audio_metadata($audio_file);
|
||||
$metadata = Metadata::LoadFromFile($audio_file);
|
||||
|
||||
if (PEAR::isError($metadata)) {
|
||||
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' + $metadata->getMessage() + '}}');
|
||||
|
|
@ -160,7 +160,7 @@ class PluploadController extends Zend_Controller_Action
|
|||
}
|
||||
|
||||
public function pluploadAction()
|
||||
{
|
||||
{
|
||||
$this->view->headScript()->appendFile('/js/plupload/plupload.full.min.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/plupload/jquery.plupload.queue.min.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript');
|
||||
|
|
|
|||
|
|
@ -52,261 +52,263 @@ $g_metadata_xml_to_db_mapping = array(
|
|||
"dc:contributor" => "contributor",
|
||||
"dc:language" => "language");
|
||||
|
||||
/**
|
||||
* Track numbers in metadata tags can come in many formats:
|
||||
* "1 of 20", "1/20", "20/1". This function parses the track
|
||||
* number and gets the real number so that we can sort by it
|
||||
* in the database.
|
||||
*
|
||||
* @param string $p_trackNumber
|
||||
* @return int
|
||||
*/
|
||||
function camp_parse_track_number($p_trackNumber)
|
||||
{
|
||||
$num = trim($p_trackNumber);
|
||||
if (!is_numeric($num)) {
|
||||
$matches = preg_match("/\s*([0-9]+)([^0-9]*)([0-9]*)\s*/", $num, $results);
|
||||
$trackNum = 0;
|
||||
foreach ($results as $result) {
|
||||
if (is_numeric($result)) {
|
||||
if ($trackNum == 0) {
|
||||
$trackNum = $result;
|
||||
} elseif ($result < $trackNum) {
|
||||
$trackNum = $result;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$trackNum = $num;
|
||||
}
|
||||
return $trackNum;
|
||||
}
|
||||
class Metadata {
|
||||
|
||||
|
||||
/**
|
||||
* Add data to the global array $mdata, also sets global variables
|
||||
* $titleHaveSet and $titleKey.
|
||||
*
|
||||
* Converts the given string ($val) into UTF-8.
|
||||
*
|
||||
* @param array $p_mdata
|
||||
* The array to add the metadata to.
|
||||
* @param string $p_key
|
||||
* Metadata key.
|
||||
* @param string $p_val
|
||||
* Metadata value.
|
||||
* @param string $p_inputEncoding
|
||||
* Encoding type of the input value.
|
||||
*/
|
||||
function camp_add_metadata(&$p_mdata, $p_key, $p_val, $p_inputEncoding='iso-8859-1')
|
||||
{
|
||||
if (!is_null($p_val)) {
|
||||
$data = $p_val;
|
||||
$outputEncoding = 'UTF-8';
|
||||
//if (function_exists('iconv') && ($p_inputEncoding != $outputEncoding) ) {
|
||||
if (function_exists('iconv') && is_string($p_val)) {
|
||||
$newData = @iconv($p_inputEncoding, $outputEncoding, $data);
|
||||
if ($newData === FALSE) {
|
||||
echo "Warning: convert $key data to unicode failed\n";
|
||||
} elseif ($newData != $data) {
|
||||
echo "Converted string: '$data' (".gettype($data).") -> '$newData' (".gettype($newData).").\n";
|
||||
$data = $newData;
|
||||
}
|
||||
}
|
||||
$p_mdata[$p_key] = trim($data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return an array with the given audio file's ID3 tags. The keys in the
|
||||
* array can be:
|
||||
* <pre>
|
||||
* dc:format ("mime type")
|
||||
* dcterms:extent ("duration")
|
||||
* dc:title
|
||||
* dc:creator ("artist")
|
||||
* dc:source ("album")
|
||||
* dc:type ("genre")
|
||||
* ls:bitrate
|
||||
* ls:encoded_by
|
||||
* ls:track_num
|
||||
* ls:channels
|
||||
* ls:year
|
||||
* ls:filename
|
||||
* </pre>
|
||||
*
|
||||
* @param string $p_filename
|
||||
* @param boolean $p_testonly
|
||||
* For diagnostic and debugging purposes - setting this to TRUE
|
||||
* will print out the values found in the file and the ones assigned
|
||||
* to the return array.
|
||||
* @return array|PEAR_Error
|
||||
*/
|
||||
function camp_get_audio_metadata($p_filename, $p_testonly = false)
|
||||
{
|
||||
$getID3 = new getID3();
|
||||
$infoFromFile = $getID3->analyze($p_filename);
|
||||
if (PEAR::isError($infoFromFile)) {
|
||||
return $infoFromFile;
|
||||
}
|
||||
if (isset($infoFromFile['error'])) {
|
||||
return new PEAR_Error(array_pop($infoFromFile['error']));
|
||||
}
|
||||
if (!$infoFromFile['bitrate']) {
|
||||
return new PEAR_Error("File given is not an audio file.");
|
||||
}
|
||||
|
||||
if ($p_testonly) {
|
||||
print_r($infoFromFile);
|
||||
}
|
||||
$titleKey = 'dc:title';
|
||||
$flds = array(
|
||||
'dc:format' => array(
|
||||
array('path'=>"['mime_type']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:bitrate' => array(
|
||||
array('path'=>"['bitrate']", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['audio']['bitrate']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:samplerate' => array(
|
||||
array('path'=>"['audio']['sample_rate']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:encoder' => array(
|
||||
array('path'=>"['audio']['codec']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'dcterms:extent'=> array(
|
||||
array('path'=>"['playtime_seconds']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:composer'=> array(
|
||||
array('path'=>"['id3v2']['comments']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['id3v2']['TCOM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['id3v2']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['ogg']['comments']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:description'=> array(
|
||||
array('path'=>"['id3v1']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['comments']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['id3v2']['COMM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['id3v2']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['ogg']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:type'=> array(
|
||||
array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:title' => array(
|
||||
array('path'=>"['id3v2']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TIT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v1']", 'dataPath'=>"['title']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:creator' => array(
|
||||
array('path'=>"['id3v2']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TPE1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TP1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v1']", 'dataPath'=>"['artist']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:source' => array(
|
||||
array('path'=>"['id3v2']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TALB'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TAL'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'ls:encoded_by' => array(
|
||||
array('path'=>"['id3v2']['TENC'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TEN'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'ls:track_num' => array(
|
||||
array('path'=>"['id3v2']['TRCK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TRK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
// 'ls:genre' => array(
|
||||
// array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
|
||||
// array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
// array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
// array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
// array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
// ),
|
||||
'ls:channels' => array(
|
||||
array('path'=>"['audio']['channels']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:year' => array(
|
||||
array('path'=>"['comments']['date']"),
|
||||
array('path'=>"['ogg']['comments']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'ls:filename' => array(
|
||||
array('path'=>"['filename']"),
|
||||
),
|
||||
);
|
||||
$mdata = array();
|
||||
if (isset($infoFromFile['audio'])) {
|
||||
$mdata['audio'] = $infoFromFile['audio'];
|
||||
}
|
||||
if (isset($infoFromFile['playtime_seconds'])) {
|
||||
$mdata['playtime_seconds'] = $infoFromFile['playtime_seconds'];
|
||||
}
|
||||
|
||||
$titleHaveSet = FALSE;
|
||||
foreach ($flds as $key => $getid3keys) {
|
||||
foreach ($getid3keys as $getid3key) {
|
||||
$path = $getid3key["path"];
|
||||
$ignoreEnc = isset($getid3key["ignoreEnc"])?
|
||||
$getid3key["ignoreEnc"]:FALSE;
|
||||
$dataPath = isset($getid3key["dataPath"])?$getid3key["dataPath"]:"";
|
||||
$encPath = isset($getid3key["encPath"])?$getid3key["encPath"]:"";
|
||||
$enc = "UTF-8";
|
||||
|
||||
$tagElement = "\$infoFromFile$path$dataPath";
|
||||
eval("\$tagExists = isset($tagElement);");
|
||||
if ($tagExists) {
|
||||
//echo "ignore encoding: ".($ignoreEnc?"yes":"no")."\n";
|
||||
//echo "tag exists\n";
|
||||
//echo "encode path: $encPath\n";
|
||||
eval("\$data = $tagElement;");
|
||||
if (!$ignoreEnc && $encPath != "") {
|
||||
$encodedElement = "\$infoFromFile$path$encPath";
|
||||
eval("\$encodedElementExists = isset($encodedElement);");
|
||||
if ($encodedElementExists) {
|
||||
eval("\$enc = $encodedElement;");
|
||||
/**
|
||||
* Track numbers in metadata tags can come in many formats:
|
||||
* "1 of 20", "1/20", "20/1". This function parses the track
|
||||
* number and gets the real number so that we can sort by it
|
||||
* in the database.
|
||||
*
|
||||
* @param string $p_trackNumber
|
||||
* @return int
|
||||
*/
|
||||
public static function ParseTrackNumber($p_trackNumber)
|
||||
{
|
||||
$num = trim($p_trackNumber);
|
||||
if (!is_numeric($num)) {
|
||||
$matches = preg_match("/\s*([0-9]+)([^0-9]*)([0-9]*)\s*/", $num, $results);
|
||||
$trackNum = 0;
|
||||
foreach ($results as $result) {
|
||||
if (is_numeric($result)) {
|
||||
if ($trackNum == 0) {
|
||||
$trackNum = $result;
|
||||
} elseif ($result < $trackNum) {
|
||||
$trackNum = $result;
|
||||
}
|
||||
}
|
||||
|
||||
// Special case handling for track number
|
||||
if ($key == "ls:track_num") {
|
||||
$data = camp_parse_track_number($data);
|
||||
}
|
||||
camp_add_metadata($mdata, $key, $data, $enc);
|
||||
if ($key == $titleKey) {
|
||||
$titleHaveSet = TRUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
$trackNum = $num;
|
||||
}
|
||||
return $trackNum;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Add data to the array $p_mdata.
|
||||
*
|
||||
* Converts the given string ($val) into UTF-8.
|
||||
*
|
||||
* @param array $p_mdata
|
||||
* The array to add the metadata to.
|
||||
* @param string $p_key
|
||||
* Metadata key.
|
||||
* @param string $p_val
|
||||
* Metadata value.
|
||||
* @param string $p_inputEncoding
|
||||
* Encoding type of the input value.
|
||||
*/
|
||||
public static function AddToArray(&$p_mdata, $p_key, $p_val, $p_inputEncoding='iso-8859-1')
|
||||
{
|
||||
if (!is_null($p_val)) {
|
||||
$data = $p_val;
|
||||
$outputEncoding = 'UTF-8';
|
||||
//if (function_exists('iconv') && ($p_inputEncoding != $outputEncoding) ) {
|
||||
if (function_exists('iconv') && is_string($p_val)) {
|
||||
$newData = @iconv($p_inputEncoding, $outputEncoding, $data);
|
||||
if ($newData === FALSE) {
|
||||
echo "Warning: convert $key data to unicode failed\n";
|
||||
} elseif ($newData != $data) {
|
||||
echo "Converted string: '$data' (".gettype($data).") -> '$newData' (".gettype($newData).").\n";
|
||||
$data = $newData;
|
||||
}
|
||||
}
|
||||
$p_mdata[$p_key] = trim($data);
|
||||
}
|
||||
}
|
||||
if ($p_testonly) {
|
||||
var_dump($mdata);
|
||||
}
|
||||
|
||||
if (!$titleHaveSet || trim($mdata[$titleKey]) == '') {
|
||||
camp_add_metadata($mdata, $titleKey, basename($p_filename));
|
||||
|
||||
/**
|
||||
* Return an array with the given audio file's ID3 tags. The keys in the
|
||||
* array can be:
|
||||
* <pre>
|
||||
* dc:format ("mime type")
|
||||
* dcterms:extent ("duration")
|
||||
* dc:title
|
||||
* dc:creator ("artist")
|
||||
* dc:source ("album")
|
||||
* dc:type ("genre")
|
||||
* ls:bitrate
|
||||
* ls:encoded_by
|
||||
* ls:track_num
|
||||
* ls:channels
|
||||
* ls:year
|
||||
* ls:filename
|
||||
* </pre>
|
||||
*
|
||||
* @param string $p_filename
|
||||
* @param boolean $p_testonly
|
||||
* For diagnostic and debugging purposes - setting this to TRUE
|
||||
* will print out the values found in the file and the ones assigned
|
||||
* to the return array.
|
||||
* @return array|PEAR_Error
|
||||
*/
|
||||
public static function LoadFromFile($p_filename, $p_testonly = false)
|
||||
{
|
||||
$getID3 = new getID3();
|
||||
$infoFromFile = $getID3->analyze($p_filename);
|
||||
if (PEAR::isError($infoFromFile)) {
|
||||
return $infoFromFile;
|
||||
}
|
||||
if (isset($infoFromFile['error'])) {
|
||||
return new PEAR_Error(array_pop($infoFromFile['error']));
|
||||
}
|
||||
if (!$infoFromFile['bitrate']) {
|
||||
return new PEAR_Error("File given is not an audio file.");
|
||||
}
|
||||
|
||||
if ($p_testonly) {
|
||||
print_r($infoFromFile);
|
||||
}
|
||||
$titleKey = 'dc:title';
|
||||
$flds = array(
|
||||
'dc:format' => array(
|
||||
array('path'=>"['mime_type']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:bitrate' => array(
|
||||
array('path'=>"['bitrate']", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['audio']['bitrate']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:samplerate' => array(
|
||||
array('path'=>"['audio']['sample_rate']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:encoder' => array(
|
||||
array('path'=>"['audio']['codec']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'dcterms:extent'=> array(
|
||||
array('path'=>"['playtime_seconds']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:composer'=> array(
|
||||
array('path'=>"['id3v2']['comments']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['id3v2']['TCOM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['id3v2']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['ogg']['comments']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:description'=> array(
|
||||
array('path'=>"['id3v1']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['comments']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['id3v2']['COMM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['id3v2']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['ogg']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:type'=> array(
|
||||
array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:title' => array(
|
||||
array('path'=>"['id3v2']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TIT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v1']", 'dataPath'=>"['title']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:creator' => array(
|
||||
array('path'=>"['id3v2']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TPE1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TP1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v1']", 'dataPath'=>"['artist']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'dc:source' => array(
|
||||
array('path'=>"['id3v2']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TALB'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TAL'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'ls:encoded_by' => array(
|
||||
array('path'=>"['id3v2']['TENC'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TEN'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'ls:track_num' => array(
|
||||
array('path'=>"['id3v2']['TRCK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['id3v2']['TRK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['ogg']['comments']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
// 'ls:genre' => array(
|
||||
// array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
|
||||
// array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
|
||||
// array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
|
||||
// array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
// array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
// ),
|
||||
'ls:channels' => array(
|
||||
array('path'=>"['audio']['channels']", 'ignoreEnc'=>TRUE),
|
||||
),
|
||||
'ls:year' => array(
|
||||
array('path'=>"['comments']['date']"),
|
||||
array('path'=>"['ogg']['comments']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
array('path'=>"['tags']['vorbiscomment']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
|
||||
),
|
||||
'ls:filename' => array(
|
||||
array('path'=>"['filename']"),
|
||||
),
|
||||
);
|
||||
$mdata = array();
|
||||
if (isset($infoFromFile['audio'])) {
|
||||
$mdata['audio'] = $infoFromFile['audio'];
|
||||
}
|
||||
if (isset($infoFromFile['playtime_seconds'])) {
|
||||
$mdata['playtime_seconds'] = $infoFromFile['playtime_seconds'];
|
||||
}
|
||||
|
||||
$titleHaveSet = FALSE;
|
||||
foreach ($flds as $key => $getid3keys) {
|
||||
foreach ($getid3keys as $getid3key) {
|
||||
$path = $getid3key["path"];
|
||||
$ignoreEnc = isset($getid3key["ignoreEnc"])?
|
||||
$getid3key["ignoreEnc"]:FALSE;
|
||||
$dataPath = isset($getid3key["dataPath"])?$getid3key["dataPath"]:"";
|
||||
$encPath = isset($getid3key["encPath"])?$getid3key["encPath"]:"";
|
||||
$enc = "UTF-8";
|
||||
|
||||
$tagElement = "\$infoFromFile$path$dataPath";
|
||||
eval("\$tagExists = isset($tagElement);");
|
||||
if ($tagExists) {
|
||||
//echo "ignore encoding: ".($ignoreEnc?"yes":"no")."\n";
|
||||
//echo "tag exists\n";
|
||||
//echo "encode path: $encPath\n";
|
||||
eval("\$data = $tagElement;");
|
||||
if (!$ignoreEnc && $encPath != "") {
|
||||
$encodedElement = "\$infoFromFile$path$encPath";
|
||||
eval("\$encodedElementExists = isset($encodedElement);");
|
||||
if ($encodedElementExists) {
|
||||
eval("\$enc = $encodedElement;");
|
||||
}
|
||||
}
|
||||
|
||||
// Special case handling for track number
|
||||
if ($key == "ls:track_num") {
|
||||
$data = Metadata::ParseTrackNumber($data);
|
||||
}
|
||||
Metadata::AddToArray($mdata, $key, $data, $enc);
|
||||
if ($key == $titleKey) {
|
||||
$titleHaveSet = TRUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($p_testonly) {
|
||||
var_dump($mdata);
|
||||
}
|
||||
|
||||
if (!$titleHaveSet || trim($mdata[$titleKey]) == '') {
|
||||
Metadata::AddToArray($mdata, $titleKey, basename($p_filename));
|
||||
}
|
||||
return $mdata;
|
||||
}
|
||||
return $mdata;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -316,7 +318,7 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
|
|||
* Airtime file storage support class.<br>
|
||||
* Represents one virtual file in storage. Virtual file has up to two parts:
|
||||
* <ul>
|
||||
* <li>metadata in database - represented by MetaData class</li>
|
||||
* <li>metadata in database </li>
|
||||
* <li>binary media data in real file</li>
|
||||
* </ul>
|
||||
*
|
||||
|
|
@ -607,7 +609,7 @@ class StoredFile {
|
|||
if (isset($p_values["metadata"])) {
|
||||
$metadata = $p_values['metadata'];
|
||||
} else {
|
||||
$metadata = camp_get_audio_metadata($p_values["filepath"]);
|
||||
$metadata = Metadata::LoadFromFile($p_values["filepath"]);
|
||||
}
|
||||
|
||||
$storedFile->name = isset($p_values['filename']) ? $p_values['filename'] : $p_values["filepath"];
|
||||
|
|
@ -906,24 +908,6 @@ class StoredFile {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Analyze file with getid3 module.<br>
|
||||
* Obtain some metadata stored in media file.<br>
|
||||
* This method should be used for prefilling metadata input form.
|
||||
*
|
||||
* @return array
|
||||
* hierarchical hasharray with information about media file
|
||||
*/
|
||||
public function analyzeFile()
|
||||
{
|
||||
if (!$this->exists) {
|
||||
return FALSE;
|
||||
}
|
||||
$ia = camp_get_audio_metadata($this->filepath);
|
||||
return $ia;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create instance of StoredFile object and make copy of existing file
|
||||
*
|
||||
|
|
@ -1511,7 +1495,7 @@ class StoredFile {
|
|||
*/
|
||||
public function getMime()
|
||||
{
|
||||
$a = $this->analyzeFile();
|
||||
$a = Metadata::LoadFromFile($this->filepath);
|
||||
if (PEAR::isError($a)) {
|
||||
return $a;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class StoredFileTest extends PHPUnit_TestCase {
|
|||
|
||||
function testGetAudioMetadata() {
|
||||
$filePath = dirname(__FILE__)."/ex1.mp3";
|
||||
$metadata = camp_get_audio_metadata($filePath);
|
||||
$metadata = Metadata::LoadFromFile($filePath);
|
||||
if (PEAR::isError($metadata)) {
|
||||
$this->fail($metadata->getMessage());
|
||||
return;
|
||||
|
|
|
|||
Loading…
Reference in New Issue