Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed the media type PR from the artwork PR with revert

This commit is contained in:
Robb Ebright 2019-10-13 08:16:45 -04:00
parent 8bcef25d4e
commit 5c1481167e
17 changed files with 129 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View File

@ -83,7 +83,6 @@ define('MDATA_KEY_CUE_IN' , 'cuein');
define('MDATA_KEY_CUE_OUT' , 'cueout'); define('MDATA_KEY_CUE_OUT' , 'cueout');
define('MDATA_KEY_ARTWORK' , 'artwork'); define('MDATA_KEY_ARTWORK' , 'artwork');
define('MDATA_KEY_ARTWORK_DATA', 'artwork_data'); define('MDATA_KEY_ARTWORK_DATA', 'artwork_data');
define('MDATA_KEY_MEDIA_TYPE' , 'media_type');
define('UI_MDATA_VALUE_FORMAT_FILE' , 'File'); define('UI_MDATA_VALUE_FORMAT_FILE' , 'File');
define('UI_MDATA_VALUE_FORMAT_STREAM' , 'live stream'); define('UI_MDATA_VALUE_FORMAT_STREAM' , 'live stream');

1
airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.18/upgrade.sql
View File

@ -1 +0,0 @@
ALTER TABLE cc_files ADD COLUMN media_type VARCHAR(4);

28
airtime_mvc/application/forms/EditAudioMD.php
View File

@ -74,34 +74,6 @@ class Application_Form_EditAudioMD extends Zend_Form
$owner_id->setMultiOptions($user_options); $owner_id->setMultiOptions($user_options);
$this->addelement($owner_id); $this->addelement($owner_id);
// Add media type dropdown
$media_type_options = array();
$media_types = array(
'' => '--- Select Media Type ---',
'MUS' => 'Music (MUS)',
'SID' => 'Station ID (SID)',
'INT' => 'Intro (INT)',
'OUT' => 'Outro (OUT)',
'SWP' => 'Sweeper (SWP)',
'JIN' => 'Jingle (JIN)',
'PRO' => 'Promo (PRO)',
'SHO' => 'Shout Out (SHO)',
'NWS' => 'News (NWS)',
'COM' => 'Commercial (COM)',
'ITV' => 'Interview (ITV)',
'VTR' => 'Voice Tracking (VTR)',
);
foreach ($media_types as $key => $mt) {
$media_type_options[$key] = $mt;
}
$media_type = new Zend_Form_Element_Select('media_type');
$media_type->class = 'input_text';
$media_type->setLabel(_('Media Type:'));
$media_type->setMultiOptions($media_type_options);
$this->addelement($media_type);
// Description field // Description field
$description = new Zend_Form_Element_Textarea('description'); $description = new Zend_Form_Element_Textarea('description');
$description->class = 'input_text'; $description->class = 'input_text';

21
airtime_mvc/application/forms/SmartBlockCriteria.php
View File

@ -42,8 +42,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
"track_title" => "s", "track_title" => "s",
"track_number" => "n", "track_number" => "n",
"info_url" => "s", "info_url" => "s",
"year" => "n", "year" => "n"
"media_type" => "s"
); );
private function getCriteriaOptions($option = null) private function getCriteriaOptions($option = null)
@ -78,8 +77,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
"track_number" => _("Track Number"), "track_number" => _("Track Number"),
"utime" => _("Uploaded"), "utime" => _("Uploaded"),
"info_url" => _("Website"), "info_url" => _("Website"),
"year" => _("Year"), "year" => _("Year")
"media_type" => _("Media Type")
); );
} }
@ -185,18 +183,18 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
public function init() public function init()
{ {
} }
/* /*
* converts UTC timestamp citeria into user timezone strings. * converts UTC timestamp citeria into user timezone strings.
*/ */
private function convertTimestamps(&$criteria) private function convertTimestamps(&$criteria)
{ {
$columns = array("utime", "mtime", "lptime"); $columns = array("utime", "mtime", "lptime");
foreach ($columns as $column) { foreach ($columns as $column) {
if (isset($criteria[$column])) { if (isset($criteria[$column])) {
foreach ($criteria[$column] as &$constraint) { foreach ($criteria[$column] as &$constraint) {
// convert to appropriate timezone timestamps only if the modifier is not a relative time // convert to appropriate timezone timestamps only if the modifier is not a relative time
if (!in_array($constraint['modifier'], array('before','after','between'))) { if (!in_array($constraint['modifier'], array('before','after','between'))) {
@ -248,7 +246,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
$bl = new Application_Model_Block($p_blockId); $bl = new Application_Model_Block($p_blockId);
$storedCrit = $bl->getCriteriaGrouped(); $storedCrit = $bl->getCriteriaGrouped();
Logging::info($storedCrit); Logging::info($storedCrit);
//need to convert criteria to be displayed in the user's timezone if there's some timestamp type. //need to convert criteria to be displayed in the user's timezone if there's some timestamp type.
self::convertTimestamps($storedCrit["crit"]); self::convertTimestamps($storedCrit["crit"]);
@ -472,7 +470,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
$sort->setValue($storedCrit["sort"]["value"]); $sort->setValue($storedCrit["sort"]["value"]);
} }
$this->addElement($sort); $this->addElement($sort);
$limit = new Zend_Form_Element_Select('sp_limit_options'); $limit = new Zend_Form_Element_Select('sp_limit_options');
$limit->setAttrib('class', 'sp_input_select') $limit->setAttrib('class', 'sp_input_select')
->setDecorators(array('viewHelper')) ->setDecorators(array('viewHelper'))
@ -723,8 +721,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"track_title" => "DbTrackTitle", "track_title" => "DbTrackTitle",
"track_number" => "DbTrackNumber", "track_number" => "DbTrackNumber",
"year" => "DbYear", "year" => "DbYear"
"media_type" => "DbMediaType"
); );
// things we need to check // things we need to check

79
airtime_mvc/application/models/Block.php
View File

@ -85,8 +85,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"track_title" => "DbTrackTitle", "track_title" => "DbTrackTitle",
"track_number" => "DbTrackNumber", "track_number" => "DbTrackNumber",
"year" => "DbYear", "year" => "DbYear"
"media_type" => "DbMediaType"
); );
public function __construct($id=null, $con=null) public function __construct($id=null, $con=null)
@ -233,12 +232,12 @@ SQL;
foreach ($rows as &$row) { foreach ($rows as &$row) {
$clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']); $clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
$row['trackSec'] = $clipSec; $row['trackSec'] = $clipSec;
$row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']); $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
$row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']); $row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
$trackoffset = $row['trackoffset']; $trackoffset = $row['trackoffset'];
$offset += $clipSec; $offset += $clipSec;
$offset -= $trackoffset; $offset -= $trackoffset;
@ -255,7 +254,7 @@ SQL;
$fades = $this->getFadeInfo($row['position']); $fades = $this->getFadeInfo($row['position']);
$row['fadein'] = $fades[0]; $row['fadein'] = $fades[0];
$row['fadeout'] = $fades[1]; $row['fadeout'] = $fades[1];
// format the cues in format 00:00:00(.0) // format the cues in format 00:00:00(.0)
// we need to add the '.0' for cues and not fades // we need to add the '.0' for cues and not fades
// because propel takes care of this for us // because propel takes care of this for us
@ -489,7 +488,7 @@ SQL;
Logging::info("Adding to block"); Logging::info("Adding to block");
Logging::info("at position {$pos}"); Logging::info("at position {$pos}");
} }
foreach ($p_items as $ac) { foreach ($p_items as $ac) {
//Logging::info("Adding audio file {$ac[0]}"); //Logging::info("Adding audio file {$ac[0]}");
try { try {
@ -678,7 +677,7 @@ SQL;
return array($fadeIn, $fadeOut); return array($fadeIn, $fadeOut);
} }
/* /*
* create a crossfade from item in cc_playlist_contents with $id1 to item $id2. * create a crossfade from item in cc_playlist_contents with $id1 to item $id2.
* *
@ -689,11 +688,11 @@ SQL;
public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset) public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset)
{ {
$this->con->beginTransaction(); $this->con->beginTransaction();
if (!isset($offset)) { if (!isset($offset)) {
$offset = Application_Model_Preference::GetDefaultCrossfadeDuration(); $offset = Application_Model_Preference::GetDefaultCrossfadeDuration();
} }
try { try {
if (isset($id1)) { if (isset($id1)) {
$this->changeFadeInfo($id1, null, $fadeOut); $this->changeFadeInfo($id1, null, $fadeOut);
@ -701,9 +700,9 @@ SQL;
if (isset($id2)) { if (isset($id2)) {
$this->changeFadeInfo($id2, $fadeIn, null, $offset); $this->changeFadeInfo($id2, $fadeIn, null, $offset);
} }
$this->con->commit(); $this->con->commit();
} catch (Exception $e) { } catch (Exception $e) {
$this->con->rollback(); $this->con->rollback();
throw $e; throw $e;
@ -747,20 +746,20 @@ SQL;
':fade_in' => $fadeIn, ':fade_in' => $fadeIn,
':clip_length' => $clipLength ':clip_length' => $clipLength
); );
$result = Application_Common_Database::prepareAndExecute($sql, $params, 'column'); $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
if ($result) { if ($result) {
//"Fade In can't be larger than overall playlength."; //"Fade In can't be larger than overall playlength.";
$fadeIn = $clipLength; $fadeIn = $clipLength;
} }
$row->setDbFadein($fadeIn); $row->setDbFadein($fadeIn);
if (!is_null($offset)) { if (!is_null($offset)) {
$row->setDbTrackOffset($offset); $row->setDbTrackOffset($offset);
Logging::info("Setting offset {$offset} on item {$id}"); Logging::info("Setting offset {$offset} on item {$id}");
$row->save($this->con); $row->save($this->con);
} }
} }
if (!is_null($fadeOut)) { if (!is_null($fadeOut)) {
@ -769,7 +768,7 @@ SQL;
':fade_out' => $fadeOut, ':fade_out' => $fadeOut,
':clip_length' => $clipLength ':clip_length' => $clipLength
); );
$result = Application_Common_Database::prepareAndExecute($sql, $params, 'column'); $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
if ($result) { if ($result) {
//"Fade Out can't be larger than overall playlength."; //"Fade Out can't be larger than overall playlength.";
@ -910,7 +909,7 @@ SQL;
$row->setDbCuein($cueIn); $row->setDbCuein($cueIn);
$row->setDBCliplength($cliplength); $row->setDBCliplength($cliplength);
} elseif (!is_null($cueOut)) { } elseif (!is_null($cueOut)) {
if ($cueOut === "") { if ($cueOut === "") {
@ -1017,8 +1016,8 @@ SQL;
public static function getBlockCount() public static function getBlockCount()
{ {
$sql = 'SELECT count(*) as cnt FROM cc_playlist'; $sql = 'SELECT count(*) as cnt FROM cc_playlist';
$res = Application_Common_Database::prepareAndExecute($sql, array(), $res = Application_Common_Database::prepareAndExecute($sql, array(),
Application_Common_Database::COLUMN); Application_Common_Database::COLUMN);
return $res; return $res;
@ -1065,7 +1064,7 @@ SQL;
CcBlockQuery::create()->findPKs($p_ids)->delete(); CcBlockQuery::create()->findPKs($p_ids)->delete();
$updateIsPlaylistFlag = true; $updateIsPlaylistFlag = true;
} }
if ($updateIsPlaylistFlag) { if ($updateIsPlaylistFlag) {
// update is_playlist flag in cc_files // update is_playlist flag in cc_files
Application_Model_StoredFile::setIsPlaylist( Application_Model_StoredFile::setIsPlaylist(
@ -1164,7 +1163,7 @@ SQL;
$blockType = $data['etc']['sp_type'] == 0 ? 'dynamic':'static'; $blockType = $data['etc']['sp_type'] == 0 ? 'dynamic':'static';
$this->saveType($blockType); $this->saveType($blockType);
$this->storeCriteriaIntoDb($data); $this->storeCriteriaIntoDb($data);
// if the block is dynamic, put null to the length // if the block is dynamic, put null to the length
// as it cannot be calculated // as it cannot be calculated
if ($blockType == 'dynamic') { if ($blockType == 'dynamic') {
@ -1209,7 +1208,7 @@ SQL;
if (isset($d['sp_criteria_extra'])) { $extra = $d['sp_criteria_extra']; } if (isset($d['sp_criteria_extra'])) { $extra = $d['sp_criteria_extra']; }
if (isset($d['sp_criteria_datetime_select'])) { $datetimeunit = $d['sp_criteria_datetime_select']; } if (isset($d['sp_criteria_datetime_select'])) { $datetimeunit = $d['sp_criteria_datetime_select']; }
if (isset($d['sp_criteria_extra_datetime_select'])) {$extradatetimeunit = $d['sp_criteria_extra_datetime_select'];} if (isset($d['sp_criteria_extra_datetime_select'])) {$extradatetimeunit = $d['sp_criteria_extra_datetime_select'];}
if ($field == 'utime' || $field == 'mtime' || $field == 'lptime') { if ($field == 'utime' || $field == 'mtime' || $field == 'lptime') {
// if the date isn't relative we want to convert the value to a specific UTC date // if the date isn't relative we want to convert the value to a specific UTC date
if (!(in_array($modifier,array('before','after','between')))) { if (!(in_array($modifier,array('before','after','between')))) {
@ -1221,7 +1220,7 @@ SQL;
} }
} }
$qry = new CcBlockcriteria(); $qry = new CcBlockcriteria();
$qry->setDbCriteria($field) $qry->setDbCriteria($field)
->setDbModifier($d['sp_criteria_modifier']) ->setDbModifier($d['sp_criteria_modifier'])
@ -1229,7 +1228,7 @@ SQL;
->setDbBlockId($this->id); ->setDbBlockId($this->id);
if (isset($d['sp_criteria_extra'])) { if (isset($d['sp_criteria_extra'])) {
if ($field == 'utime' || $field == 'mtime' || $field == 'lptime') { if ($field == 'utime' || $field == 'mtime' || $field == 'lptime') {
// if the date isn't relative we want to convert the value to a specific UTC date // if the date isn't relative we want to convert the value to a specific UTC date
if (!(in_array($modifier,array('before','after','between')))) { if (!(in_array($modifier,array('before','after','between')))) {
@ -1240,7 +1239,7 @@ SQL;
} }
} }
$qry->setDbExtra($extra); $qry->setDbExtra($extra);
} }
// save the criteria group so separation via new modifiers AND can be preserved vs. lumping // save the criteria group so separation via new modifiers AND can be preserved vs. lumping
@ -1270,8 +1269,8 @@ SQL;
->setDbValue($p_criteriaData['etc']['sp_limit_value']) ->setDbValue($p_criteriaData['etc']['sp_limit_value'])
->setDbBlockId($this->id) ->setDbBlockId($this->id)
->save(); ->save();
// insert repeat track option // insert repeat track option
$qry = new CcBlockcriteria(); $qry = new CcBlockcriteria();
$qry->setDbCriteria("repeat_tracks") $qry->setDbCriteria("repeat_tracks")
@ -1348,11 +1347,11 @@ SQL;
// this moves the pointer to the first element in the collection // this moves the pointer to the first element in the collection
$files->getFirst(); $files->getFirst();
$iterator = $files->getIterator(); $iterator = $files->getIterator();
$isBlockFull = false; $isBlockFull = false;
while ($iterator->valid()) { while ($iterator->valid()) {
$id = $iterator->current()->getDbId(); $id = $iterator->current()->getDbId();
$fileLength = $iterator->current()->getCueLength(); $fileLength = $iterator->current()->getCueLength();
$length = Application_Common_DateHelper::calculateLengthInSeconds($fileLength); $length = Application_Common_DateHelper::calculateLengthInSeconds($fileLength);
@ -1385,15 +1384,15 @@ SQL;
$iterator->next(); $iterator->next();
} }
$sizeOfInsert = count($insertList); $sizeOfInsert = count($insertList);
// if block is not full and repeat_track is check, fill up more // if block is not full and repeat_track is check, fill up more
// additionally still don't overflow the limit // additionally still don't overflow the limit
while (!$isBlockFull && $repeat == 1 && $sizeOfInsert > 0) { while (!$isBlockFull && $repeat == 1 && $sizeOfInsert > 0) {
Logging::debug("adding repeated tracks."); Logging::debug("adding repeated tracks.");
Logging::debug("total time = " . $totalTime); Logging::debug("total time = " . $totalTime);
$randomEleKey = array_rand(array_slice($insertList, 0, $sizeOfInsert)); $randomEleKey = array_rand(array_slice($insertList, 0, $sizeOfInsert));
// this will also allow the overflow of tracks so that time limited smart blocks will schedule until they // this will also allow the overflow of tracks so that time limited smart blocks will schedule until they
// are longer than the time limit rather than never scheduling past the time limit // are longer than the time limit rather than never scheduling past the time limit
@ -1413,7 +1412,7 @@ SQL;
$totalItems++; $totalItems++;
} }
} }
if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500 || $totalTime > $limit['time']) { if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500 || $totalTime > $limit['time']) {
break; break;
} }
@ -1461,8 +1460,7 @@ SQL;
"track_number" => _("Track Number"), "track_number" => _("Track Number"),
"utime" => _("Uploaded"), "utime" => _("Uploaded"),
"info_url" => _("Website"), "info_url" => _("Website"),
"year" => _("Year"), "year" => _("Year")
"media_type" => _("Media Type")
); );
$modifierOptions = array( $modifierOptions = array(
@ -1561,8 +1559,7 @@ SQL;
"track_number" => _("Track Number"), "track_number" => _("Track Number"),
"utime" => _("Uploaded"), "utime" => _("Uploaded"),
"info_url" => _("Website"), "info_url" => _("Website"),
"year" => _("Year"), "year" => _("Year")
"media_type" => _("Media Type")
); );
$modifierOptions = array( $modifierOptions = array(
@ -1799,7 +1796,7 @@ SQL;
$limits['items'] = null; $limits['items'] = null;
} }
} }
$repeatTracks = 0; $repeatTracks = 0;
$overflowTracks = 0; $overflowTracks = 0;
@ -1868,9 +1865,9 @@ SQL;
SELECT distinct(file_id) SELECT distinct(file_id)
FROM cc_blockcontents FROM cc_blockcontents
SQL; SQL;
$files = Application_Common_Database::prepareAndExecute($sql, array()); $files = Application_Common_Database::prepareAndExecute($sql, array());
$real_files = array(); $real_files = array();
foreach ($files as $f) { foreach ($files as $f) {
$real_files[] = $f['file_id']; $real_files[] = $f['file_id'];

5
airtime_mvc/application/models/StoredFile.php
View File

@ -54,8 +54,7 @@ class Application_Model_StoredFile
"cuein" => "DbCueIn", "cuein" => "DbCueIn",
"cueout" => "DbCueOut", "cueout" => "DbCueOut",
"description" => "DbDescription", "description" => "DbDescription",
"artwork" => "DbArtwork", "artwork" => "DbArtwork"
"media_type" => "DbMediaType"
); );
function __construct($file, $con) { function __construct($file, $con) {
@ -673,7 +672,7 @@ SQL;
"bit_rate", "sample_rate", "isrc_number", "encoded_by", "label", "bit_rate", "sample_rate", "isrc_number", "encoded_by", "label",
"copyright", "mime", "language", "filepath", "owner_id", "copyright", "mime", "language", "filepath", "owner_id",
"conductor", "replay_gain", "lptime", "is_playlist", "is_scheduled", "conductor", "replay_gain", "lptime", "is_playlist", "is_scheduled",
"cuein", "cueout", "description", "artwork", "media_type" ); "cuein", "cueout", "description", "artwork" );
} }
public static function searchLibraryFiles($datatables) public static function searchLibraryFiles($datatables)

1
airtime_mvc/application/models/airtime/map/CcFilesTableMap.php
View File

@ -112,7 +112,6 @@ class CcFilesTableMap extends TableMap
$this->addColumn('filesize', 'DbFilesize', 'INTEGER', true, null, 0); $this->addColumn('filesize', 'DbFilesize', 'INTEGER', true, null, 0);
$this->addColumn('description', 'DbDescription', 'VARCHAR', false, 512, null); $this->addColumn('description', 'DbDescription', 'VARCHAR', false, 512, null);
$this->addColumn('artwork', 'DbArtwork', 'VARCHAR', false, 512, null); $this->addColumn('artwork', 'DbArtwork', 'VARCHAR', false, 512, null);
$this->addColumn('media_type', 'DbMediaType', 'VARCHAR', false, 4, null);
// validators // validators
} // initialize() } // initialize()

55
airtime_mvc/application/models/airtime/om/BaseCcFiles.php
View File

@ -294,12 +294,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
*/ */
protected $artwork; protected $artwork;
/**
* The value for the media_type field.
* @var string
*/
protected $media_type;
/** /**
* The value for the artist_url field. * The value for the artist_url field.
* @var string * @var string
@ -1199,17 +1193,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
return $this->artwork; return $this->artwork;
} }
/**
* Get the [media_type] column value.
*
* @return string
*/
public function getDbMediaType()
{
return $this->media_type;
}
/** /**
* Get the [artist_url] column value. * Get the [artist_url] column value.
* *
@ -1892,26 +1875,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
return $this; return $this;
} // setDbArtwork() } // setDbArtwork()
/**
* Set the value of [media_type] column.
*
* @param string $v new value
* @return CcFiles The current object (for fluent API support)
*/
public function setDbMediaType($v)
{
if ($v !== null && is_numeric($v)) {
$v = (string) $v;
}
if ($this->media_type !== $v) {
$this->media_type = $v;
$this->modifiedColumns[] = CcFilesPeer::MEDIA_TYPE;
}
return $this;
} // setDbMediaType()
/** /**
* Set the value of [artist_name] column. * Set the value of [artist_name] column.
* *
@ -3341,7 +3304,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$this->filesize = ($row[$startcol + 70] !== null) ? (int) $row[$startcol + 70] : null; $this->filesize = ($row[$startcol + 70] !== null) ? (int) $row[$startcol + 70] : null;
$this->description = ($row[$startcol + 71] !== null) ? (string) $row[$startcol + 71] : null; $this->description = ($row[$startcol + 71] !== null) ? (string) $row[$startcol + 71] : null;
$this->artwork = ($row[$startcol + 72] !== null) ? (string) $row[$startcol + 72] : null; $this->artwork = ($row[$startcol + 72] !== null) ? (string) $row[$startcol + 72] : null;
$this->media_type = ($row[$startcol + 73] !== null) ? (string) $row[$startcol + 73] : null;
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
@ -3982,9 +3944,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
if ($this->isColumnModified(CcFilesPeer::ARTWORK)) { if ($this->isColumnModified(CcFilesPeer::ARTWORK)) {
$modifiedColumns[':p' . $index++] = '"artwork"'; $modifiedColumns[':p' . $index++] = '"artwork"';
} }
if ($this->isColumnModified(CcFilesPeer::MEDIA_TYPE)) {
$modifiedColumns[':p' . $index++] = '"media_type"';
}
$sql = sprintf( $sql = sprintf(
'INSERT INTO "cc_files" (%s) VALUES (%s)', 'INSERT INTO "cc_files" (%s) VALUES (%s)',
@ -4215,9 +4174,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
case '"artwork"': case '"artwork"':
$stmt->bindValue($identifier, $this->artwork, PDO::PARAM_STR); $stmt->bindValue($identifier, $this->artwork, PDO::PARAM_STR);
break; break;
case '"media_type"':
$stmt->bindValue($identifier, $this->media_type, PDO::PARAM_STR);
break;
} }
} }
$stmt->execute(); $stmt->execute();
@ -4652,9 +4608,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
case 72: case 72:
return $this->getDbArtwork(); return $this->getDbArtwork();
break; break;
case 73:
return $this->getDbMediaType();
break;
default: default:
return null; return null;
break; break;
@ -4757,7 +4710,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$keys[70] => $this->getDbFilesize(), $keys[70] => $this->getDbFilesize(),
$keys[71] => $this->getDbDescription(), $keys[71] => $this->getDbDescription(),
$keys[72] => $this->getDbArtwork(), $keys[72] => $this->getDbArtwork(),
$keys[73] => $this->getDbMediaType(),
); );
$virtualColumns = $this->virtualColumns; $virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) { foreach ($virtualColumns as $key => $virtualColumn) {
@ -5051,9 +5003,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
case 72: case 72:
$this->setDbArtwork($value); $this->setDbArtwork($value);
break; break;
case 73:
$this->setDbMediaType($value);
break;
} // switch() } // switch()
} }
@ -5151,7 +5100,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
if (array_key_exists($keys[70], $arr)) $this->setDbFilesize($arr[$keys[70]]); if (array_key_exists($keys[70], $arr)) $this->setDbFilesize($arr[$keys[70]]);
if (array_key_exists($keys[71], $arr)) $this->setDbDescription($arr[$keys[71]]); if (array_key_exists($keys[71], $arr)) $this->setDbDescription($arr[$keys[71]]);
if (array_key_exists($keys[72], $arr)) $this->setDbArtwork($arr[$keys[72]]); if (array_key_exists($keys[72], $arr)) $this->setDbArtwork($arr[$keys[72]]);
if (array_key_exists($keys[73], $arr)) $this->setDbMediaType($arr[$keys[73]]);
} }
/** /**
@ -5236,7 +5184,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
if ($this->isColumnModified(CcFilesPeer::FILESIZE)) $criteria->add(CcFilesPeer::FILESIZE, $this->filesize); if ($this->isColumnModified(CcFilesPeer::FILESIZE)) $criteria->add(CcFilesPeer::FILESIZE, $this->filesize);
if ($this->isColumnModified(CcFilesPeer::DESCRIPTION)) $criteria->add(CcFilesPeer::DESCRIPTION, $this->description); if ($this->isColumnModified(CcFilesPeer::DESCRIPTION)) $criteria->add(CcFilesPeer::DESCRIPTION, $this->description);
if ($this->isColumnModified(CcFilesPeer::ARTWORK)) $criteria->add(CcFilesPeer::ARTWORK, $this->artwork); if ($this->isColumnModified(CcFilesPeer::ARTWORK)) $criteria->add(CcFilesPeer::ARTWORK, $this->artwork);
if ($this->isColumnModified(CcFilesPeer::MEDIA_TYPE)) $criteria->add(CcFilesPeer::MEDIA_TYPE, $this->media_type);
return $criteria; return $criteria;
} }
@ -5372,7 +5319,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$copyObj->setDbFilesize($this->getDbFilesize()); $copyObj->setDbFilesize($this->getDbFilesize());
$copyObj->setDbDescription($this->getDbDescription()); $copyObj->setDbDescription($this->getDbDescription());
$copyObj->setDbArtwork($this->getDbArtwork()); $copyObj->setDbArtwork($this->getDbArtwork());
$copyObj->setDbMediaType($this->getDbMediaType());
if ($deepCopy && !$this->startCopy) { if ($deepCopy && !$this->startCopy) {
// important: temporarily setNew(false) because this affects the behavior of // important: temporarily setNew(false) because this affects the behavior of
@ -7775,7 +7721,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$this->filesize = null; $this->filesize = null;
$this->description = null; $this->description = null;
$this->artwork = null; $this->artwork = null;
$this->media_type = null;
$this->alreadyInSave = false; $this->alreadyInSave = false;
$this->alreadyInValidation = false; $this->alreadyInValidation = false;
$this->alreadyInClearAllReferencesDeep = false; $this->alreadyInClearAllReferencesDeep = false;

27
airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
View File

@ -251,9 +251,6 @@ abstract class BaseCcFilesPeer
/** the column name for the artwork field */ /** the column name for the artwork field */
const ARTWORK = 'cc_files.artwork'; const ARTWORK = 'cc_files.artwork';
/** the column name for the media_type field */
const MEDIA_TYPE = 'cc_files.media_type';
/** The default string format for model objects of the related table **/ /** The default string format for model objects of the related table **/
const DEFAULT_STRING_FORMAT = 'YAML'; const DEFAULT_STRING_FORMAT = 'YAML';
@ -273,12 +270,12 @@ abstract class BaseCcFilesPeer
* e.g. CcFilesPeer::$fieldNames[CcFilesPeer::TYPE_PHPNAME][0] = 'Id' * e.g. CcFilesPeer::$fieldNames[CcFilesPeer::TYPE_PHPNAME][0] = 'Id'
*/ */
protected static $fieldNames = array ( protected static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbMime', 'DbFtype', 'DbDirectory', 'DbFilepath', 'DbImportStatus', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbUtime', 'DbLPtime', 'DbMd5', 'DbTrackTitle', 'DbArtistName', 'DbBitRate', 'DbSampleRate', 'DbFormat', 'DbLength', 'DbAlbumTitle', 'DbGenre', 'DbComments', 'DbYear', 'DbTrackNumber', 'DbChannels', 'DbUrl', 'DbBpm', 'DbRating', 'DbEncodedBy', 'DbDiscNumber', 'DbMood', 'DbLabel', 'DbComposer', 'DbEncoder', 'DbChecksum', 'DbLyrics', 'DbOrchestra', 'DbConductor', 'DbLyricist', 'DbOriginalLyricist', 'DbRadioStationName', 'DbInfoUrl', 'DbArtistUrl', 'DbAudioSourceUrl', 'DbRadioStationUrl', 'DbBuyThisUrl', 'DbIsrcNumber', 'DbCatalogNumber', 'DbOriginalArtist', 'DbCopyright', 'DbReportDatetime', 'DbReportLocation', 'DbReportOrganization', 'DbSubject', 'DbContributor', 'DbLanguage', 'DbFileExists', 'DbSoundcloudId', 'DbSoundcloudErrorCode', 'DbSoundcloudErrorMsg', 'DbSoundcloudLinkToFile', 'DbSoundCloundUploadTime', 'DbReplayGain', 'DbOwnerId', 'DbCuein', 'DbCueout', 'DbSilanCheck', 'DbHidden', 'DbIsScheduled', 'DbIsPlaylist', 'DbFilesize', 'DbDescription', 'DbArtwork', 'DbMediaType', ), BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbMime', 'DbFtype', 'DbDirectory', 'DbFilepath', 'DbImportStatus', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbUtime', 'DbLPtime', 'DbMd5', 'DbTrackTitle', 'DbArtistName', 'DbBitRate', 'DbSampleRate', 'DbFormat', 'DbLength', 'DbAlbumTitle', 'DbGenre', 'DbComments', 'DbYear', 'DbTrackNumber', 'DbChannels', 'DbUrl', 'DbBpm', 'DbRating', 'DbEncodedBy', 'DbDiscNumber', 'DbMood', 'DbLabel', 'DbComposer', 'DbEncoder', 'DbChecksum', 'DbLyrics', 'DbOrchestra', 'DbConductor', 'DbLyricist', 'DbOriginalLyricist', 'DbRadioStationName', 'DbInfoUrl', 'DbArtistUrl', 'DbAudioSourceUrl', 'DbRadioStationUrl', 'DbBuyThisUrl', 'DbIsrcNumber', 'DbCatalogNumber', 'DbOriginalArtist', 'DbCopyright', 'DbReportDatetime', 'DbReportLocation', 'DbReportOrganization', 'DbSubject', 'DbContributor', 'DbLanguage', 'DbFileExists', 'DbSoundcloudId', 'DbSoundcloudErrorCode', 'DbSoundcloudErrorMsg', 'DbSoundcloudLinkToFile', 'DbSoundCloundUploadTime', 'DbReplayGain', 'DbOwnerId', 'DbCuein', 'DbCueout', 'DbSilanCheck', 'DbHidden', 'DbIsScheduled', 'DbIsPlaylist', 'DbFilesize', 'DbDescription', 'DbArtwork', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbMime', 'dbFtype', 'dbDirectory', 'dbFilepath', 'dbImportStatus', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbUtime', 'dbLPtime', 'dbMd5', 'dbTrackTitle', 'dbArtistName', 'dbBitRate', 'dbSampleRate', 'dbFormat', 'dbLength', 'dbAlbumTitle', 'dbGenre', 'dbComments', 'dbYear', 'dbTrackNumber', 'dbChannels', 'dbUrl', 'dbBpm', 'dbRating', 'dbEncodedBy', 'dbDiscNumber', 'dbMood', 'dbLabel', 'dbComposer', 'dbEncoder', 'dbChecksum', 'dbLyrics', 'dbOrchestra', 'dbConductor', 'dbLyricist', 'dbOriginalLyricist', 'dbRadioStationName', 'dbInfoUrl', 'dbArtistUrl', 'dbAudioSourceUrl', 'dbRadioStationUrl', 'dbBuyThisUrl', 'dbIsrcNumber', 'dbCatalogNumber', 'dbOriginalArtist', 'dbCopyright', 'dbReportDatetime', 'dbReportLocation', 'dbReportOrganization', 'dbSubject', 'dbContributor', 'dbLanguage', 'dbFileExists', 'dbSoundcloudId', 'dbSoundcloudErrorCode', 'dbSoundcloudErrorMsg', 'dbSoundcloudLinkToFile', 'dbSoundCloundUploadTime', 'dbReplayGain', 'dbOwnerId', 'dbCuein', 'dbCueout', 'dbSilanCheck', 'dbHidden', 'dbIsScheduled', 'dbIsPlaylist', 'dbFilesize', 'dbDescription', 'dbArtwork', 'dbMediaType', ), BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbMime', 'dbFtype', 'dbDirectory', 'dbFilepath', 'dbImportStatus', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbUtime', 'dbLPtime', 'dbMd5', 'dbTrackTitle', 'dbArtistName', 'dbBitRate', 'dbSampleRate', 'dbFormat', 'dbLength', 'dbAlbumTitle', 'dbGenre', 'dbComments', 'dbYear', 'dbTrackNumber', 'dbChannels', 'dbUrl', 'dbBpm', 'dbRating', 'dbEncodedBy', 'dbDiscNumber', 'dbMood', 'dbLabel', 'dbComposer', 'dbEncoder', 'dbChecksum', 'dbLyrics', 'dbOrchestra', 'dbConductor', 'dbLyricist', 'dbOriginalLyricist', 'dbRadioStationName', 'dbInfoUrl', 'dbArtistUrl', 'dbAudioSourceUrl', 'dbRadioStationUrl', 'dbBuyThisUrl', 'dbIsrcNumber', 'dbCatalogNumber', 'dbOriginalArtist', 'dbCopyright', 'dbReportDatetime', 'dbReportLocation', 'dbReportOrganization', 'dbSubject', 'dbContributor', 'dbLanguage', 'dbFileExists', 'dbSoundcloudId', 'dbSoundcloudErrorCode', 'dbSoundcloudErrorMsg', 'dbSoundcloudLinkToFile', 'dbSoundCloundUploadTime', 'dbReplayGain', 'dbOwnerId', 'dbCuein', 'dbCueout', 'dbSilanCheck', 'dbHidden', 'dbIsScheduled', 'dbIsPlaylist', 'dbFilesize', 'dbDescription', 'dbArtwork', ),
BasePeer::TYPE_COLNAME => array (CcFilesPeer::ID, CcFilesPeer::NAME, CcFilesPeer::MIME, CcFilesPeer::FTYPE, CcFilesPeer::DIRECTORY, CcFilesPeer::FILEPATH, CcFilesPeer::IMPORT_STATUS, CcFilesPeer::CURRENTLYACCESSING, CcFilesPeer::EDITEDBY, CcFilesPeer::MTIME, CcFilesPeer::UTIME, CcFilesPeer::LPTIME, CcFilesPeer::MD5, CcFilesPeer::TRACK_TITLE, CcFilesPeer::ARTIST_NAME, CcFilesPeer::BIT_RATE, CcFilesPeer::SAMPLE_RATE, CcFilesPeer::FORMAT, CcFilesPeer::LENGTH, CcFilesPeer::ALBUM_TITLE, CcFilesPeer::GENRE, CcFilesPeer::COMMENTS, CcFilesPeer::YEAR, CcFilesPeer::TRACK_NUMBER, CcFilesPeer::CHANNELS, CcFilesPeer::URL, CcFilesPeer::BPM, CcFilesPeer::RATING, CcFilesPeer::ENCODED_BY, CcFilesPeer::DISC_NUMBER, CcFilesPeer::MOOD, CcFilesPeer::LABEL, CcFilesPeer::COMPOSER, CcFilesPeer::ENCODER, CcFilesPeer::CHECKSUM, CcFilesPeer::LYRICS, CcFilesPeer::ORCHESTRA, CcFilesPeer::CONDUCTOR, CcFilesPeer::LYRICIST, CcFilesPeer::ORIGINAL_LYRICIST, CcFilesPeer::RADIO_STATION_NAME, CcFilesPeer::INFO_URL, CcFilesPeer::ARTIST_URL, CcFilesPeer::AUDIO_SOURCE_URL, CcFilesPeer::RADIO_STATION_URL, CcFilesPeer::BUY_THIS_URL, CcFilesPeer::ISRC_NUMBER, CcFilesPeer::CATALOG_NUMBER, CcFilesPeer::ORIGINAL_ARTIST, CcFilesPeer::COPYRIGHT, CcFilesPeer::REPORT_DATETIME, CcFilesPeer::REPORT_LOCATION, CcFilesPeer::REPORT_ORGANIZATION, CcFilesPeer::SUBJECT, CcFilesPeer::CONTRIBUTOR, CcFilesPeer::LANGUAGE, CcFilesPeer::FILE_EXISTS, CcFilesPeer::SOUNDCLOUD_ID, CcFilesPeer::SOUNDCLOUD_ERROR_CODE, CcFilesPeer::SOUNDCLOUD_ERROR_MSG, CcFilesPeer::SOUNDCLOUD_LINK_TO_FILE, CcFilesPeer::SOUNDCLOUD_UPLOAD_TIME, CcFilesPeer::REPLAY_GAIN, CcFilesPeer::OWNER_ID, CcFilesPeer::CUEIN, CcFilesPeer::CUEOUT, CcFilesPeer::SILAN_CHECK, CcFilesPeer::HIDDEN, CcFilesPeer::IS_SCHEDULED, CcFilesPeer::IS_PLAYLIST, CcFilesPeer::FILESIZE, CcFilesPeer::DESCRIPTION, CcFilesPeer::ARTWORK, CcFilesPeer::MEDIA_TYPE, ), BasePeer::TYPE_COLNAME => array (CcFilesPeer::ID, CcFilesPeer::NAME, CcFilesPeer::MIME, CcFilesPeer::FTYPE, CcFilesPeer::DIRECTORY, CcFilesPeer::FILEPATH, CcFilesPeer::IMPORT_STATUS, CcFilesPeer::CURRENTLYACCESSING, CcFilesPeer::EDITEDBY, CcFilesPeer::MTIME, CcFilesPeer::UTIME, CcFilesPeer::LPTIME, CcFilesPeer::MD5, CcFilesPeer::TRACK_TITLE, CcFilesPeer::ARTIST_NAME, CcFilesPeer::BIT_RATE, CcFilesPeer::SAMPLE_RATE, CcFilesPeer::FORMAT, CcFilesPeer::LENGTH, CcFilesPeer::ALBUM_TITLE, CcFilesPeer::GENRE, CcFilesPeer::COMMENTS, CcFilesPeer::YEAR, CcFilesPeer::TRACK_NUMBER, CcFilesPeer::CHANNELS, CcFilesPeer::URL, CcFilesPeer::BPM, CcFilesPeer::RATING, CcFilesPeer::ENCODED_BY, CcFilesPeer::DISC_NUMBER, CcFilesPeer::MOOD, CcFilesPeer::LABEL, CcFilesPeer::COMPOSER, CcFilesPeer::ENCODER, CcFilesPeer::CHECKSUM, CcFilesPeer::LYRICS, CcFilesPeer::ORCHESTRA, CcFilesPeer::CONDUCTOR, CcFilesPeer::LYRICIST, CcFilesPeer::ORIGINAL_LYRICIST, CcFilesPeer::RADIO_STATION_NAME, CcFilesPeer::INFO_URL, CcFilesPeer::ARTIST_URL, CcFilesPeer::AUDIO_SOURCE_URL, CcFilesPeer::RADIO_STATION_URL, CcFilesPeer::BUY_THIS_URL, CcFilesPeer::ISRC_NUMBER, CcFilesPeer::CATALOG_NUMBER, CcFilesPeer::ORIGINAL_ARTIST, CcFilesPeer::COPYRIGHT, CcFilesPeer::REPORT_DATETIME, CcFilesPeer::REPORT_LOCATION, CcFilesPeer::REPORT_ORGANIZATION, CcFilesPeer::SUBJECT, CcFilesPeer::CONTRIBUTOR, CcFilesPeer::LANGUAGE, CcFilesPeer::FILE_EXISTS, CcFilesPeer::SOUNDCLOUD_ID, CcFilesPeer::SOUNDCLOUD_ERROR_CODE, CcFilesPeer::SOUNDCLOUD_ERROR_MSG, CcFilesPeer::SOUNDCLOUD_LINK_TO_FILE, CcFilesPeer::SOUNDCLOUD_UPLOAD_TIME, CcFilesPeer::REPLAY_GAIN, CcFilesPeer::OWNER_ID, CcFilesPeer::CUEIN, CcFilesPeer::CUEOUT, CcFilesPeer::SILAN_CHECK, CcFilesPeer::HIDDEN, CcFilesPeer::IS_SCHEDULED, CcFilesPeer::IS_PLAYLIST, CcFilesPeer::FILESIZE, CcFilesPeer::DESCRIPTION, CcFilesPeer::ARTWORK, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'MIME', 'FTYPE', 'DIRECTORY', 'FILEPATH', 'IMPORT_STATUS', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'UTIME', 'LPTIME', 'MD5', 'TRACK_TITLE', 'ARTIST_NAME', 'BIT_RATE', 'SAMPLE_RATE', 'FORMAT', 'LENGTH', 'ALBUM_TITLE', 'GENRE', 'COMMENTS', 'YEAR', 'TRACK_NUMBER', 'CHANNELS', 'URL', 'BPM', 'RATING', 'ENCODED_BY', 'DISC_NUMBER', 'MOOD', 'LABEL', 'COMPOSER', 'ENCODER', 'CHECKSUM', 'LYRICS', 'ORCHESTRA', 'CONDUCTOR', 'LYRICIST', 'ORIGINAL_LYRICIST', 'RADIO_STATION_NAME', 'INFO_URL', 'ARTIST_URL', 'AUDIO_SOURCE_URL', 'RADIO_STATION_URL', 'BUY_THIS_URL', 'ISRC_NUMBER', 'CATALOG_NUMBER', 'ORIGINAL_ARTIST', 'COPYRIGHT', 'REPORT_DATETIME', 'REPORT_LOCATION', 'REPORT_ORGANIZATION', 'SUBJECT', 'CONTRIBUTOR', 'LANGUAGE', 'FILE_EXISTS', 'SOUNDCLOUD_ID', 'SOUNDCLOUD_ERROR_CODE', 'SOUNDCLOUD_ERROR_MSG', 'SOUNDCLOUD_LINK_TO_FILE', 'SOUNDCLOUD_UPLOAD_TIME', 'REPLAY_GAIN', 'OWNER_ID', 'CUEIN', 'CUEOUT', 'SILAN_CHECK', 'HIDDEN', 'IS_SCHEDULED', 'IS_PLAYLIST', 'FILESIZE', 'DESCRIPTION', 'ARTWORK', 'MEDIA_TYPE', ), BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'MIME', 'FTYPE', 'DIRECTORY', 'FILEPATH', 'IMPORT_STATUS', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'UTIME', 'LPTIME', 'MD5', 'TRACK_TITLE', 'ARTIST_NAME', 'BIT_RATE', 'SAMPLE_RATE', 'FORMAT', 'LENGTH', 'ALBUM_TITLE', 'GENRE', 'COMMENTS', 'YEAR', 'TRACK_NUMBER', 'CHANNELS', 'URL', 'BPM', 'RATING', 'ENCODED_BY', 'DISC_NUMBER', 'MOOD', 'LABEL', 'COMPOSER', 'ENCODER', 'CHECKSUM', 'LYRICS', 'ORCHESTRA', 'CONDUCTOR', 'LYRICIST', 'ORIGINAL_LYRICIST', 'RADIO_STATION_NAME', 'INFO_URL', 'ARTIST_URL', 'AUDIO_SOURCE_URL', 'RADIO_STATION_URL', 'BUY_THIS_URL', 'ISRC_NUMBER', 'CATALOG_NUMBER', 'ORIGINAL_ARTIST', 'COPYRIGHT', 'REPORT_DATETIME', 'REPORT_LOCATION', 'REPORT_ORGANIZATION', 'SUBJECT', 'CONTRIBUTOR', 'LANGUAGE', 'FILE_EXISTS', 'SOUNDCLOUD_ID', 'SOUNDCLOUD_ERROR_CODE', 'SOUNDCLOUD_ERROR_MSG', 'SOUNDCLOUD_LINK_TO_FILE', 'SOUNDCLOUD_UPLOAD_TIME', 'REPLAY_GAIN', 'OWNER_ID', 'CUEIN', 'CUEOUT', 'SILAN_CHECK', 'HIDDEN', 'IS_SCHEDULED', 'IS_PLAYLIST', 'FILESIZE', 'DESCRIPTION', 'ARTWORK', ),
BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'mime', 'ftype', 'directory', 'filepath', 'import_status', 'currentlyaccessing', 'editedby', 'mtime', 'utime', 'lptime', 'md5', 'track_title', 'artist_name', 'bit_rate', 'sample_rate', 'format', 'length', 'album_title', 'genre', 'comments', 'year', 'track_number', 'channels', 'url', 'bpm', 'rating', 'encoded_by', 'disc_number', 'mood', 'label', 'composer', 'encoder', 'checksum', 'lyrics', 'orchestra', 'conductor', 'lyricist', 'original_lyricist', 'radio_station_name', 'info_url', 'artist_url', 'audio_source_url', 'radio_station_url', 'buy_this_url', 'isrc_number', 'catalog_number', 'original_artist', 'copyright', 'report_datetime', 'report_location', 'report_organization', 'subject', 'contributor', 'language', 'file_exists', 'soundcloud_id', 'soundcloud_error_code', 'soundcloud_error_msg', 'soundcloud_link_to_file', 'soundcloud_upload_time', 'replay_gain', 'owner_id', 'cuein', 'cueout', 'silan_check', 'hidden', 'is_scheduled', 'is_playlist', 'filesize', 'description', 'artwork', 'media_type', ), BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'mime', 'ftype', 'directory', 'filepath', 'import_status', 'currentlyaccessing', 'editedby', 'mtime', 'utime', 'lptime', 'md5', 'track_title', 'artist_name', 'bit_rate', 'sample_rate', 'format', 'length', 'album_title', 'genre', 'comments', 'year', 'track_number', 'channels', 'url', 'bpm', 'rating', 'encoded_by', 'disc_number', 'mood', 'label', 'composer', 'encoder', 'checksum', 'lyrics', 'orchestra', 'conductor', 'lyricist', 'original_lyricist', 'radio_station_name', 'info_url', 'artist_url', 'audio_source_url', 'radio_station_url', 'buy_this_url', 'isrc_number', 'catalog_number', 'original_artist', 'copyright', 'report_datetime', 'report_location', 'report_organization', 'subject', 'contributor', 'language', 'file_exists', 'soundcloud_id', 'soundcloud_error_code', 'soundcloud_error_msg', 'soundcloud_link_to_file', 'soundcloud_upload_time', 'replay_gain', 'owner_id', 'cuein', 'cueout', 'silan_check', 'hidden', 'is_scheduled', 'is_playlist', 'filesize', 'description', 'artwork', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, )
); );
/** /**
@ -288,12 +285,12 @@ abstract class BaseCcFilesPeer
* e.g. CcFilesPeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. CcFilesPeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
protected static $fieldKeys = array ( protected static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbMime' => 2, 'DbFtype' => 3, 'DbDirectory' => 4, 'DbFilepath' => 5, 'DbImportStatus' => 6, 'DbCurrentlyaccessing' => 7, 'DbEditedby' => 8, 'DbMtime' => 9, 'DbUtime' => 10, 'DbLPtime' => 11, 'DbMd5' => 12, 'DbTrackTitle' => 13, 'DbArtistName' => 14, 'DbBitRate' => 15, 'DbSampleRate' => 16, 'DbFormat' => 17, 'DbLength' => 18, 'DbAlbumTitle' => 19, 'DbGenre' => 20, 'DbComments' => 21, 'DbYear' => 22, 'DbTrackNumber' => 23, 'DbChannels' => 24, 'DbUrl' => 25, 'DbBpm' => 26, 'DbRating' => 27, 'DbEncodedBy' => 28, 'DbDiscNumber' => 29, 'DbMood' => 30, 'DbLabel' => 31, 'DbComposer' => 32, 'DbEncoder' => 33, 'DbChecksum' => 34, 'DbLyrics' => 35, 'DbOrchestra' => 36, 'DbConductor' => 37, 'DbLyricist' => 38, 'DbOriginalLyricist' => 39, 'DbRadioStationName' => 40, 'DbInfoUrl' => 41, 'DbArtistUrl' => 42, 'DbAudioSourceUrl' => 43, 'DbRadioStationUrl' => 44, 'DbBuyThisUrl' => 45, 'DbIsrcNumber' => 46, 'DbCatalogNumber' => 47, 'DbOriginalArtist' => 48, 'DbCopyright' => 49, 'DbReportDatetime' => 50, 'DbReportLocation' => 51, 'DbReportOrganization' => 52, 'DbSubject' => 53, 'DbContributor' => 54, 'DbLanguage' => 55, 'DbFileExists' => 56, 'DbSoundcloudId' => 57, 'DbSoundcloudErrorCode' => 58, 'DbSoundcloudErrorMsg' => 59, 'DbSoundcloudLinkToFile' => 60, 'DbSoundCloundUploadTime' => 61, 'DbReplayGain' => 62, 'DbOwnerId' => 63, 'DbCuein' => 64, 'DbCueout' => 65, 'DbSilanCheck' => 66, 'DbHidden' => 67, 'DbIsScheduled' => 68, 'DbIsPlaylist' => 69, 'DbFilesize' => 70, 'DbDescription' => 71, 'DbArtwork' => 72, 'DbMediaType' => 73, ), BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbMime' => 2, 'DbFtype' => 3, 'DbDirectory' => 4, 'DbFilepath' => 5, 'DbImportStatus' => 6, 'DbCurrentlyaccessing' => 7, 'DbEditedby' => 8, 'DbMtime' => 9, 'DbUtime' => 10, 'DbLPtime' => 11, 'DbMd5' => 12, 'DbTrackTitle' => 13, 'DbArtistName' => 14, 'DbBitRate' => 15, 'DbSampleRate' => 16, 'DbFormat' => 17, 'DbLength' => 18, 'DbAlbumTitle' => 19, 'DbGenre' => 20, 'DbComments' => 21, 'DbYear' => 22, 'DbTrackNumber' => 23, 'DbChannels' => 24, 'DbUrl' => 25, 'DbBpm' => 26, 'DbRating' => 27, 'DbEncodedBy' => 28, 'DbDiscNumber' => 29, 'DbMood' => 30, 'DbLabel' => 31, 'DbComposer' => 32, 'DbEncoder' => 33, 'DbChecksum' => 34, 'DbLyrics' => 35, 'DbOrchestra' => 36, 'DbConductor' => 37, 'DbLyricist' => 38, 'DbOriginalLyricist' => 39, 'DbRadioStationName' => 40, 'DbInfoUrl' => 41, 'DbArtistUrl' => 42, 'DbAudioSourceUrl' => 43, 'DbRadioStationUrl' => 44, 'DbBuyThisUrl' => 45, 'DbIsrcNumber' => 46, 'DbCatalogNumber' => 47, 'DbOriginalArtist' => 48, 'DbCopyright' => 49, 'DbReportDatetime' => 50, 'DbReportLocation' => 51, 'DbReportOrganization' => 52, 'DbSubject' => 53, 'DbContributor' => 54, 'DbLanguage' => 55, 'DbFileExists' => 56, 'DbSoundcloudId' => 57, 'DbSoundcloudErrorCode' => 58, 'DbSoundcloudErrorMsg' => 59, 'DbSoundcloudLinkToFile' => 60, 'DbSoundCloundUploadTime' => 61, 'DbReplayGain' => 62, 'DbOwnerId' => 63, 'DbCuein' => 64, 'DbCueout' => 65, 'DbSilanCheck' => 66, 'DbHidden' => 67, 'DbIsScheduled' => 68, 'DbIsPlaylist' => 69, 'DbFilesize' => 70, 'DbDescription' => 71, 'DbArtwork' => 72, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbMime' => 2, 'dbFtype' => 3, 'dbDirectory' => 4, 'dbFilepath' => 5, 'dbImportStatus' => 6, 'dbCurrentlyaccessing' => 7, 'dbEditedby' => 8, 'dbMtime' => 9, 'dbUtime' => 10, 'dbLPtime' => 11, 'dbMd5' => 12, 'dbTrackTitle' => 13, 'dbArtistName' => 14, 'dbBitRate' => 15, 'dbSampleRate' => 16, 'dbFormat' => 17, 'dbLength' => 18, 'dbAlbumTitle' => 19, 'dbGenre' => 20, 'dbComments' => 21, 'dbYear' => 22, 'dbTrackNumber' => 23, 'dbChannels' => 24, 'dbUrl' => 25, 'dbBpm' => 26, 'dbRating' => 27, 'dbEncodedBy' => 28, 'dbDiscNumber' => 29, 'dbMood' => 30, 'dbLabel' => 31, 'dbComposer' => 32, 'dbEncoder' => 33, 'dbChecksum' => 34, 'dbLyrics' => 35, 'dbOrchestra' => 36, 'dbConductor' => 37, 'dbLyricist' => 38, 'dbOriginalLyricist' => 39, 'dbRadioStationName' => 40, 'dbInfoUrl' => 41, 'dbArtistUrl' => 42, 'dbAudioSourceUrl' => 43, 'dbRadioStationUrl' => 44, 'dbBuyThisUrl' => 45, 'dbIsrcNumber' => 46, 'dbCatalogNumber' => 47, 'dbOriginalArtist' => 48, 'dbCopyright' => 49, 'dbReportDatetime' => 50, 'dbReportLocation' => 51, 'dbReportOrganization' => 52, 'dbSubject' => 53, 'dbContributor' => 54, 'dbLanguage' => 55, 'dbFileExists' => 56, 'dbSoundcloudId' => 57, 'dbSoundcloudErrorCode' => 58, 'dbSoundcloudErrorMsg' => 59, 'dbSoundcloudLinkToFile' => 60, 'dbSoundCloundUploadTime' => 61, 'dbReplayGain' => 62, 'dbOwnerId' => 63, 'dbCuein' => 64, 'dbCueout' => 65, 'dbSilanCheck' => 66, 'dbHidden' => 67, 'dbIsScheduled' => 68, 'dbIsPlaylist' => 69, 'dbFilesize' => 70, 'dbDescription' => 71, 'dbArtwork' => 72, 'dbMediaType' => 73, ), BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbMime' => 2, 'dbFtype' => 3, 'dbDirectory' => 4, 'dbFilepath' => 5, 'dbImportStatus' => 6, 'dbCurrentlyaccessing' => 7, 'dbEditedby' => 8, 'dbMtime' => 9, 'dbUtime' => 10, 'dbLPtime' => 11, 'dbMd5' => 12, 'dbTrackTitle' => 13, 'dbArtistName' => 14, 'dbBitRate' => 15, 'dbSampleRate' => 16, 'dbFormat' => 17, 'dbLength' => 18, 'dbAlbumTitle' => 19, 'dbGenre' => 20, 'dbComments' => 21, 'dbYear' => 22, 'dbTrackNumber' => 23, 'dbChannels' => 24, 'dbUrl' => 25, 'dbBpm' => 26, 'dbRating' => 27, 'dbEncodedBy' => 28, 'dbDiscNumber' => 29, 'dbMood' => 30, 'dbLabel' => 31, 'dbComposer' => 32, 'dbEncoder' => 33, 'dbChecksum' => 34, 'dbLyrics' => 35, 'dbOrchestra' => 36, 'dbConductor' => 37, 'dbLyricist' => 38, 'dbOriginalLyricist' => 39, 'dbRadioStationName' => 40, 'dbInfoUrl' => 41, 'dbArtistUrl' => 42, 'dbAudioSourceUrl' => 43, 'dbRadioStationUrl' => 44, 'dbBuyThisUrl' => 45, 'dbIsrcNumber' => 46, 'dbCatalogNumber' => 47, 'dbOriginalArtist' => 48, 'dbCopyright' => 49, 'dbReportDatetime' => 50, 'dbReportLocation' => 51, 'dbReportOrganization' => 52, 'dbSubject' => 53, 'dbContributor' => 54, 'dbLanguage' => 55, 'dbFileExists' => 56, 'dbSoundcloudId' => 57, 'dbSoundcloudErrorCode' => 58, 'dbSoundcloudErrorMsg' => 59, 'dbSoundcloudLinkToFile' => 60, 'dbSoundCloundUploadTime' => 61, 'dbReplayGain' => 62, 'dbOwnerId' => 63, 'dbCuein' => 64, 'dbCueout' => 65, 'dbSilanCheck' => 66, 'dbHidden' => 67, 'dbIsScheduled' => 68, 'dbIsPlaylist' => 69, 'dbFilesize' => 70, 'dbDescription' => 71, 'dbArtwork' => 72, ),
BasePeer::TYPE_COLNAME => array (CcFilesPeer::ID => 0, CcFilesPeer::NAME => 1, CcFilesPeer::MIME => 2, CcFilesPeer::FTYPE => 3, CcFilesPeer::DIRECTORY => 4, CcFilesPeer::FILEPATH => 5, CcFilesPeer::IMPORT_STATUS => 6, CcFilesPeer::CURRENTLYACCESSING => 7, CcFilesPeer::EDITEDBY => 8, CcFilesPeer::MTIME => 9, CcFilesPeer::UTIME => 10, CcFilesPeer::LPTIME => 11, CcFilesPeer::MD5 => 12, CcFilesPeer::TRACK_TITLE => 13, CcFilesPeer::ARTIST_NAME => 14, CcFilesPeer::BIT_RATE => 15, CcFilesPeer::SAMPLE_RATE => 16, CcFilesPeer::FORMAT => 17, CcFilesPeer::LENGTH => 18, CcFilesPeer::ALBUM_TITLE => 19, CcFilesPeer::GENRE => 20, CcFilesPeer::COMMENTS => 21, CcFilesPeer::YEAR => 22, CcFilesPeer::TRACK_NUMBER => 23, CcFilesPeer::CHANNELS => 24, CcFilesPeer::URL => 25, CcFilesPeer::BPM => 26, CcFilesPeer::RATING => 27, CcFilesPeer::ENCODED_BY => 28, CcFilesPeer::DISC_NUMBER => 29, CcFilesPeer::MOOD => 30, CcFilesPeer::LABEL => 31, CcFilesPeer::COMPOSER => 32, CcFilesPeer::ENCODER => 33, CcFilesPeer::CHECKSUM => 34, CcFilesPeer::LYRICS => 35, CcFilesPeer::ORCHESTRA => 36, CcFilesPeer::CONDUCTOR => 37, CcFilesPeer::LYRICIST => 38, CcFilesPeer::ORIGINAL_LYRICIST => 39, CcFilesPeer::RADIO_STATION_NAME => 40, CcFilesPeer::INFO_URL => 41, CcFilesPeer::ARTIST_URL => 42, CcFilesPeer::AUDIO_SOURCE_URL => 43, CcFilesPeer::RADIO_STATION_URL => 44, CcFilesPeer::BUY_THIS_URL => 45, CcFilesPeer::ISRC_NUMBER => 46, CcFilesPeer::CATALOG_NUMBER => 47, CcFilesPeer::ORIGINAL_ARTIST => 48, CcFilesPeer::COPYRIGHT => 49, CcFilesPeer::REPORT_DATETIME => 50, CcFilesPeer::REPORT_LOCATION => 51, CcFilesPeer::REPORT_ORGANIZATION => 52, CcFilesPeer::SUBJECT => 53, CcFilesPeer::CONTRIBUTOR => 54, CcFilesPeer::LANGUAGE => 55, CcFilesPeer::FILE_EXISTS => 56, CcFilesPeer::SOUNDCLOUD_ID => 57, CcFilesPeer::SOUNDCLOUD_ERROR_CODE => 58, CcFilesPeer::SOUNDCLOUD_ERROR_MSG => 59, CcFilesPeer::SOUNDCLOUD_LINK_TO_FILE => 60, CcFilesPeer::SOUNDCLOUD_UPLOAD_TIME => 61, CcFilesPeer::REPLAY_GAIN => 62, CcFilesPeer::OWNER_ID => 63, CcFilesPeer::CUEIN => 64, CcFilesPeer::CUEOUT => 65, CcFilesPeer::SILAN_CHECK => 66, CcFilesPeer::HIDDEN => 67, CcFilesPeer::IS_SCHEDULED => 68, CcFilesPeer::IS_PLAYLIST => 69, CcFilesPeer::FILESIZE => 70, CcFilesPeer::DESCRIPTION => 71, CcFilesPeer::DESCRIPTION => 72, ), BasePeer::TYPE_COLNAME => array (CcFilesPeer::ID => 0, CcFilesPeer::NAME => 1, CcFilesPeer::MIME => 2, CcFilesPeer::FTYPE => 3, CcFilesPeer::DIRECTORY => 4, CcFilesPeer::FILEPATH => 5, CcFilesPeer::IMPORT_STATUS => 6, CcFilesPeer::CURRENTLYACCESSING => 7, CcFilesPeer::EDITEDBY => 8, CcFilesPeer::MTIME => 9, CcFilesPeer::UTIME => 10, CcFilesPeer::LPTIME => 11, CcFilesPeer::MD5 => 12, CcFilesPeer::TRACK_TITLE => 13, CcFilesPeer::ARTIST_NAME => 14, CcFilesPeer::BIT_RATE => 15, CcFilesPeer::SAMPLE_RATE => 16, CcFilesPeer::FORMAT => 17, CcFilesPeer::LENGTH => 18, CcFilesPeer::ALBUM_TITLE => 19, CcFilesPeer::GENRE => 20, CcFilesPeer::COMMENTS => 21, CcFilesPeer::YEAR => 22, CcFilesPeer::TRACK_NUMBER => 23, CcFilesPeer::CHANNELS => 24, CcFilesPeer::URL => 25, CcFilesPeer::BPM => 26, CcFilesPeer::RATING => 27, CcFilesPeer::ENCODED_BY => 28, CcFilesPeer::DISC_NUMBER => 29, CcFilesPeer::MOOD => 30, CcFilesPeer::LABEL => 31, CcFilesPeer::COMPOSER => 32, CcFilesPeer::ENCODER => 33, CcFilesPeer::CHECKSUM => 34, CcFilesPeer::LYRICS => 35, CcFilesPeer::ORCHESTRA => 36, CcFilesPeer::CONDUCTOR => 37, CcFilesPeer::LYRICIST => 38, CcFilesPeer::ORIGINAL_LYRICIST => 39, CcFilesPeer::RADIO_STATION_NAME => 40, CcFilesPeer::INFO_URL => 41, CcFilesPeer::ARTIST_URL => 42, CcFilesPeer::AUDIO_SOURCE_URL => 43, CcFilesPeer::RADIO_STATION_URL => 44, CcFilesPeer::BUY_THIS_URL => 45, CcFilesPeer::ISRC_NUMBER => 46, CcFilesPeer::CATALOG_NUMBER => 47, CcFilesPeer::ORIGINAL_ARTIST => 48, CcFilesPeer::COPYRIGHT => 49, CcFilesPeer::REPORT_DATETIME => 50, CcFilesPeer::REPORT_LOCATION => 51, CcFilesPeer::REPORT_ORGANIZATION => 52, CcFilesPeer::SUBJECT => 53, CcFilesPeer::CONTRIBUTOR => 54, CcFilesPeer::LANGUAGE => 55, CcFilesPeer::FILE_EXISTS => 56, CcFilesPeer::SOUNDCLOUD_ID => 57, CcFilesPeer::SOUNDCLOUD_ERROR_CODE => 58, CcFilesPeer::SOUNDCLOUD_ERROR_MSG => 59, CcFilesPeer::SOUNDCLOUD_LINK_TO_FILE => 60, CcFilesPeer::SOUNDCLOUD_UPLOAD_TIME => 61, CcFilesPeer::REPLAY_GAIN => 62, CcFilesPeer::OWNER_ID => 63, CcFilesPeer::CUEIN => 64, CcFilesPeer::CUEOUT => 65, CcFilesPeer::SILAN_CHECK => 66, CcFilesPeer::HIDDEN => 67, CcFilesPeer::IS_SCHEDULED => 68, CcFilesPeer::IS_PLAYLIST => 69, CcFilesPeer::FILESIZE => 70, CcFilesPeer::DESCRIPTION => 71, CcFilesPeer::DESCRIPTION => 72, ),
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'MIME' => 2, 'FTYPE' => 3, 'DIRECTORY' => 4, 'FILEPATH' => 5, 'IMPORT_STATUS' => 6, 'CURRENTLYACCESSING' => 7, 'EDITEDBY' => 8, 'MTIME' => 9, 'UTIME' => 10, 'LPTIME' => 11, 'MD5' => 12, 'TRACK_TITLE' => 13, 'ARTIST_NAME' => 14, 'BIT_RATE' => 15, 'SAMPLE_RATE' => 16, 'FORMAT' => 17, 'LENGTH' => 18, 'ALBUM_TITLE' => 19, 'GENRE' => 20, 'COMMENTS' => 21, 'YEAR' => 22, 'TRACK_NUMBER' => 23, 'CHANNELS' => 24, 'URL' => 25, 'BPM' => 26, 'RATING' => 27, 'ENCODED_BY' => 28, 'DISC_NUMBER' => 29, 'MOOD' => 30, 'LABEL' => 31, 'COMPOSER' => 32, 'ENCODER' => 33, 'CHECKSUM' => 34, 'LYRICS' => 35, 'ORCHESTRA' => 36, 'CONDUCTOR' => 37, 'LYRICIST' => 38, 'ORIGINAL_LYRICIST' => 39, 'RADIO_STATION_NAME' => 40, 'INFO_URL' => 41, 'ARTIST_URL' => 42, 'AUDIO_SOURCE_URL' => 43, 'RADIO_STATION_URL' => 44, 'BUY_THIS_URL' => 45, 'ISRC_NUMBER' => 46, 'CATALOG_NUMBER' => 47, 'ORIGINAL_ARTIST' => 48, 'COPYRIGHT' => 49, 'REPORT_DATETIME' => 50, 'REPORT_LOCATION' => 51, 'REPORT_ORGANIZATION' => 52, 'SUBJECT' => 53, 'CONTRIBUTOR' => 54, 'LANGUAGE' => 55, 'FILE_EXISTS' => 56, 'SOUNDCLOUD_ID' => 57, 'SOUNDCLOUD_ERROR_CODE' => 58, 'SOUNDCLOUD_ERROR_MSG' => 59, 'SOUNDCLOUD_LINK_TO_FILE' => 60, 'SOUNDCLOUD_UPLOAD_TIME' => 61, 'REPLAY_GAIN' => 62, 'OWNER_ID' => 63, 'CUEIN' => 64, 'CUEOUT' => 65, 'SILAN_CHECK' => 66, 'HIDDEN' => 67, 'IS_SCHEDULED' => 68, 'IS_PLAYLIST' => 69, 'FILESIZE' => 70, 'DESCRIPTION' => 71, 'ARTWORK' => 72, 'MEDIA_TYPE' => 73, ), BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'MIME' => 2, 'FTYPE' => 3, 'DIRECTORY' => 4, 'FILEPATH' => 5, 'IMPORT_STATUS' => 6, 'CURRENTLYACCESSING' => 7, 'EDITEDBY' => 8, 'MTIME' => 9, 'UTIME' => 10, 'LPTIME' => 11, 'MD5' => 12, 'TRACK_TITLE' => 13, 'ARTIST_NAME' => 14, 'BIT_RATE' => 15, 'SAMPLE_RATE' => 16, 'FORMAT' => 17, 'LENGTH' => 18, 'ALBUM_TITLE' => 19, 'GENRE' => 20, 'COMMENTS' => 21, 'YEAR' => 22, 'TRACK_NUMBER' => 23, 'CHANNELS' => 24, 'URL' => 25, 'BPM' => 26, 'RATING' => 27, 'ENCODED_BY' => 28, 'DISC_NUMBER' => 29, 'MOOD' => 30, 'LABEL' => 31, 'COMPOSER' => 32, 'ENCODER' => 33, 'CHECKSUM' => 34, 'LYRICS' => 35, 'ORCHESTRA' => 36, 'CONDUCTOR' => 37, 'LYRICIST' => 38, 'ORIGINAL_LYRICIST' => 39, 'RADIO_STATION_NAME' => 40, 'INFO_URL' => 41, 'ARTIST_URL' => 42, 'AUDIO_SOURCE_URL' => 43, 'RADIO_STATION_URL' => 44, 'BUY_THIS_URL' => 45, 'ISRC_NUMBER' => 46, 'CATALOG_NUMBER' => 47, 'ORIGINAL_ARTIST' => 48, 'COPYRIGHT' => 49, 'REPORT_DATETIME' => 50, 'REPORT_LOCATION' => 51, 'REPORT_ORGANIZATION' => 52, 'SUBJECT' => 53, 'CONTRIBUTOR' => 54, 'LANGUAGE' => 55, 'FILE_EXISTS' => 56, 'SOUNDCLOUD_ID' => 57, 'SOUNDCLOUD_ERROR_CODE' => 58, 'SOUNDCLOUD_ERROR_MSG' => 59, 'SOUNDCLOUD_LINK_TO_FILE' => 60, 'SOUNDCLOUD_UPLOAD_TIME' => 61, 'REPLAY_GAIN' => 62, 'OWNER_ID' => 63, 'CUEIN' => 64, 'CUEOUT' => 65, 'SILAN_CHECK' => 66, 'HIDDEN' => 67, 'IS_SCHEDULED' => 68, 'IS_PLAYLIST' => 69, 'FILESIZE' => 70, 'DESCRIPTION' => 71, 'ARTWORK' => 72, ),
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'mime' => 2, 'ftype' => 3, 'directory' => 4, 'filepath' => 5, 'import_status' => 6, 'currentlyaccessing' => 7, 'editedby' => 8, 'mtime' => 9, 'utime' => 10, 'lptime' => 11, 'md5' => 12, 'track_title' => 13, 'artist_name' => 14, 'bit_rate' => 15, 'sample_rate' => 16, 'format' => 17, 'length' => 18, 'album_title' => 19, 'genre' => 20, 'comments' => 21, 'year' => 22, 'track_number' => 23, 'channels' => 24, 'url' => 25, 'bpm' => 26, 'rating' => 27, 'encoded_by' => 28, 'disc_number' => 29, 'mood' => 30, 'label' => 31, 'composer' => 32, 'encoder' => 33, 'checksum' => 34, 'lyrics' => 35, 'orchestra' => 36, 'conductor' => 37, 'lyricist' => 38, 'original_lyricist' => 39, 'radio_station_name' => 40, 'info_url' => 41, 'artist_url' => 42, 'audio_source_url' => 43, 'radio_station_url' => 44, 'buy_this_url' => 45, 'isrc_number' => 46, 'catalog_number' => 47, 'original_artist' => 48, 'copyright' => 49, 'report_datetime' => 50, 'report_location' => 51, 'report_organization' => 52, 'subject' => 53, 'contributor' => 54, 'language' => 55, 'file_exists' => 56, 'soundcloud_id' => 57, 'soundcloud_error_code' => 58, 'soundcloud_error_msg' => 59, 'soundcloud_link_to_file' => 60, 'soundcloud_upload_time' => 61, 'replay_gain' => 62, 'owner_id' => 63, 'cuein' => 64, 'cueout' => 65, 'silan_check' => 66, 'hidden' => 67, 'is_scheduled' => 68, 'is_playlist' => 69, 'filesize' => 70, 'description' => 71, 'artwork' => 72, 'media_type' => 73, ), BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'mime' => 2, 'ftype' => 3, 'directory' => 4, 'filepath' => 5, 'import_status' => 6, 'currentlyaccessing' => 7, 'editedby' => 8, 'mtime' => 9, 'utime' => 10, 'lptime' => 11, 'md5' => 12, 'track_title' => 13, 'artist_name' => 14, 'bit_rate' => 15, 'sample_rate' => 16, 'format' => 17, 'length' => 18, 'album_title' => 19, 'genre' => 20, 'comments' => 21, 'year' => 22, 'track_number' => 23, 'channels' => 24, 'url' => 25, 'bpm' => 26, 'rating' => 27, 'encoded_by' => 28, 'disc_number' => 29, 'mood' => 30, 'label' => 31, 'composer' => 32, 'encoder' => 33, 'checksum' => 34, 'lyrics' => 35, 'orchestra' => 36, 'conductor' => 37, 'lyricist' => 38, 'original_lyricist' => 39, 'radio_station_name' => 40, 'info_url' => 41, 'artist_url' => 42, 'audio_source_url' => 43, 'radio_station_url' => 44, 'buy_this_url' => 45, 'isrc_number' => 46, 'catalog_number' => 47, 'original_artist' => 48, 'copyright' => 49, 'report_datetime' => 50, 'report_location' => 51, 'report_organization' => 52, 'subject' => 53, 'contributor' => 54, 'language' => 55, 'file_exists' => 56, 'soundcloud_id' => 57, 'soundcloud_error_code' => 58, 'soundcloud_error_msg' => 59, 'soundcloud_link_to_file' => 60, 'soundcloud_upload_time' => 61, 'replay_gain' => 62, 'owner_id' => 63, 'cuein' => 64, 'cueout' => 65, 'silan_check' => 66, 'hidden' => 67, 'is_scheduled' => 68, 'is_playlist' => 69, 'filesize' => 70, 'description' => 71, 'artwork' => 72, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, )
); );
/** /**
@ -440,7 +437,6 @@ abstract class BaseCcFilesPeer
$criteria->addSelectColumn(CcFilesPeer::FILESIZE); $criteria->addSelectColumn(CcFilesPeer::FILESIZE);
$criteria->addSelectColumn(CcFilesPeer::DESCRIPTION); $criteria->addSelectColumn(CcFilesPeer::DESCRIPTION);
$criteria->addSelectColumn(CcFilesPeer::ARTWORK); $criteria->addSelectColumn(CcFilesPeer::ARTWORK);
$criteria->addSelectColumn(CcFilesPeer::MEDIA_TYPE);
} else { } else {
$criteria->addSelectColumn($alias . '.id'); $criteria->addSelectColumn($alias . '.id');
$criteria->addSelectColumn($alias . '.name'); $criteria->addSelectColumn($alias . '.name');
@ -515,7 +511,6 @@ abstract class BaseCcFilesPeer
$criteria->addSelectColumn($alias . '.filesize'); $criteria->addSelectColumn($alias . '.filesize');
$criteria->addSelectColumn($alias . '.description'); $criteria->addSelectColumn($alias . '.description');
$criteria->addSelectColumn($alias . '.artwork'); $criteria->addSelectColumn($alias . '.artwork');
$criteria->addSelectColumn($alias . '.media_type');
} }
} }

35
airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
View File

@ -79,7 +79,6 @@
* @method CcFilesQuery orderByDbFilesize($order = Criteria::ASC) Order by the filesize column * @method CcFilesQuery orderByDbFilesize($order = Criteria::ASC) Order by the filesize column
* @method CcFilesQuery orderByDbDescription($order = Criteria::ASC) Order by the description column * @method CcFilesQuery orderByDbDescription($order = Criteria::ASC) Order by the description column
* @method CcFilesQuery orderByDbArtwork($order = Criteria::ASC) Order by the artwork column * @method CcFilesQuery orderByDbArtwork($order = Criteria::ASC) Order by the artwork column
* @method CcFilesQuery orderByDbMediaType($order = Criteria::ASC) Order by the media_type column
* *
* @method CcFilesQuery groupByDbId() Group by the id column * @method CcFilesQuery groupByDbId() Group by the id column
* @method CcFilesQuery groupByDbName() Group by the name column * @method CcFilesQuery groupByDbName() Group by the name column
@ -154,7 +153,6 @@
* @method CcFilesQuery groupByDbFilesize() Group by the filesize column * @method CcFilesQuery groupByDbFilesize() Group by the filesize column
* @method CcFilesQuery groupByDbDescription() Group by the description column * @method CcFilesQuery groupByDbDescription() Group by the description column
* @method CcFilesQuery groupByDbArtwork() Group by the artwork column * @method CcFilesQuery groupByDbArtwork() Group by the artwork column
* @method CcFilesQuery groupByDbMediaType() Group by the media_type column
* *
* @method CcFilesQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method CcFilesQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
* @method CcFilesQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method CcFilesQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@ -279,7 +277,6 @@
* @method CcFiles findOneByDbFilesize(int $filesize) Return the first CcFiles filtered by the filesize column * @method CcFiles findOneByDbFilesize(int $filesize) Return the first CcFiles filtered by the filesize column
* @method CcFiles findOneByDbDescription(string $description) Return the first CcFiles filtered by the description column * @method CcFiles findOneByDbDescription(string $description) Return the first CcFiles filtered by the description column
* @method CcFiles findOneByDbArtwork(string $artwork) Return the first CcFiles filtered by the artwork column * @method CcFiles findOneByDbArtwork(string $artwork) Return the first CcFiles filtered by the artwork column
* @method CcFiles findOneByDbMediaType(string $media_type) Return the first CcFiles filtered by the media_type column
* *
* @method array findByDbId(int $id) Return CcFiles objects filtered by the id column * @method array findByDbId(int $id) Return CcFiles objects filtered by the id column
* @method array findByDbName(string $name) Return CcFiles objects filtered by the name column * @method array findByDbName(string $name) Return CcFiles objects filtered by the name column
@ -354,7 +351,6 @@
* @method array findByDbFilesize(int $filesize) Return CcFiles objects filtered by the filesize column * @method array findByDbFilesize(int $filesize) Return CcFiles objects filtered by the filesize column
* @method array findByDbDescription(string $description) Return CcFiles objects filtered by the description column * @method array findByDbDescription(string $description) Return CcFiles objects filtered by the description column
* @method array findByDbArtwork(string $artwork) Return CcFiles objects filtered by the artwork column * @method array findByDbArtwork(string $artwork) Return CcFiles objects filtered by the artwork column
* @method array findByDbMediaType(string $media_type) Return CcFiles objects filtered by the media_type column
* *
* @package propel.generator.airtime.om * @package propel.generator.airtime.om
*/ */
@ -462,7 +458,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria
*/ */
protected function findPkSimple($key, $con) protected function findPkSimple($key, $con)
{ {
$sql = 'SELECT "id", "name", "mime", "ftype", "directory", "filepath", "import_status", "currentlyaccessing", "editedby", "mtime", "utime", "lptime", "md5", "track_title", "artist_name", "bit_rate", "sample_rate", "format", "length", "album_title", "genre", "comments", "year", "track_number", "channels", "url", "bpm", "rating", "encoded_by", "disc_number", "mood", "label", "composer", "encoder", "checksum", "lyrics", "orchestra", "conductor", "lyricist", "original_lyricist", "radio_station_name", "info_url", "artist_url", "audio_source_url", "radio_station_url", "buy_this_url", "isrc_number", "catalog_number", "original_artist", "copyright", "report_datetime", "report_location", "report_organization", "subject", "contributor", "language", "file_exists", "soundcloud_id", "soundcloud_error_code", "soundcloud_error_msg", "soundcloud_link_to_file", "soundcloud_upload_time", "replay_gain", "owner_id", "cuein", "cueout", "silan_check", "hidden", "is_scheduled", "is_playlist", "filesize", "description", "artwork", "media_type" FROM "cc_files" WHERE "id" = :p0'; $sql = 'SELECT "id", "name", "mime", "ftype", "directory", "filepath", "import_status", "currentlyaccessing", "editedby", "mtime", "utime", "lptime", "md5", "track_title", "artist_name", "bit_rate", "sample_rate", "format", "length", "album_title", "genre", "comments", "year", "track_number", "channels", "url", "bpm", "rating", "encoded_by", "disc_number", "mood", "label", "composer", "encoder", "checksum", "lyrics", "orchestra", "conductor", "lyricist", "original_lyricist", "radio_station_name", "info_url", "artist_url", "audio_source_url", "radio_station_url", "buy_this_url", "isrc_number", "catalog_number", "original_artist", "copyright", "report_datetime", "report_location", "report_organization", "subject", "contributor", "language", "file_exists", "soundcloud_id", "soundcloud_error_code", "soundcloud_error_msg", "soundcloud_link_to_file", "soundcloud_upload_time", "replay_gain", "owner_id", "cuein", "cueout", "silan_check", "hidden", "is_scheduled", "is_playlist", "filesize", "description", "artwork" FROM "cc_files" WHERE "id" = :p0';
try { try {
$stmt = $con->prepare($sql); $stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT); $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@ -1974,35 +1970,6 @@ abstract class BaseCcFilesQuery extends ModelCriteria
return $this->addUsingAlias(CcFilesPeer::ARTWORK, $dbArtwork, $comparison); return $this->addUsingAlias(CcFilesPeer::ARTWORK, $dbArtwork, $comparison);
} }
/**
* Filter the query on the media_type column
*
* Example usage:
* <code>
* $query->filterByDbMediaType('fooValue'); // WHERE media_type = 'fooValue'
* $query->filterByDbMediaType('%fooValue%'); // WHERE media_type LIKE '%fooValue%'
* </code>
*
* @param string $dbMediaType The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return CcFilesQuery The current query, for fluid interface
*/
public function filterByDbMediaType($dbMediaType = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($dbMediaType)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $dbMediaType)) {
$dbMediaType = str_replace('*', '%', $dbMediaType);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(CcFilesPeer::MEDIA_TYPE, $dbMediaType, $comparison);
}
/** /**
* Filter the query on the artist_url column * Filter the query on the artist_url column
* *

43
airtime_mvc/application/services/HistoryService.php
View File

@ -516,41 +516,41 @@ class Application_Service_HistoryService
return $filteredShows; return $filteredShows;
} }
public function insertWebstreamMetadata($schedId, $startDT, $data) { public function insertWebstreamMetadata($schedId, $startDT, $data) {
$this->con->beginTransaction(); $this->con->beginTransaction();
try { try {
$item = CcScheduleQuery::create()->findPK($schedId, $this->con); $item = CcScheduleQuery::create()->findPK($schedId, $this->con);
//TODO figure out how to combine these all into 1 query. //TODO figure out how to combine these all into 1 query.
$showInstance = $item->getCcShowInstances($this->con); $showInstance = $item->getCcShowInstances($this->con);
$show = $showInstance->getCcShow($this->con); $show = $showInstance->getCcShow($this->con);
$webstream = $item->getCcWebstream($this->con); $webstream = $item->getCcWebstream($this->con);
$metadata = array(); $metadata = array();
$metadata["showname"] = $show->getDbName(); $metadata["showname"] = $show->getDbName();
$metadata[MDATA_KEY_TITLE] = $data->title; $metadata[MDATA_KEY_TITLE] = $data->title;
$metadata[MDATA_KEY_CREATOR] = $webstream->getDbName(); $metadata[MDATA_KEY_CREATOR] = $webstream->getDbName();
$history = new CcPlayoutHistory(); $history = new CcPlayoutHistory();
$history->setDbStarts($startDT); $history->setDbStarts($startDT);
$history->setDbEnds(null); $history->setDbEnds(null);
$history->setDbInstanceId($item->getDbInstanceId()); $history->setDbInstanceId($item->getDbInstanceId());
foreach ($metadata as $key => $val) { foreach ($metadata as $key => $val) {
$meta = new CcPlayoutHistoryMetaData(); $meta = new CcPlayoutHistoryMetaData();
$meta->setDbKey($key); $meta->setDbKey($key);
$meta->setDbValue($val); $meta->setDbValue($val);
$history->addCcPlayoutHistoryMetaData($meta); $history->addCcPlayoutHistoryMetaData($meta);
} }
$history->save($this->con); $history->save($this->con);
$this->con->commit(); $this->con->commit();
} }
catch (Exception $e) { catch (Exception $e) {
@ -586,36 +586,36 @@ class Application_Service_HistoryService
$itemEnd = $item->getDbEnds(null); $itemEnd = $item->getDbEnds(null);
$recordStart = $item->getDbStarts(null); $recordStart = $item->getDbStarts(null);
$recordEnd = ($instanceEnd < $itemEnd) ? $instanceEnd : $itemEnd; $recordEnd = ($instanceEnd < $itemEnd) ? $instanceEnd : $itemEnd;
//first check if this is a duplicate //first check if this is a duplicate
// (caused by restarting liquidsoap) // (caused by restarting liquidsoap)
$prevRecord = CcPlayoutHistoryQuery::create() $prevRecord = CcPlayoutHistoryQuery::create()
->filterByDbStarts($recordStart) ->filterByDbStarts($recordStart)
->filterByDbEnds($recordEnd) ->filterByDbEnds($recordEnd)
->filterByDbFileId($fileId) ->filterByDbFileId($fileId)
->findOne($this->con); ->findOne($this->con);
if (empty($prevRecord)) { if (empty($prevRecord)) {
$history = new CcPlayoutHistory(); $history = new CcPlayoutHistory();
$history->setDbFileId($fileId); $history->setDbFileId($fileId);
$history->setDbStarts($recordStart); $history->setDbStarts($recordStart);
$history->setDbEnds($recordEnd); $history->setDbEnds($recordEnd);
$history->setDbInstanceId($item->getDbInstanceId()); $history->setDbInstanceId($item->getDbInstanceId());
foreach ($metadata as $key => $val) { foreach ($metadata as $key => $val) {
$meta = new CcPlayoutHistoryMetaData(); $meta = new CcPlayoutHistoryMetaData();
$meta->setDbKey($key); $meta->setDbKey($key);
$meta->setDbValue($val); $meta->setDbValue($val);
$history->addCcPlayoutHistoryMetaData($meta); $history->addCcPlayoutHistoryMetaData($meta);
} }
$history->save($this->con); $history->save($this->con);
$this->con->commit(); $this->con->commit();
} }
} }
} }
catch (Exception $e) { catch (Exception $e) {
$this->con->rollback(); $this->con->rollback();
@ -1126,7 +1126,6 @@ class Application_Service_HistoryService
array("name"=> MDATA_KEY_TRACKNUMBER, "label"=> _("Track"), "type"=> TEMPLATE_INT), array("name"=> MDATA_KEY_TRACKNUMBER, "label"=> _("Track"), "type"=> TEMPLATE_INT),
array("name"=> MDATA_KEY_CONDUCTOR, "label"=> _("Conductor"), "type"=> TEMPLATE_STRING), array("name"=> MDATA_KEY_CONDUCTOR, "label"=> _("Conductor"), "type"=> TEMPLATE_STRING),
array("name"=> MDATA_KEY_LANGUAGE, "label"=> _("Language"), "type"=> TEMPLATE_STRING), array("name"=> MDATA_KEY_LANGUAGE, "label"=> _("Language"), "type"=> TEMPLATE_STRING),
array("name"=> MDATA_KEY_MEDIA_TYPE, "label"=> _("Media Type"), "type"=> TEMPLATE_STRING),
); );
return $fileMD; return $fileMD;

1
airtime_mvc/application/upgrade/Upgrades.php
View File

@ -493,7 +493,6 @@ class AirtimeUpgrader2516 extends AirtimeUpgrader
return '2.5.16'; return '2.5.16';
} }
} }
class AirtimeUpgrader300alpha extends AirtimeUpgrader class AirtimeUpgrader300alpha extends AirtimeUpgrader
{ {
protected function getSupportedSchemaVersions() { protected function getSupportedSchemaVersions() {

1
airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
View File

@ -26,7 +26,6 @@ foreach ($this->md as $key => &$value) {
<tr><td><?php echo _("Artwork:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ARTWORK"]);?></td></tr> <tr><td><?php echo _("Artwork:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ARTWORK"]);?></td></tr>
<tr><td><?php echo _("Artwork Data:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ARTWORK_DATA"]);?></td></tr> <tr><td><?php echo _("Artwork Data:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ARTWORK_DATA"]);?></td></tr>
<tr><td><?php echo _("Language:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr> <tr><td><?php echo _("Language:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr>
<tr><td><?php echo _("Media Type:"); ?></td><td><?php echo ($this->md["MDATA_KEY_MEDIA_TYPE"]);?></td></tr>
<tr><td class='file-md-qtip-nowrap'><?php echo _("File Path:"); ?></td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr> <tr><td class='file-md-qtip-nowrap'><?php echo _("File Path:"); ?></td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr>
</table> </table>
<?php endif; ?> <?php endif; ?>

1
airtime_mvc/build/schema.xml
View File

@ -85,7 +85,6 @@
<column name="filesize" phpName="DbFilesize" type="Integer" required="true" defaultValue="0"/> <column name="filesize" phpName="DbFilesize" type="Integer" required="true" defaultValue="0"/>
<column name="description" phpName="DbDescription" type="VARCHAR" size="512" /> <column name="description" phpName="DbDescription" type="VARCHAR" size="512" />
<column name="artwork" phpName="DbArtwork" type="VARCHAR" size="512" required="false"/> <column name="artwork" phpName="DbArtwork" type="VARCHAR" size="512" required="false"/>
<column name="media_type" phpName="DbMediaType" type="VARCHAR" size="4" required="false"/>
<foreign-key foreignTable="cc_subjs" phpName="FkOwner" name="cc_files_owner_fkey"> <foreign-key foreignTable="cc_subjs" phpName="FkOwner" name="cc_files_owner_fkey">
<reference local="owner_id" foreign="id"/> <reference local="owner_id" foreign="id"/>
</foreign-key> </foreign-key>

1
airtime_mvc/build/sql/schema.sql
View File

@ -97,7 +97,6 @@ CREATE TABLE "cc_files"
"filesize" INTEGER DEFAULT 0 NOT NULL, "filesize" INTEGER DEFAULT 0 NOT NULL,
"description" VARCHAR(512), "description" VARCHAR(512),
"artwork" VARCHAR(512), "artwork" VARCHAR(512),
"media_type" VARCHAR(4),
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );

7
airtime_mvc/public/js/airtime/library/library.js
View File

@ -54,8 +54,7 @@ var AIRTIME = (function(AIRTIME) {
"owner_id" : "s", "owner_id" : "s",
"info_url" : "s", "info_url" : "s",
"replay_gain" : "n", "replay_gain" : "n",
"artwork" : "s", "artwork" : "s"
"media_type" : "s"
}; };
if (AIRTIME.library === undefined) { if (AIRTIME.library === undefined) {
@ -592,7 +591,6 @@ var AIRTIME = (function(AIRTIME) {
/* Cue Out */ { "sTitle" : $.i18n._("Cue Out") , "mDataProp" : "cueout" , "bVisible" : false , "sClass" : "library_length" , "sWidth" : "80px" }, /* Cue Out */ { "sTitle" : $.i18n._("Cue Out") , "mDataProp" : "cueout" , "bVisible" : false , "sClass" : "library_length" , "sWidth" : "80px" },
/* Description */ { "sTitle" : $.i18n._("Description") , "mDataProp" : "description" , "bVisible" : false , "sClass" : "library_description" , "sWidth" : "150px" }, /* Description */ { "sTitle" : $.i18n._("Description") , "mDataProp" : "description" , "bVisible" : false , "sClass" : "library_description" , "sWidth" : "150px" },
/* Encoded */ { "sTitle" : $.i18n._("Encoded By") , "mDataProp" : "encoded_by" , "bVisible" : false , "sClass" : "library_encoded" , "sWidth" : "150px" }, /* Encoded */ { "sTitle" : $.i18n._("Encoded By") , "mDataProp" : "encoded_by" , "bVisible" : false , "sClass" : "library_encoded" , "sWidth" : "150px" },
/* Media Type */ { "sTitle" : $.i18n._("Type") , "mDataProp" : "media_type" , "bVisible" : false , "sClass" : "library_media_type" , "sWidth" : "60px" },
/* Genre */ { "sTitle" : $.i18n._("Genre") , "mDataProp" : "genre" , "sClass" : "library_genre" , "sWidth" : "100px" }, /* Genre */ { "sTitle" : $.i18n._("Genre") , "mDataProp" : "genre" , "sClass" : "library_genre" , "sWidth" : "100px" },
/* ISRC Number */ { "sTitle" : $.i18n._("ISRC") , "mDataProp" : "isrc_number" , "bVisible" : false , "sClass" : "library_isrc" , "sWidth" : "150px" }, /* ISRC Number */ { "sTitle" : $.i18n._("ISRC") , "mDataProp" : "isrc_number" , "bVisible" : false , "sClass" : "library_isrc" , "sWidth" : "150px" },
/* Label */ { "sTitle" : $.i18n._("Label") , "mDataProp" : "label" , "bVisible" : false , "sClass" : "library_label" , "sWidth" : "125px" }, /* Label */ { "sTitle" : $.i18n._("Label") , "mDataProp" : "label" , "bVisible" : false , "sClass" : "library_label" , "sWidth" : "125px" },
@ -617,7 +615,7 @@ var AIRTIME = (function(AIRTIME) {
); );
} }
var colExclude = onDashboard ? [0, 1, 2, 34] : [0, 1, 2]; var colExclude = onDashboard ? [0, 1, 2, 33] : [0, 1, 2];
/* ############################################ /* ############################################
DATATABLES DATATABLES
@ -1599,7 +1597,6 @@ var validationTypes = {
"track_number" : "i", "track_number" : "i",
"info_url" : "s", "info_url" : "s",
"artwork" : "s", "artwork" : "s",
"media_type" : "s",
"year" : "i" "year" : "i"
}; };

91
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
View File

@ -8,7 +8,7 @@ function setSmartBlockEvents() {
/********** ADD CRITERIA ROW **********/ /********** ADD CRITERIA ROW **********/
form.find('#criteria_add').live('click', function(){ form.find('#criteria_add').live('click', function(){
var div = $('dd[id="sp_criteria-element"]').children('div:visible:last'); var div = $('dd[id="sp_criteria-element"]').children('div:visible:last');
if (div.length == 0) { if (div.length == 0) {
@ -26,7 +26,7 @@ function setSmartBlockEvents() {
div.find('.db-logic-label').text('and').css('display', 'table'); div.find('.db-logic-label').text('and').css('display', 'table');
div.removeClass('search-row-or').addClass('search-row-and'); div.removeClass('search-row-or').addClass('search-row-and');
div = div.next().show(); div = div.next().show();
div.children().removeAttr('disabled'); div.children().removeAttr('disabled');
@ -45,11 +45,11 @@ function setSmartBlockEvents() {
} }
}); });
/********** ADD MODIFIER ROW **********/ /********** ADD MODIFIER ROW **********/
form.find('a[id^="modifier_add"]').live('click', function(){ form.find('a[id^="modifier_add"]').live('click', function(){
var criteria_value = $(this).siblings('select[name^="sp_criteria_field"]').val(); var criteria_value = $(this).siblings('select[name^="sp_criteria_field"]').val();
//make new modifier row //make new modifier row
var newRow = $(this).parent().clone(), var newRow = $(this).parent().clone(),
@ -63,13 +63,13 @@ function setSmartBlockEvents() {
if (newRow.children().hasClass('errors sp-errors')) { if (newRow.children().hasClass('errors sp-errors')) {
newRow.find('span[class="errors sp-errors"]').remove(); newRow.find('span[class="errors sp-errors"]').remove();
} }
//hide the critieria field select box //hide the critieria field select box
newRowCrit.addClass('sp-invisible'); newRowCrit.addClass('sp-invisible');
//keep criteria value the same //keep criteria value the same
newRowCrit.val(criteria_value); newRowCrit.val(criteria_value);
//reset all other values //reset all other values
newRowMod.val('0'); newRowMod.val('0');
newRowVal.val(''); newRowVal.val('');
@ -78,12 +78,12 @@ function setSmartBlockEvents() {
disableAndHideDateTimeDropdown(newRowVal); disableAndHideDateTimeDropdown(newRowVal);
disableAndHideExtraDateTimeDropdown(newRowVal); disableAndHideExtraDateTimeDropdown(newRowVal);
sizeTextBoxes(newRowVal, 'sp_extra_input_text', 'sp_input_text'); sizeTextBoxes(newRowVal, 'sp_extra_input_text', 'sp_input_text');
//remove the 'criteria add' button from new modifier row //remove the 'criteria add' button from new modifier row
newRow.find('#criteria_add').remove(); newRow.find('#criteria_add').remove();
$(this).parent().after(newRow); $(this).parent().after(newRow);
// remove extra spacing from previous row // remove extra spacing from previous row
newRow.prev().removeClass('search-row-and').addClass('search-row-or'); newRow.prev().removeClass('search-row-and').addClass('search-row-or');
@ -93,7 +93,7 @@ function setSmartBlockEvents() {
removeButtonCheck(); removeButtonCheck();
groupCriteriaRows(); groupCriteriaRows();
}); });
/********** REMOVE ROW **********/ /********** REMOVE ROW **********/
form.find('a[id^="criteria_remove"]').live('click', function(){ form.find('a[id^="criteria_remove"]').live('click', function(){
var curr = $(this).parent(); var curr = $(this).parent();
@ -128,10 +128,10 @@ function setSmartBlockEvents() {
for (var i=0; i<count; i++) { for (var i=0; i<count; i++) {
index = getRowIndex(curr); index = getRowIndex(curr);
var criteria = next.find('[name^="sp_criteria_field"]').val(); var criteria = next.find('[name^="sp_criteria_field"]').val();
curr.find('[name^="sp_criteria_field"]').val(criteria); curr.find('[name^="sp_criteria_field"]').val(criteria);
var modifier = next.find('[name^="sp_criteria_modifier"]').val(); var modifier = next.find('[name^="sp_criteria_modifier"]').val();
populateModifierSelect(curr.find('[name^="sp_criteria_field"]'), false); populateModifierSelect(curr.find('[name^="sp_criteria_field"]'), false);
curr.find('[name^="sp_criteria_modifier"]').val(modifier); curr.find('[name^="sp_criteria_modifier"]').val(modifier);
@ -148,7 +148,7 @@ function setSmartBlockEvents() {
*/ */
if (curr.find('[name^="sp_criteria_extra"]').attr("disabled") != "disabled" if (curr.find('[name^="sp_criteria_extra"]').attr("disabled") != "disabled"
&& next.find('#extra_criteria').is(':visible')) { && next.find('#extra_criteria').is(':visible')) {
var criteria_extra = next.find('[name^="sp_criteria_extra"]').val(); var criteria_extra = next.find('[name^="sp_criteria_extra"]').val();
curr.find('[name^="sp_criteria_extra"]').val(criteria_extra); curr.find('[name^="sp_criteria_extra"]').val(criteria_extra);
disableAndHideExtraField(next.find(':first-child'), getRowIndex(next)); disableAndHideExtraField(next.find(':first-child'), getRowIndex(next));
@ -159,7 +159,7 @@ function setSmartBlockEvents() {
} else if (curr.find('[name^="sp_criteria_extra"]').attr("disabled") != "disabled" } else if (curr.find('[name^="sp_criteria_extra"]').attr("disabled") != "disabled"
&& next.find('#extra_criteria').not(':visible')) { && next.find('#extra_criteria').not(':visible')) {
disableAndHideExtraField(curr.find(':first-child'), index); disableAndHideExtraField(curr.find(':first-child'), index);
/* if only the next row has the extra criteria value, /* if only the next row has the extra criteria value,
* then add the extra criteria element to current row * then add the extra criteria element to current row
* and assign next row's value to it * and assign next row's value to it
@ -231,12 +231,12 @@ function setSmartBlockEvents() {
curr.find('select[name^="sp_criteria_field"]').removeClass('sp-invisible'); curr.find('select[name^="sp_criteria_field"]').removeClass('sp-invisible');
} }
} }
curr = next; curr = next;
next = curr.next(); next = curr.next();
} }
/* Disable the last visible row since it holds the values the user removed /* Disable the last visible row since it holds the values the user removed
* Reset the values to empty and resize the criteria value textbox * Reset the values to empty and resize the criteria value textbox
* in case the row had the extra criteria textbox * in case the row had the extra criteria textbox
@ -255,12 +255,12 @@ function setSmartBlockEvents() {
.find('[name^="sp_criteria_value"]').val('').end() .find('[name^="sp_criteria_value"]').val('').end()
.find('[name^="sp_criteria_extra"]').val('') .find('[name^="sp_criteria_extra"]').val('')
.find('[name^="sp_criteria_extra_datetime_select"]').end(); .find('[name^="sp_criteria_extra_datetime_select"]').end();
sizeTextBoxes(item_to_hide.find('[name^="sp_criteria_value"]'), 'sp_extra_input_text', 'sp_input_text'); sizeTextBoxes(item_to_hide.find('[name^="sp_criteria_value"]'), 'sp_extra_input_text', 'sp_input_text');
item_to_hide.hide(); item_to_hide.hide();
list.next().show(); list.next().show();
//check if last row is a modifier row //check if last row is a modifier row
var last_row = list.find('div:visible:last'); var last_row = list.find('div:visible:last');
if (last_row.find('[name^="sp_criteria_field"]').val() == last_row.prev().find('[name^="sp_criteria_field"]').val()) { if (last_row.find('[name^="sp_criteria_field"]').val() == last_row.prev().find('[name^="sp_criteria_field"]').val()) {
@ -268,22 +268,22 @@ function setSmartBlockEvents() {
last_row.find('select[name^="sp_criteria_field"]').addClass('sp-invisible'); last_row.find('select[name^="sp_criteria_field"]').addClass('sp-invisible');
} }
} }
// always put '+' button on the last enabled row // always put '+' button on the last enabled row
appendAddButton(); appendAddButton();
reindexElements(); reindexElements();
// always put '+' button on the last modifier row // always put '+' button on the last modifier row
appendModAddButton(); appendModAddButton();
// remove the 'x' button if only one row is enabled // remove the 'x' button if only one row is enabled
removeButtonCheck(); removeButtonCheck();
groupCriteriaRows(); groupCriteriaRows();
}); });
/********** SAVE ACTION **********/ /********** SAVE ACTION **********/
// moved to spl.js // moved to spl.js
@ -291,12 +291,12 @@ function setSmartBlockEvents() {
activeTab.find('button[id="generate_button"]').live("click", function(){ activeTab.find('button[id="generate_button"]').live("click", function(){
buttonClickAction('generate', 'playlist/smart-block-generate'); buttonClickAction('generate', 'playlist/smart-block-generate');
}); });
/********** SHUFFLE ACTION **********/ /********** SHUFFLE ACTION **********/
activeTab.find('button[id="shuffle_button"]').live("click", function(){ activeTab.find('button[id="shuffle_button"]').live("click", function(){
buttonClickAction('shuffle', 'playlist/smart-block-shuffle'); buttonClickAction('shuffle', 'playlist/smart-block-shuffle');
}); });
/********** CHANGE PLAYLIST TYPE **********/ /********** CHANGE PLAYLIST TYPE **********/
form.find('dd[id="sp_type-element"]').live("change", function(){ form.find('dd[id="sp_type-element"]').live("change", function(){
//buttonClickAction('generate', 'playlist/empty-content'); //buttonClickAction('generate', 'playlist/empty-content');
@ -334,14 +334,14 @@ function setSmartBlockEvents() {
return false; return false;
} }
}); });
// disable extra field and hide the span // disable extra field and hide the span
disableAndHideExtraField($(this), index); disableAndHideExtraField($(this), index);
disableAndHideDateTimeDropdown($(this), index); disableAndHideDateTimeDropdown($(this), index);
disableAndHideExtraDateTimeDropdown($(this),index); disableAndHideExtraDateTimeDropdown($(this),index);
populateModifierSelect(this, true); populateModifierSelect(this, true);
}); });
/********** MODIFIER CHANGE **********/ /********** MODIFIER CHANGE **********/
form.find('select[id^="sp_criteria_modifier"]').live("change", function(){ form.find('select[id^="sp_criteria_modifier"]').live("change", function(){
var criteria_value = $(this).next(), var criteria_value = $(this).next(),
@ -384,7 +384,7 @@ function getRowIndex(ele) {
start = 3, start = 3,
tokens = id.split(delimiter).slice(start), tokens = id.split(delimiter).slice(start),
index = tokens.join(delimiter); index = tokens.join(delimiter);
return index; return index;
} }
@ -428,7 +428,7 @@ function reindexElements() {
$.each(divs, function(i, div){ $.each(divs, function(i, div){
if (i > 0 && index < 26) { if (i > 0 && index < 26) {
/* If the current row's criteria field is hidden we know it is /* If the current row's criteria field is hidden we know it is
* a modifier row * a modifier row
*/ */
@ -444,7 +444,7 @@ function reindexElements() {
index++; index++;
modIndex = 0; modIndex = 0;
} }
$(div).find('select[name^="sp_criteria_field"]').attr('name', 'sp_criteria_field_'+index+'_'+modIndex); $(div).find('select[name^="sp_criteria_field"]').attr('name', 'sp_criteria_field_'+index+'_'+modIndex);
$(div).find('select[name^="sp_criteria_field"]').attr('id', 'sp_criteria_field_'+index+'_'+modIndex); $(div).find('select[name^="sp_criteria_field"]').attr('id', 'sp_criteria_field_'+index+'_'+modIndex);
$(div).find('select[name^="sp_criteria_modifier"]').attr('name', 'sp_criteria_modifier_'+index+'_'+modIndex); $(div).find('select[name^="sp_criteria_modifier"]').attr('name', 'sp_criteria_modifier_'+index+'_'+modIndex);
@ -464,7 +464,7 @@ function reindexElements() {
function buttonClickAction(clickType, url){ function buttonClickAction(clickType, url){
var data = $('.active-tab .smart-block-form').serializeArray(), var data = $('.active-tab .smart-block-form').serializeArray(),
obj_id = $('.active-tab .obj_id').val(); obj_id = $('.active-tab .obj_id').val();
enableLoadingIcon(); enableLoadingIcon();
$.post(url, {format: "json", data: data, obj_id: obj_id, obj_type: "block", $.post(url, {format: "json", data: data, obj_id: obj_id, obj_type: "block",
modified: AIRTIME.playlist.getModified() modified: AIRTIME.playlist.getModified()
@ -499,7 +499,7 @@ function setupUI() {
shuffleButton.addClass('ui-state-disabled'); shuffleButton.addClass('ui-state-disabled');
shuffleButton.attr('disabled', 'disabled'); shuffleButton.attr('disabled', 'disabled');
} }
if (activeTab.find('.obj_type').val() == 'block') { if (activeTab.find('.obj_type').val() == 'block') {
if (playlist_type == "1") { if (playlist_type == "1") {
shuffleButton.removeAttr("disabled"); shuffleButton.removeAttr("disabled");
@ -514,7 +514,7 @@ function setupUI() {
//sortable.children().hide(); //sortable.children().hide();
} }
} }
$(".playlist_type_help_icon").qtip({ $(".playlist_type_help_icon").qtip({
content: { content: {
text: $.i18n._("A static smart block will save the criteria and generate the block content immediately. This allows you to edit and view it in the Library before adding it to a show.")+"<br /><br />" + text: $.i18n._("A static smart block will save the criteria and generate the block content immediately. This allows you to edit and view it in the Library before adding it to a show.")+"<br /><br />" +
@ -536,7 +536,7 @@ function setupUI() {
at: "right center" at: "right center"
} }
}); });
$(".repeat_tracks_help_icon").qtip({ $(".repeat_tracks_help_icon").qtip({
content: { content: {
text: sprintf($.i18n._("The desired block length will not be reached if %s cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block."), PRODUCT_NAME) text: sprintf($.i18n._("The desired block length will not be reached if %s cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block."), PRODUCT_NAME)
@ -661,7 +661,7 @@ function disableAndHideExtraField(valEle, index) {
spanExtra.children('#sp_criteria_extra_'+index).val("").attr("disabled", "disabled"); spanExtra.children('#sp_criteria_extra_'+index).val("").attr("disabled", "disabled");
spanExtra.hide(); spanExtra.hide();
console.log('hidden'); console.log('hidden');
//make value input larger since we don't have extra field now //make value input larger since we don't have extra field now
var criteria_value = $('#sp_criteria_value_'+index); var criteria_value = $('#sp_criteria_value_'+index);
sizeTextBoxes(criteria_value, 'sp_extra_input_text', 'sp_input_text'); sizeTextBoxes(criteria_value, 'sp_extra_input_text', 'sp_input_text');
@ -685,15 +685,15 @@ function populateModifierSelect(e, popAllMods) {
var criteria_type = getCriteriaOptionType(e), var criteria_type = getCriteriaOptionType(e),
index = getRowIndex($(e).parent()), index = getRowIndex($(e).parent()),
divs; divs;
if (popAllMods) { if (popAllMods) {
index = index.substring(0, 1); index = index.substring(0, 1);
} }
divs = $(e).parents().find('select[id^="sp_criteria_modifier_'+index+'"]'); divs = $(e).parents().find('select[id^="sp_criteria_modifier_'+index+'"]');
$.each(divs, function(i, div){ $.each(divs, function(i, div){
$(div).children().remove(); $(div).children().remove();
if (criteria_type == 's') { if (criteria_type == 's') {
$.each(stringCriteriaOptions, function(key, value){ $.each(stringCriteriaOptions, function(key, value){
$(div).append($('<option></option>') $(div).append($('<option></option>')
@ -777,7 +777,7 @@ function appendAddButton() {
enabled = rows.find('select[name^="sp_criteria_field"]:enabled'); enabled = rows.find('select[name^="sp_criteria_field"]:enabled');
rows.find('#criteria_add').remove(); rows.find('#criteria_add').remove();
if (enabled.length > 1) { if (enabled.length > 1) {
rows.find('select[name^="sp_criteria_field"]:enabled:last') rows.find('select[name^="sp_criteria_field"]:enabled:last')
.siblings('a[id^="criteria_remove"]') .siblings('a[id^="criteria_remove"]')
@ -821,7 +821,7 @@ function disableLoadingIcon() {
function groupCriteriaRows() { function groupCriteriaRows() {
// check whether rows should be "grouped" and shown with an "or" "logic label", or separated by an "and" "logic label" // check whether rows should be "grouped" and shown with an "or" "logic label", or separated by an "and" "logic label"
var visibleRows = $("#sp_criteria-element > div:visible"), var visibleRows = $("#sp_criteria-element > div:visible"),
prevRowGroup = "0"; prevRowGroup = "0";
visibleRows.each(function (index){ visibleRows.each(function (index){
@ -837,7 +837,7 @@ function groupCriteriaRows() {
} }
}); });
// ensure spacing below last visible row // ensure spacing below last visible row
$("#sp_criteria-element > div:visible:last").addClass("search-row-and").removeClass("search-row-or"); $("#sp_criteria-element > div:visible:last").addClass("search-row-and").removeClass("search-row-or");
} }
@ -874,8 +874,7 @@ var criteriaTypes = {
"track_title" : "s", "track_title" : "s",
"track_number" : "n", "track_number" : "n",
"info_url" : "s", "info_url" : "s",
"year" : "n", "year" : "n"
"media_type" : "s"
}; };
var stringCriteriaOptions = { var stringCriteriaOptions = {
@ -887,7 +886,7 @@ var stringCriteriaOptions = {
"starts with" : $.i18n._("starts with"), "starts with" : $.i18n._("starts with"),
"ends with" : $.i18n._("ends with") "ends with" : $.i18n._("ends with")
}; };
var numericCriteriaOptions = { var numericCriteriaOptions = {
"0" : $.i18n._("Select modifier"), "0" : $.i18n._("Select modifier"),
"is" : $.i18n._("is"), "is" : $.i18n._("is"),