+ * $query->filterByDbCriteriaGroup(1234); // WHERE criteriagroup = 1234
+ * $query->filterByDbCriteriaGroup(array(12, 34)); // WHERE criteriagroup IN (12, 34)
+ * $query->filterByDbCriteriaGroup(array('min' => 12)); // WHERE criteriagroup >= 12
+ * $query->filterByDbCriteriaGroup(array('max' => 12)); // WHERE criteriagroup <= 12
+ *
+ *
+ * @param mixed $dbCriteriaGroup The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return CcBlockcriteriaQuery The current query, for fluid interface
+ */
+ public function filterByDbCriteriaGroup($dbCriteriaGroup = null, $comparison = null)
+ {
+ if (is_array($dbCriteriaGroup)) {
+ $useMinMax = false;
+ if (isset($dbCriteriaGroup['min'])) {
+ $this->addUsingAlias(CcBlockcriteriaPeer::CRITERIAGROUP, $dbCriteriaGroup['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($dbCriteriaGroup['max'])) {
+ $this->addUsingAlias(CcBlockcriteriaPeer::CRITERIAGROUP, $dbCriteriaGroup['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(CcBlockcriteriaPeer::CRITERIAGROUP, $dbCriteriaGroup, $comparison);
+ }
+
/**
* Filter the query on the block_id column
*
diff --git a/airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontents.php b/airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontents.php
index 1c634b382..b0552a756 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontents.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCcPlaylistcontents.php
@@ -74,7 +74,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
/**
* The value for the trackoffset field.
- * Note: this column has a database default value of: 0
+ * Note: this column has a database default value of: 0.0
* @var double
*/
protected $trackoffset;
@@ -161,7 +161,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
public function applyDefaultValues()
{
$this->type = 0;
- $this->trackoffset = 0;
+ $this->trackoffset = 0.0;
$this->cliplength = '00:00:00';
$this->cuein = '00:00:00';
$this->cueout = '00:00:00';
@@ -677,7 +677,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent
return false;
}
- if ($this->trackoffset !== 0) {
+ if ($this->trackoffset !== 0.0) {
return false;
}
diff --git a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodes.php b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodes.php
index e39015230..23e331847 100644
--- a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodes.php
+++ b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodes.php
@@ -65,6 +65,18 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
*/
protected $episode_guid;
+ /**
+ * The value for the episode_title field.
+ * @var string
+ */
+ protected $episode_title;
+
+ /**
+ * The value for the episode_description field.
+ * @var string
+ */
+ protected $episode_description;
+
/**
* @var CcFiles
*/
@@ -185,6 +197,28 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
return $this->episode_guid;
}
+ /**
+ * Get the [episode_title] column value.
+ *
+ * @return string
+ */
+ public function getDbEpisodeTitle()
+ {
+
+ return $this->episode_title;
+ }
+
+ /**
+ * Get the [episode_description] column value.
+ *
+ * @return string
+ */
+ public function getDbEpisodeDescription()
+ {
+
+ return $this->episode_description;
+ }
+
/**
* Set the value of [id] column.
*
@@ -321,6 +355,48 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
return $this;
} // setDbEpisodeGuid()
+ /**
+ * Set the value of [episode_title] column.
+ *
+ * @param string $v new value
+ * @return PodcastEpisodes The current object (for fluent API support)
+ */
+ public function setDbEpisodeTitle($v)
+ {
+ if ($v !== null && is_numeric($v)) {
+ $v = (string) $v;
+ }
+
+ if ($this->episode_title !== $v) {
+ $this->episode_title = $v;
+ $this->modifiedColumns[] = PodcastEpisodesPeer::EPISODE_TITLE;
+ }
+
+
+ return $this;
+ } // setDbEpisodeTitle()
+
+ /**
+ * Set the value of [episode_description] column.
+ *
+ * @param string $v new value
+ * @return PodcastEpisodes The current object (for fluent API support)
+ */
+ public function setDbEpisodeDescription($v)
+ {
+ if ($v !== null && is_numeric($v)) {
+ $v = (string) $v;
+ }
+
+ if ($this->episode_description !== $v) {
+ $this->episode_description = $v;
+ $this->modifiedColumns[] = PodcastEpisodesPeer::EPISODE_DESCRIPTION;
+ }
+
+
+ return $this;
+ } // setDbEpisodeDescription()
+
/**
* Indicates whether the columns in this object are only set to default values.
*
@@ -359,6 +435,8 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
$this->publication_date = ($row[$startcol + 3] !== null) ? (string) $row[$startcol + 3] : null;
$this->download_url = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null;
$this->episode_guid = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
+ $this->episode_title = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
+ $this->episode_description = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
$this->resetModified();
$this->setNew(false);
@@ -368,7 +446,7 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
}
$this->postHydrate($row, $startcol, $rehydrate);
- return $startcol + 6; // 6 = PodcastEpisodesPeer::NUM_HYDRATE_COLUMNS.
+ return $startcol + 8; // 8 = PodcastEpisodesPeer::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating PodcastEpisodes object", $e);
@@ -635,6 +713,12 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
if ($this->isColumnModified(PodcastEpisodesPeer::EPISODE_GUID)) {
$modifiedColumns[':p' . $index++] = '"episode_guid"';
}
+ if ($this->isColumnModified(PodcastEpisodesPeer::EPISODE_TITLE)) {
+ $modifiedColumns[':p' . $index++] = '"episode_title"';
+ }
+ if ($this->isColumnModified(PodcastEpisodesPeer::EPISODE_DESCRIPTION)) {
+ $modifiedColumns[':p' . $index++] = '"episode_description"';
+ }
$sql = sprintf(
'INSERT INTO "podcast_episodes" (%s) VALUES (%s)',
@@ -664,6 +748,12 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
case '"episode_guid"':
$stmt->bindValue($identifier, $this->episode_guid, PDO::PARAM_STR);
break;
+ case '"episode_title"':
+ $stmt->bindValue($identifier, $this->episode_title, PDO::PARAM_STR);
+ break;
+ case '"episode_description"':
+ $stmt->bindValue($identifier, $this->episode_description, PDO::PARAM_STR);
+ break;
}
}
$stmt->execute();
@@ -827,6 +917,12 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
case 5:
return $this->getDbEpisodeGuid();
break;
+ case 6:
+ return $this->getDbEpisodeTitle();
+ break;
+ case 7:
+ return $this->getDbEpisodeDescription();
+ break;
default:
return null;
break;
@@ -862,6 +958,8 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
$keys[3] => $this->getDbPublicationDate(),
$keys[4] => $this->getDbDownloadUrl(),
$keys[5] => $this->getDbEpisodeGuid(),
+ $keys[6] => $this->getDbEpisodeTitle(),
+ $keys[7] => $this->getDbEpisodeDescription(),
);
$virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) {
@@ -927,6 +1025,12 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
case 5:
$this->setDbEpisodeGuid($value);
break;
+ case 6:
+ $this->setDbEpisodeTitle($value);
+ break;
+ case 7:
+ $this->setDbEpisodeDescription($value);
+ break;
} // switch()
}
@@ -957,6 +1061,8 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
if (array_key_exists($keys[3], $arr)) $this->setDbPublicationDate($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setDbDownloadUrl($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setDbEpisodeGuid($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setDbEpisodeTitle($arr[$keys[6]]);
+ if (array_key_exists($keys[7], $arr)) $this->setDbEpisodeDescription($arr[$keys[7]]);
}
/**
@@ -974,6 +1080,8 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
if ($this->isColumnModified(PodcastEpisodesPeer::PUBLICATION_DATE)) $criteria->add(PodcastEpisodesPeer::PUBLICATION_DATE, $this->publication_date);
if ($this->isColumnModified(PodcastEpisodesPeer::DOWNLOAD_URL)) $criteria->add(PodcastEpisodesPeer::DOWNLOAD_URL, $this->download_url);
if ($this->isColumnModified(PodcastEpisodesPeer::EPISODE_GUID)) $criteria->add(PodcastEpisodesPeer::EPISODE_GUID, $this->episode_guid);
+ if ($this->isColumnModified(PodcastEpisodesPeer::EPISODE_TITLE)) $criteria->add(PodcastEpisodesPeer::EPISODE_TITLE, $this->episode_title);
+ if ($this->isColumnModified(PodcastEpisodesPeer::EPISODE_DESCRIPTION)) $criteria->add(PodcastEpisodesPeer::EPISODE_DESCRIPTION, $this->episode_description);
return $criteria;
}
@@ -1042,6 +1150,8 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
$copyObj->setDbPublicationDate($this->getDbPublicationDate());
$copyObj->setDbDownloadUrl($this->getDbDownloadUrl());
$copyObj->setDbEpisodeGuid($this->getDbEpisodeGuid());
+ $copyObj->setDbEpisodeTitle($this->getDbEpisodeTitle());
+ $copyObj->setDbEpisodeDescription($this->getDbEpisodeDescription());
if ($deepCopy && !$this->startCopy) {
// important: temporarily setNew(false) because this affects the behavior of
@@ -1215,6 +1325,8 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent
$this->publication_date = null;
$this->download_url = null;
$this->episode_guid = null;
+ $this->episode_title = null;
+ $this->episode_description = null;
$this->alreadyInSave = false;
$this->alreadyInValidation = false;
$this->alreadyInClearAllReferencesDeep = false;
diff --git a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesPeer.php b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesPeer.php
index 3415c9345..91fcbeee2 100644
--- a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesPeer.php
+++ b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesPeer.php
@@ -24,13 +24,13 @@ abstract class BasePodcastEpisodesPeer
const TM_CLASS = 'PodcastEpisodesTableMap';
/** The total number of columns. */
- const NUM_COLUMNS = 6;
+ const NUM_COLUMNS = 8;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
/** The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */
- const NUM_HYDRATE_COLUMNS = 6;
+ const NUM_HYDRATE_COLUMNS = 8;
/** the column name for the id field */
const ID = 'podcast_episodes.id';
@@ -50,6 +50,12 @@ abstract class BasePodcastEpisodesPeer
/** the column name for the episode_guid field */
const EPISODE_GUID = 'podcast_episodes.episode_guid';
+ /** the column name for the episode_title field */
+ const EPISODE_TITLE = 'podcast_episodes.episode_title';
+
+ /** the column name for the episode_description field */
+ const EPISODE_DESCRIPTION = 'podcast_episodes.episode_description';
+
/** The default string format for model objects of the related table **/
const DEFAULT_STRING_FORMAT = 'YAML';
@@ -69,12 +75,12 @@ abstract class BasePodcastEpisodesPeer
* e.g. PodcastEpisodesPeer::$fieldNames[PodcastEpisodesPeer::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('DbId', 'DbFileId', 'DbPodcastId', 'DbPublicationDate', 'DbDownloadUrl', 'DbEpisodeGuid', ),
- BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbFileId', 'dbPodcastId', 'dbPublicationDate', 'dbDownloadUrl', 'dbEpisodeGuid', ),
- BasePeer::TYPE_COLNAME => array (PodcastEpisodesPeer::ID, PodcastEpisodesPeer::FILE_ID, PodcastEpisodesPeer::PODCAST_ID, PodcastEpisodesPeer::PUBLICATION_DATE, PodcastEpisodesPeer::DOWNLOAD_URL, PodcastEpisodesPeer::EPISODE_GUID, ),
- BasePeer::TYPE_RAW_COLNAME => array ('ID', 'FILE_ID', 'PODCAST_ID', 'PUBLICATION_DATE', 'DOWNLOAD_URL', 'EPISODE_GUID', ),
- BasePeer::TYPE_FIELDNAME => array ('id', 'file_id', 'podcast_id', 'publication_date', 'download_url', 'episode_guid', ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, )
+ BasePeer::TYPE_PHPNAME => array ('DbId', 'DbFileId', 'DbPodcastId', 'DbPublicationDate', 'DbDownloadUrl', 'DbEpisodeGuid', 'DbEpisodeTitle', 'DbEpisodeDescription', ),
+ BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbFileId', 'dbPodcastId', 'dbPublicationDate', 'dbDownloadUrl', 'dbEpisodeGuid', 'dbEpisodeTitle', 'dbEpisodeDescription', ),
+ BasePeer::TYPE_COLNAME => array (PodcastEpisodesPeer::ID, PodcastEpisodesPeer::FILE_ID, PodcastEpisodesPeer::PODCAST_ID, PodcastEpisodesPeer::PUBLICATION_DATE, PodcastEpisodesPeer::DOWNLOAD_URL, PodcastEpisodesPeer::EPISODE_GUID, PodcastEpisodesPeer::EPISODE_TITLE, PodcastEpisodesPeer::EPISODE_DESCRIPTION, ),
+ BasePeer::TYPE_RAW_COLNAME => array ('ID', 'FILE_ID', 'PODCAST_ID', 'PUBLICATION_DATE', 'DOWNLOAD_URL', 'EPISODE_GUID', 'EPISODE_TITLE', 'EPISODE_DESCRIPTION', ),
+ BasePeer::TYPE_FIELDNAME => array ('id', 'file_id', 'podcast_id', 'publication_date', 'download_url', 'episode_guid', 'episode_title', 'episode_description', ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -84,12 +90,12 @@ abstract class BasePodcastEpisodesPeer
* e.g. PodcastEpisodesPeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbFileId' => 1, 'DbPodcastId' => 2, 'DbPublicationDate' => 3, 'DbDownloadUrl' => 4, 'DbEpisodeGuid' => 5, ),
- BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbFileId' => 1, 'dbPodcastId' => 2, 'dbPublicationDate' => 3, 'dbDownloadUrl' => 4, 'dbEpisodeGuid' => 5, ),
- BasePeer::TYPE_COLNAME => array (PodcastEpisodesPeer::ID => 0, PodcastEpisodesPeer::FILE_ID => 1, PodcastEpisodesPeer::PODCAST_ID => 2, PodcastEpisodesPeer::PUBLICATION_DATE => 3, PodcastEpisodesPeer::DOWNLOAD_URL => 4, PodcastEpisodesPeer::EPISODE_GUID => 5, ),
- BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'FILE_ID' => 1, 'PODCAST_ID' => 2, 'PUBLICATION_DATE' => 3, 'DOWNLOAD_URL' => 4, 'EPISODE_GUID' => 5, ),
- BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'file_id' => 1, 'podcast_id' => 2, 'publication_date' => 3, 'download_url' => 4, 'episode_guid' => 5, ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, )
+ BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbFileId' => 1, 'DbPodcastId' => 2, 'DbPublicationDate' => 3, 'DbDownloadUrl' => 4, 'DbEpisodeGuid' => 5, 'DbEpisodeTitle' => 6, 'DbEpisodeDescription' => 7, ),
+ BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbFileId' => 1, 'dbPodcastId' => 2, 'dbPublicationDate' => 3, 'dbDownloadUrl' => 4, 'dbEpisodeGuid' => 5, 'dbEpisodeTitle' => 6, 'dbEpisodeDescription' => 7, ),
+ BasePeer::TYPE_COLNAME => array (PodcastEpisodesPeer::ID => 0, PodcastEpisodesPeer::FILE_ID => 1, PodcastEpisodesPeer::PODCAST_ID => 2, PodcastEpisodesPeer::PUBLICATION_DATE => 3, PodcastEpisodesPeer::DOWNLOAD_URL => 4, PodcastEpisodesPeer::EPISODE_GUID => 5, PodcastEpisodesPeer::EPISODE_TITLE => 6, PodcastEpisodesPeer::EPISODE_DESCRIPTION => 7, ),
+ BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'FILE_ID' => 1, 'PODCAST_ID' => 2, 'PUBLICATION_DATE' => 3, 'DOWNLOAD_URL' => 4, 'EPISODE_GUID' => 5, 'EPISODE_TITLE' => 6, 'EPISODE_DESCRIPTION' => 7, ),
+ BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'file_id' => 1, 'podcast_id' => 2, 'publication_date' => 3, 'download_url' => 4, 'episode_guid' => 5, 'episode_title' => 6, 'episode_description' => 7, ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -169,6 +175,8 @@ abstract class BasePodcastEpisodesPeer
$criteria->addSelectColumn(PodcastEpisodesPeer::PUBLICATION_DATE);
$criteria->addSelectColumn(PodcastEpisodesPeer::DOWNLOAD_URL);
$criteria->addSelectColumn(PodcastEpisodesPeer::EPISODE_GUID);
+ $criteria->addSelectColumn(PodcastEpisodesPeer::EPISODE_TITLE);
+ $criteria->addSelectColumn(PodcastEpisodesPeer::EPISODE_DESCRIPTION);
} else {
$criteria->addSelectColumn($alias . '.id');
$criteria->addSelectColumn($alias . '.file_id');
@@ -176,6 +184,8 @@ abstract class BasePodcastEpisodesPeer
$criteria->addSelectColumn($alias . '.publication_date');
$criteria->addSelectColumn($alias . '.download_url');
$criteria->addSelectColumn($alias . '.episode_guid');
+ $criteria->addSelectColumn($alias . '.episode_title');
+ $criteria->addSelectColumn($alias . '.episode_description');
}
}
diff --git a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php
index fbf44a00f..f96d61b8d 100644
--- a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php
+++ b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php
@@ -12,6 +12,8 @@
* @method PodcastEpisodesQuery orderByDbPublicationDate($order = Criteria::ASC) Order by the publication_date column
* @method PodcastEpisodesQuery orderByDbDownloadUrl($order = Criteria::ASC) Order by the download_url column
* @method PodcastEpisodesQuery orderByDbEpisodeGuid($order = Criteria::ASC) Order by the episode_guid column
+ * @method PodcastEpisodesQuery orderByDbEpisodeTitle($order = Criteria::ASC) Order by the episode_title column
+ * @method PodcastEpisodesQuery orderByDbEpisodeDescription($order = Criteria::ASC) Order by the episode_description column
*
* @method PodcastEpisodesQuery groupByDbId() Group by the id column
* @method PodcastEpisodesQuery groupByDbFileId() Group by the file_id column
@@ -19,6 +21,8 @@
* @method PodcastEpisodesQuery groupByDbPublicationDate() Group by the publication_date column
* @method PodcastEpisodesQuery groupByDbDownloadUrl() Group by the download_url column
* @method PodcastEpisodesQuery groupByDbEpisodeGuid() Group by the episode_guid column
+ * @method PodcastEpisodesQuery groupByDbEpisodeTitle() Group by the episode_title column
+ * @method PodcastEpisodesQuery groupByDbEpisodeDescription() Group by the episode_description column
*
* @method PodcastEpisodesQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
* @method PodcastEpisodesQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@@ -40,6 +44,8 @@
* @method PodcastEpisodes findOneByDbPublicationDate(string $publication_date) Return the first PodcastEpisodes filtered by the publication_date column
* @method PodcastEpisodes findOneByDbDownloadUrl(string $download_url) Return the first PodcastEpisodes filtered by the download_url column
* @method PodcastEpisodes findOneByDbEpisodeGuid(string $episode_guid) Return the first PodcastEpisodes filtered by the episode_guid column
+ * @method PodcastEpisodes findOneByDbEpisodeTitle(string $episode_title) Return the first PodcastEpisodes filtered by the episode_title column
+ * @method PodcastEpisodes findOneByDbEpisodeDescription(string $episode_description) Return the first PodcastEpisodes filtered by the episode_description column
*
* @method array findByDbId(int $id) Return PodcastEpisodes objects filtered by the id column
* @method array findByDbFileId(int $file_id) Return PodcastEpisodes objects filtered by the file_id column
@@ -47,6 +53,8 @@
* @method array findByDbPublicationDate(string $publication_date) Return PodcastEpisodes objects filtered by the publication_date column
* @method array findByDbDownloadUrl(string $download_url) Return PodcastEpisodes objects filtered by the download_url column
* @method array findByDbEpisodeGuid(string $episode_guid) Return PodcastEpisodes objects filtered by the episode_guid column
+ * @method array findByDbEpisodeTitle(string $episode_title) Return PodcastEpisodes objects filtered by the episode_title column
+ * @method array findByDbEpisodeDescription(string $episode_description) Return PodcastEpisodes objects filtered by the episode_description column
*
* @package propel.generator.airtime.om
*/
@@ -154,7 +162,7 @@ abstract class BasePodcastEpisodesQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT "id", "file_id", "podcast_id", "publication_date", "download_url", "episode_guid" FROM "podcast_episodes" WHERE "id" = :p0';
+ $sql = 'SELECT "id", "file_id", "podcast_id", "publication_date", "download_url", "episode_guid", "episode_title", "episode_description" FROM "podcast_episodes" WHERE "id" = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -474,6 +482,64 @@ abstract class BasePodcastEpisodesQuery extends ModelCriteria
return $this->addUsingAlias(PodcastEpisodesPeer::EPISODE_GUID, $dbEpisodeGuid, $comparison);
}
+ /**
+ * Filter the query on the episode_title column
+ *
+ * Example usage:
+ *
+ * $query->filterByDbEpisodeTitle('fooValue'); // WHERE episode_title = 'fooValue'
+ * $query->filterByDbEpisodeTitle('%fooValue%'); // WHERE episode_title LIKE '%fooValue%'
+ *
+ *
+ * @param string $dbEpisodeTitle 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 PodcastEpisodesQuery The current query, for fluid interface
+ */
+ public function filterByDbEpisodeTitle($dbEpisodeTitle = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($dbEpisodeTitle)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $dbEpisodeTitle)) {
+ $dbEpisodeTitle = str_replace('*', '%', $dbEpisodeTitle);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(PodcastEpisodesPeer::EPISODE_TITLE, $dbEpisodeTitle, $comparison);
+ }
+
+ /**
+ * Filter the query on the episode_description column
+ *
+ * Example usage:
+ *
+ * $query->filterByDbEpisodeDescription('fooValue'); // WHERE episode_description = 'fooValue'
+ * $query->filterByDbEpisodeDescription('%fooValue%'); // WHERE episode_description LIKE '%fooValue%'
+ *
+ *
+ * @param string $dbEpisodeDescription 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 PodcastEpisodesQuery The current query, for fluid interface
+ */
+ public function filterByDbEpisodeDescription($dbEpisodeDescription = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($dbEpisodeDescription)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $dbEpisodeDescription)) {
+ $dbEpisodeDescription = str_replace('*', '%', $dbEpisodeDescription);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(PodcastEpisodesPeer::EPISODE_DESCRIPTION, $dbEpisodeDescription, $comparison);
+ }
+
/**
* Filter the query by a related CcFiles object
*
diff --git a/airtime_mvc/application/modules/rest/Bootstrap.php b/airtime_mvc/application/modules/rest/Bootstrap.php
index b8575a2cf..3ac5a1891 100644
--- a/airtime_mvc/application/modules/rest/Bootstrap.php
+++ b/airtime_mvc/application/modules/rest/Bootstrap.php
@@ -21,6 +21,17 @@ class Rest_Bootstrap extends Zend_Application_Module_Bootstrap
);
$router->addRoute('podcast-bulk', $podcastBulkRoute);
+
+ $smartblockPodcastRoute = new Zend_Controller_Router_Route(
+ 'rest/podcast/smartblock',
+ array(
+ 'controller' => 'podcast',
+ 'action' => 'smartblock',
+ 'module' => 'rest'
+ )
+ );
+ $router->addRoute('podcast-smartblock', $smartblockPodcastRoute);
+
$stationPodcastRoute = new Zend_Controller_Router_Route(
'rest/podcast/station',
array(
diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index 79208f56c..8444e1841 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -130,7 +130,8 @@ class Rest_MediaController extends Zend_Rest_Controller
try {
// REST uploads are not from Zend_Form, hence we handle them using Zend_File_transfer directly
- $upload = new Zend_File_Transfer();
+ // we need to specify an explicit adapter since autodetection broke in php 7.2
+ $upload = new Zend_File_Transfer('Zend_File_Transfer_Adapter_Http');
// this error should not really get hit, letting the user know if it does is nice for debugging
// see: https://github.com/LibreTime/libretime/issues/3#issuecomment-281143417
if (!$upload->isValid('file')) {
diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php
index f80b16c34..eb454cb94 100644
--- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php
+++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php
@@ -191,6 +191,26 @@ class Rest_PodcastController extends Zend_Rest_Controller
$this->_helper->json->sendJson($responseBody);
}
+
+ /**
+ * Endpoint for triggering the generation of a smartblock and playlist to match the podcast name
+ */
+
+ public function smartblockAction() {
+
+ $title = $this->_getParam('title', []);
+ $id = $this->_getParam('id', []);
+ if (!$id) {
+ return;
+ }
+ $podcast = Application_Service_PodcastService::getPodcastById($id);
+
+ // logging::info($podcast);
+ Application_Service_PodcastService::createPodcastSmartblockAndPlaylist($podcast, $title);
+ }
+
+
+
/**
* @throws PodcastNotFoundException
*
diff --git a/airtime_mvc/application/services/PodcastEpisodeService.php b/airtime_mvc/application/services/PodcastEpisodeService.php
index 124290ac2..c6b604563 100644
--- a/airtime_mvc/application/services/PodcastEpisodeService.php
+++ b/airtime_mvc/application/services/PodcastEpisodeService.php
@@ -46,7 +46,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
public function importEpisode($podcastId, $episode) {
$e = $this->addPlaceholder($podcastId, $episode);
$p = $e->getPodcast();
- $this->_download($e->getDbId(), $e->getDbDownloadUrl(), $p->getDbTitle(), $this->_getAlbumOverride($p));
+ $this->_download($e->getDbId(), $e->getDbDownloadUrl(), $p->getDbTitle(), $this->_getAlbumOverride($p), $episode["title"]);
return $e;
}
@@ -93,7 +93,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
// feed object, or whether it's passed in as json
$enclosure = $episode["enclosure"];
$url = $enclosure instanceof SimplePie_Enclosure ? $enclosure->get_link() : $enclosure["link"];
- return $this->_buildEpisode($podcastId, $url, $episode["guid"], $episode["pub_date"]);
+ return $this->_buildEpisode($podcastId, $url, $episode["guid"], $episode["pub_date"], $episode["title"], $episode["description"]);
}
/**
@@ -103,18 +103,22 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
* @param string $url the download URL for the episode
* @param string $guid the unique id for the episode. Often the same as the download URL
* @param string $publicationDate the publication date of the episode
+ * @param string $title the title of the episode
+ * @param string $description the description of the epsiode
*
* @return PodcastEpisodes the newly created PodcastEpisodes object
*
* @throws Exception
* @throws PropelException
*/
- private function _buildEpisode($podcastId, $url, $guid, $publicationDate) {
+ private function _buildEpisode($podcastId, $url, $guid, $publicationDate, $title, $description) {
$e = new PodcastEpisodes();
$e->setDbPodcastId($podcastId);
$e->setDbDownloadUrl($url);
$e->setDbEpisodeGuid($guid);
$e->setDbPublicationDate($publicationDate);
+ $e->setDbEpisodeTitle($title);
+ $e->setDbEpisodeDescription($description);
$e->save();
return $e;
}
@@ -128,7 +132,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
/** @var PodcastEpisodes $episode */
foreach($episodes as $episode) {
$podcast = $episode->getPodcast();
- $this->_download($episode->getDbId(), $episode->getDbDownloadUrl(), $podcast->getDbTitle(), $this->_getAlbumOverride($podcast));
+ $this->_download($episode->getDbId(), $episode->getDbDownloadUrl(), $podcast->getDbTitle(), $this->_getAlbumOverride($podcast), $episode->getDbEpisodeTitle());
}
}
@@ -158,7 +162,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
* @param string $title title of podcast to be downloaded - added as album to track metadata
* @param boolean $album_override should we override the album name when downloading
*/
- private function _download($id, $url, $title, $album_override) {
+ private function _download($id, $url, $title, $album_override, $track_title = null) {
$CC_CONFIG = Config::getConfig();
$stationUrl = Application_Common_HTTPHelper::getStationUrl();
$stationUrl .= substr($stationUrl, -1) == '/' ? '' : '/';
@@ -169,7 +173,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
'api_key' => $CC_CONFIG["apiKey"][0],
'podcast_name' => $title,
'album_override' => $album_override,
- );
+ 'track_title' => $track_title);
$task = $this->_executeTask(static::$_CELERY_TASKS[self::DOWNLOAD], $data);
// Get the created ThirdPartyTaskReference and set the episode ID so
// we can remove the placeholder if the import ends up stuck in a pending state
@@ -393,9 +397,47 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
foreach ($rss->get_items() as $item) {
/** @var SimplePie_Item $item */
// If the enclosure is empty or has not URL, this isn't a podcast episode (there's no audio data)
+ // technically podcasts shouldn't have multiple enclosures but often CMS add non-audio files
$enclosure = $item->get_enclosure();
$url = $enclosure instanceof SimplePie_Enclosure ? $enclosure->get_link() : $enclosure["link"];
- if (empty($url)) { continue; }
+ if (empty($url)) {
+ continue;
+ }
+ // next we check and see if the enclosure is not an audio file - this can happen from improperly
+ // formatted podcasts and we instead will search through the enclosures and see if there is an audio item
+ // then we pass that on, otherwise we just pass the first item since it is probably an audio file
+ elseif (!(substr($enclosure->get_type(), 0, 5) === 'audio')) {
+ // this is a rather hackish way of accessing the enclosures but get_enclosures() didnt detect multiple
+ // enclosures at certain points so we search through them and then manually create an enclosure object
+ // if we find an audio file in an enclosure and send it off
+ Logging::info('found a non audio');
+ $testenclosures = $enclosures = $item->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'enclosure');
+ Logging::info($testenclosures);
+ // we need to check if this is an array otherwise sizeof will fail and stop this whole script
+ if (is_array($testenclosures)) {
+ $numenclosures = sizeof($testenclosures);
+ // now we loop through and look for a audio file and then stop the loop at the first one we find
+ for ($i = 0; $i < $numenclosures + 1; $i++) {
+ $enclosure_attribs = array_values($testenclosures[$i]['attribs'])[0];
+ if (stripos($enclosure_attribs['type'], 'audio') !== false) {
+ $url = $enclosure_attribs['url'];
+ $enclosure = new SimplePie_Enclosure($enclosure_attribs['url'], $enclosure_attribs['type'], $length = $enclosure_attribs['length']);
+ break;
+ }
+ // if we didn't find an audio file we need to continue because there were no audio item enclosures
+ // so this should keep it from showing items without audio items on the episodes list
+ if ($i = $numenclosures) {
+ continue;
+ }
+ }
+ }
+ else {
+ continue;
+ }
+ } else {
+ $enclosure = $item->get_enclosure();
+ }
+ //Logging::info($enclosure);
$itemId = $item->get_id();
$ingested = in_array($itemId, $episodeIds) ? (empty($episodeFiles[$itemId]) ? -1 : 1) : 0;
$file = $ingested > 0 && !empty($episodeFiles[$itemId]) ?
@@ -415,12 +457,11 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
"author" => $this->_buildAuthorString($item),
"description" => htmlspecialchars($item->get_description()),
"pub_date" => $item->get_gmdate(),
- "link" => $item->get_link(),
- "enclosure" => $item->get_enclosure(),
+ "link" => $url,
+ "enclosure" => $enclosure,
"file" => $file
));
}
-
return $episodesArray;
}
diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php
index b9aecb389..8ea319772 100644
--- a/airtime_mvc/application/services/PodcastService.php
+++ b/airtime_mvc/application/services/PodcastService.php
@@ -162,49 +162,59 @@ class Application_Service_PodcastService
/**
* @param $podcast
+ * @param $title passed in directly from web UI input
* This will automatically create a smartblock and playlist for this podcast.
*/
- public static function createPodcastSmartblockAndPlaylist($podcast)
+ public static function createPodcastSmartblockAndPlaylist($podcast, $title = null)
{
- $newBl = new Application_Model_Block();
- $newBl->setCreator(Application_Model_User::getCurrentUser()->getId());
- $newBl->setName($podcast->getDbTitle());
- $newBl->setDescription('Auto-generated smartblock for podcast');
- $newBl->saveType('dynamic');
- // limit the smartblock to 1 item
- $row = new CcBlockcriteria();
- $row->setDbCriteria('limit');
- $row->setDbModifier('items');
- $row->setDbValue(1);
- $row->setDbBlockId($newBl->getId());
- $row->save();
-
- // sort so that it is the newest item
- $row = new CcBlockcriteria();
- $row->setDbCriteria('sort');
- $row->setDbModifier('N/A');
- $row->setDbValue('newest');
- $row->setDbBlockId($newBl->getId());
- $row->save();
-
- // match the track by ensuring the album title matches the podcast
- $row = new CcBlockcriteria();
- $row->setDbCriteria('album_title');
- $row->setDbModifier('is');
- $row->setDbValue($newBl->getName());
- $row->setDbBlockId($newBl->getId());
- $row->save();
-
- $newPl = new Application_Model_Playlist();
- $newPl->setName($podcast->getDbTitle());
- $newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
- $row = new CcPlaylistcontents();
- $row->setDbBlockId($newBl->getId());
- $row->setDbPlaylistId($newPl->getId());
- $row->setDbType(2);
- $row->save();
+ if (is_array($podcast)) {
+ $newpodcast = new Podcast();
+ $newpodcast->fromArray($podcast, BasePeer::TYPE_FIELDNAME);
+ $podcast = $newpodcast;
}
+ if ($title == null) {
+ $title = $podcast->getDbTitle();
+ }
+ // Base class
+ $newBl = new Application_Model_Block();
+ $newBl->setCreator(Application_Model_User::getCurrentUser()->getId());
+ $newBl->setName($title);
+ $newBl->setDescription('Auto-generated smartblock for podcast');
+ $newBl->saveType('dynamic');
+ // limit the smartblock to 1 item
+ $row = new CcBlockcriteria();
+ $row->setDbCriteria('limit');
+ $row->setDbModifier('items');
+ $row->setDbValue(1);
+ $row->setDbBlockId($newBl->getId());
+ $row->save();
+
+ // sort so that it is the newest item
+ $row = new CcBlockcriteria();
+ $row->setDbCriteria('sort');
+ $row->setDbModifier('N/A');
+ $row->setDbValue('newest');
+ $row->setDbBlockId($newBl->getId());
+ $row->save();
+
+ // match the track by ensuring the album title matches the podcast
+ $row = new CcBlockcriteria();
+ $row->setDbCriteria('album_title');
+ $row->setDbModifier('is');
+ $row->setDbValue($title);
+ $row->setDbBlockId($newBl->getId());
+ $row->save();
+
+ $newPl = new Application_Model_Playlist();
+ $newPl->setName($title);
+ $newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
+ $row = new CcPlaylistcontents();
+ $row->setDbBlockId($newBl->getId());
+ $row->setDbPlaylistId($newPl->getId());
+ $row->setDbType(2);
+ $row->save();
+ }
public static function createStationPodcast()
diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php
index e305ca228..110584874 100644
--- a/airtime_mvc/application/upgrade/Upgrades.php
+++ b/airtime_mvc/application/upgrade/Upgrades.php
@@ -532,3 +532,60 @@ class AirtimeUpgrader300alpha6 extends AirtimeUpgrader
return '3.0.0-alpha.6';
}
}
+/**
+ * Class AirtimeUpgrader300alpha7
+ *
+ * GH-#636 - https://github.com/LibreTime/libretime/pull/636 - Change dynamic smartblock to be default smartblock type
+ */
+
+
+class AirtimeUpgrader300alpha7 extends AirtimeUpgrader
+{
+ protected function getSupportedSchemaVersions() {
+ return array(
+ '3.0.0-alpha.6'
+ );
+ }
+ public function getNewVersion() {
+ return '3.0.0-alpha.7';
+ }
+
+}
+/**
+ * Class AirtimeUpgrader300alpha7-1
+ *
+ * GH-#659 - https://github.com/LibreTime/libretime/pull/659/ - Add description and title to podcast episodes database table
+ */
+
+
+class AirtimeUpgrader300alpha7_1 extends AirtimeUpgrader
+{
+ protected function getSupportedSchemaVersions() {
+ return array(
+ '3.0.0-alpha.7'
+ );
+ }
+ public function getNewVersion() {
+ return '3.0.0-alpha.7.1';
+ }
+
+}
+/**
+ * Class AirtimeUpgrader300alpha7-2
+ *
+ * GH-#704 - https://github.com/LibreTime/libretime/pull/704/ - Add criteria group to smartblock table to enable database to store separately
+ */
+
+
+
+class AirtimeUpgrader300alpha7_2 extends AirtimeUpgrader
+{
+ protected function getSupportedSchemaVersions() {
+ return array(
+ '3.0.0-alpha.7.1'
+ );
+ }
+ public function getNewVersion() {
+ return '3.0.0-alpha.7.2';
+ }
+}
diff --git a/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml b/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml
index 94538187c..ffbfacb48 100644
--- a/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml
+++ b/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml
@@ -13,12 +13,12 @@
Copy this code and paste it into your website's HTML to embed the weekly schedule in your site. diff --git a/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml b/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml index 5d5eda5f6..a694866a8 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml @@ -7,9 +7,11 @@
More information"); ?>