diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 775ceb36c..b3e2e8c45 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -38,6 +38,7 @@ class ApiController extends Zend_Controller_Action ->addActionContext('update-source-status' , 'json') ->addActionContext('get-bootstrap-info' , 'json') ->addActionContext('get-files-without-replay-gain' , 'json') + ->addActionContext('get-files-without-silan-value' , 'json') ->addActionContext('reload-metadata-group' , 'json') ->addActionContext('notify-webstream-data' , 'json') ->addActionContext('get-stream-parameters' , 'json') @@ -925,6 +926,18 @@ class ApiController extends Zend_Controller_Action echo json_encode($rows); } + + public function getFilesWithoutSilanValueAction() + { + // disable the view and the layout + $this->view->layout()->disableLayout(); + $this->_helper->viewRenderer->setNoRender(true); + + //connect to db and get get sql + $rows = Application_Model_StoredFile::getAllFilesWithoutSilan(); + + echo json_encode($rows); + } public function updateReplayGainValueAction() { @@ -943,6 +956,28 @@ class ApiController extends Zend_Controller_Action $file->save(); } } + + public function updateCueValuesBySilanAction() + { + // disable layout + $this->view->layout()->disableLayout(); + $this->_helper->viewRenderer->setNoRender(true); + + $request = $this->getRequest(); + $data = json_decode($request->getParam('data')); + Logging::info($data); + foreach ($data as $pair) { + list($id, $info) = $pair; + // TODO : move this code into model -- RG + $cuein = $info->cuein; + $cueout = $info->cueout; + $file = Application_Model_StoredFile::Recall($p_id = $id)->getPropelOrm(); + $file->setDbCuein($cuein); + $file->setDbCueout($cueout); + $file->setDbSilanCheck(true); + $file->save(); + } + } public function notifyWebstreamDataAction() { diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 68575f308..2b38349dd 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -190,7 +190,7 @@ class LibraryController extends Zend_Controller_Action $menu["edit"] = array("name"=> _("Edit Metadata"), "icon" => "edit", "url" => $baseUrl."library/edit-file-md/id/{$id}"); } - $url = $file->getRelativeFileUrl($baseUrl).'download/true'; + $url = $file->getRelativeFileUrl($baseUrl).'/download/true'; $menu["download"] = array("name" => _("Download"), "icon" => "download", "url" => $url); } elseif ($type === "playlist" || $type === "block") { if ($type === 'playlist') { @@ -498,10 +498,10 @@ class LibraryController extends Zend_Controller_Action $this->view->md = $md; if ($block->isStatic()) { - $this->view->blType = _('Static'); + $this->view->blType = 'Static'; $this->view->contents = $block->getContents(); } else { - $this->view->blType = _('Dynamic'); + $this->view->blType = 'Dynamic'; $this->view->contents = $block->getCriteria(); } $this->view->block = $block; diff --git a/airtime_mvc/application/models/Locale.php b/airtime_mvc/application/models/Locale.php index 43cde2568..de77b8c11 100644 --- a/airtime_mvc/application/models/Locale.php +++ b/airtime_mvc/application/models/Locale.php @@ -28,7 +28,7 @@ class Application_Model_Locale $res = setlocale(LC_MESSAGES, $lang); $domain = 'airtime'; - bindtextdomain($domain, '/usr/share/airtime/locale'); + bindtextdomain($domain, '../locale'); textdomain($domain); bind_textdomain_codeset($domain, $codeset); } diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index bbeacdfe3..bd50f2826 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -133,8 +133,12 @@ class Application_Model_StoredFile $track_length_in_sec = Application_Common_DateHelper::calculateLengthInSeconds($track_length); foreach ($p_md as $mdConst => $mdValue) { if (defined($mdConst)) { - if ($mdConst == "MDATA_KEY_CUE_OUT" && $mdValue == '0.0') { - $mdValue = $track_length_in_sec; + if ($mdConst == "MDATA_KEY_CUE_OUT") { + if ($mdValue == '0.0') { + $mdValue = $track_length_in_sec; + } else { + $this->_file->setDbSilanCheck(true)->save(); + } } $dbMd[constant($mdConst)] = $mdValue; @@ -1107,6 +1111,29 @@ SQL; return $rows; } + + public static function getAllFilesWithoutSilan() { + $con = Propel::getConnection(); + + $sql = <<prepare($sql); + + if ($stmt->execute()) { + $rows = $stmt->fetchAll(PDO::FETCH_ASSOC); + } else { + $msg = implode(',', $stmt->errorInfo()); + throw new Exception("Error: $msg"); + } + + return $rows; + } /* Gets number of tracks uploaded to * Soundcloud in the last 24 hours diff --git a/airtime_mvc/application/models/airtime/CcPlaylist.php b/airtime_mvc/application/models/airtime/CcPlaylist.php index c16ad2dea..d6cd550e1 100644 --- a/airtime_mvc/application/models/airtime/CcPlaylist.php +++ b/airtime_mvc/application/models/airtime/CcPlaylist.php @@ -91,13 +91,12 @@ class CcPlaylist extends BaseCcPlaylist { SELECT SUM(cliplength) FROM cc_playlistcontents as pc LEFT JOIN cc_files as f ON pc.file_id = f.id WHERE PLAYLIST_ID = :p1 - AND f.file_exists is NUll or f.file_exists = true + AND (f.file_exists is NUll or f.file_exists = true) SQL; $stmt = $con->prepare($sql); $stmt->bindValue(':p1', $this->getDbId()); $stmt->execute(); $length = $stmt->fetchColumn(); - if (is_null($length)) { $length = "00:00:00"; } diff --git a/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php b/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php index 8c810b098..46f79b71e 100644 --- a/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php @@ -104,6 +104,7 @@ class CcFilesTableMap extends TableMap { $this->addForeignKey('OWNER_ID', 'DbOwnerId', 'INTEGER', 'cc_subjs', 'ID', false, null, null); $this->addColumn('CUEIN', 'DbCuein', 'VARCHAR', false, null, '00:00:00'); $this->addColumn('CUEOUT', 'DbCueout', 'VARCHAR', false, null, '00:00:00'); + $this->addColumn('SILAN_CHECK', 'DbSilanCheck', 'BOOLEAN', false, null, false); $this->addColumn('HIDDEN', 'DbHidden', 'BOOLEAN', false, null, false); // validators } // initialize() diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php index 31eeb96a5..da3b2cc20 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php @@ -430,6 +430,13 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ protected $cueout; + /** + * The value for the silan_check field. + * Note: this column has a database default value of: false + * @var boolean + */ + protected $silan_check; + /** * The value for the hidden field. * Note: this column has a database default value of: false @@ -504,6 +511,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->file_exists = true; $this->cuein = '00:00:00'; $this->cueout = '00:00:00'; + $this->silan_check = false; $this->hidden = false; } @@ -1269,6 +1277,16 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this->cueout; } + /** + * Get the [silan_check] column value. + * + * @return boolean + */ + public function getDbSilanCheck() + { + return $this->silan_check; + } + /** * Get the [hidden] column value. * @@ -2727,6 +2745,26 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this; } // setDbCueout() + /** + * Set the value of [silan_check] column. + * + * @param boolean $v new value + * @return CcFiles The current object (for fluent API support) + */ + public function setDbSilanCheck($v) + { + if ($v !== null) { + $v = (boolean) $v; + } + + if ($this->silan_check !== $v || $this->isNew()) { + $this->silan_check = $v; + $this->modifiedColumns[] = CcFilesPeer::SILAN_CHECK; + } + + return $this; + } // setDbSilanCheck() + /** * Set the value of [hidden] column. * @@ -2797,6 +2835,10 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return false; } + if ($this->silan_check !== false) { + return false; + } + if ($this->hidden !== false) { return false; } @@ -2889,7 +2931,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->owner_id = ($row[$startcol + 63] !== null) ? (int) $row[$startcol + 63] : null; $this->cuein = ($row[$startcol + 64] !== null) ? (string) $row[$startcol + 64] : null; $this->cueout = ($row[$startcol + 65] !== null) ? (string) $row[$startcol + 65] : null; - $this->hidden = ($row[$startcol + 66] !== null) ? (boolean) $row[$startcol + 66] : null; + $this->silan_check = ($row[$startcol + 66] !== null) ? (boolean) $row[$startcol + 66] : null; + $this->hidden = ($row[$startcol + 67] !== null) ? (boolean) $row[$startcol + 67] : null; $this->resetModified(); $this->setNew(false); @@ -2898,7 +2941,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->ensureConsistency(); } - return $startcol + 67; // 67 = CcFilesPeer::NUM_COLUMNS - CcFilesPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 68; // 68 = CcFilesPeer::NUM_COLUMNS - CcFilesPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating CcFiles object", $e); @@ -3530,6 +3573,9 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this->getDbCueout(); break; case 66: + return $this->getDbSilanCheck(); + break; + case 67: return $this->getDbHidden(); break; default: @@ -3622,7 +3668,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $keys[63] => $this->getDbOwnerId(), $keys[64] => $this->getDbCuein(), $keys[65] => $this->getDbCueout(), - $keys[66] => $this->getDbHidden(), + $keys[66] => $this->getDbSilanCheck(), + $keys[67] => $this->getDbHidden(), ); if ($includeForeignObjects) { if (null !== $this->aFkOwner) { @@ -3864,6 +3911,9 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->setDbCueout($value); break; case 66: + $this->setDbSilanCheck($value); + break; + case 67: $this->setDbHidden($value); break; } // switch() @@ -3956,7 +4006,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent if (array_key_exists($keys[63], $arr)) $this->setDbOwnerId($arr[$keys[63]]); if (array_key_exists($keys[64], $arr)) $this->setDbCuein($arr[$keys[64]]); if (array_key_exists($keys[65], $arr)) $this->setDbCueout($arr[$keys[65]]); - if (array_key_exists($keys[66], $arr)) $this->setDbHidden($arr[$keys[66]]); + if (array_key_exists($keys[66], $arr)) $this->setDbSilanCheck($arr[$keys[66]]); + if (array_key_exists($keys[67], $arr)) $this->setDbHidden($arr[$keys[67]]); } /** @@ -4034,6 +4085,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent if ($this->isColumnModified(CcFilesPeer::OWNER_ID)) $criteria->add(CcFilesPeer::OWNER_ID, $this->owner_id); if ($this->isColumnModified(CcFilesPeer::CUEIN)) $criteria->add(CcFilesPeer::CUEIN, $this->cuein); if ($this->isColumnModified(CcFilesPeer::CUEOUT)) $criteria->add(CcFilesPeer::CUEOUT, $this->cueout); + if ($this->isColumnModified(CcFilesPeer::SILAN_CHECK)) $criteria->add(CcFilesPeer::SILAN_CHECK, $this->silan_check); if ($this->isColumnModified(CcFilesPeer::HIDDEN)) $criteria->add(CcFilesPeer::HIDDEN, $this->hidden); return $criteria; @@ -4161,6 +4213,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $copyObj->setDbOwnerId($this->owner_id); $copyObj->setDbCuein($this->cuein); $copyObj->setDbCueout($this->cueout); + $copyObj->setDbSilanCheck($this->silan_check); $copyObj->setDbHidden($this->hidden); if ($deepCopy) { @@ -5066,6 +5119,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->owner_id = null; $this->cuein = null; $this->cueout = null; + $this->silan_check = null; $this->hidden = null; $this->alreadyInSave = false; $this->alreadyInValidation = false; diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php index da22cce2a..714cec847 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php @@ -26,7 +26,7 @@ abstract class BaseCcFilesPeer { const TM_CLASS = 'CcFilesTableMap'; /** The total number of columns. */ - const NUM_COLUMNS = 67; + const NUM_COLUMNS = 68; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -229,6 +229,9 @@ abstract class BaseCcFilesPeer { /** the column name for the CUEOUT field */ const CUEOUT = 'cc_files.CUEOUT'; + /** the column name for the SILAN_CHECK field */ + const SILAN_CHECK = 'cc_files.SILAN_CHECK'; + /** the column name for the HIDDEN field */ const HIDDEN = 'cc_files.HIDDEN'; @@ -248,12 +251,12 @@ abstract class BaseCcFilesPeer { * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbMime', 'DbFtype', 'DbDirectory', 'DbFilepath', 'DbState', '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', 'DbHidden', ), - BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbMime', 'dbFtype', 'dbDirectory', 'dbFilepath', 'dbState', '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', 'dbHidden', ), - BasePeer::TYPE_COLNAME => array (self::ID, self::NAME, self::MIME, self::FTYPE, self::DIRECTORY, self::FILEPATH, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::UTIME, self::LPTIME, self::MD5, self::TRACK_TITLE, self::ARTIST_NAME, self::BIT_RATE, self::SAMPLE_RATE, self::FORMAT, self::LENGTH, self::ALBUM_TITLE, self::GENRE, self::COMMENTS, self::YEAR, self::TRACK_NUMBER, self::CHANNELS, self::URL, self::BPM, self::RATING, self::ENCODED_BY, self::DISC_NUMBER, self::MOOD, self::LABEL, self::COMPOSER, self::ENCODER, self::CHECKSUM, self::LYRICS, self::ORCHESTRA, self::CONDUCTOR, self::LYRICIST, self::ORIGINAL_LYRICIST, self::RADIO_STATION_NAME, self::INFO_URL, self::ARTIST_URL, self::AUDIO_SOURCE_URL, self::RADIO_STATION_URL, self::BUY_THIS_URL, self::ISRC_NUMBER, self::CATALOG_NUMBER, self::ORIGINAL_ARTIST, self::COPYRIGHT, self::REPORT_DATETIME, self::REPORT_LOCATION, self::REPORT_ORGANIZATION, self::SUBJECT, self::CONTRIBUTOR, self::LANGUAGE, self::FILE_EXISTS, self::SOUNDCLOUD_ID, self::SOUNDCLOUD_ERROR_CODE, self::SOUNDCLOUD_ERROR_MSG, self::SOUNDCLOUD_LINK_TO_FILE, self::SOUNDCLOUD_UPLOAD_TIME, self::REPLAY_GAIN, self::OWNER_ID, self::CUEIN, self::CUEOUT, self::HIDDEN, ), - BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'MIME', 'FTYPE', 'DIRECTORY', 'FILEPATH', 'STATE', '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', 'HIDDEN', ), - BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'mime', 'ftype', 'directory', 'filepath', 'state', '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', 'hidden', ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbMime', 'DbFtype', 'DbDirectory', 'DbFilepath', 'DbState', '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', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbMime', 'dbFtype', 'dbDirectory', 'dbFilepath', 'dbState', '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', ), + BasePeer::TYPE_COLNAME => array (self::ID, self::NAME, self::MIME, self::FTYPE, self::DIRECTORY, self::FILEPATH, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::UTIME, self::LPTIME, self::MD5, self::TRACK_TITLE, self::ARTIST_NAME, self::BIT_RATE, self::SAMPLE_RATE, self::FORMAT, self::LENGTH, self::ALBUM_TITLE, self::GENRE, self::COMMENTS, self::YEAR, self::TRACK_NUMBER, self::CHANNELS, self::URL, self::BPM, self::RATING, self::ENCODED_BY, self::DISC_NUMBER, self::MOOD, self::LABEL, self::COMPOSER, self::ENCODER, self::CHECKSUM, self::LYRICS, self::ORCHESTRA, self::CONDUCTOR, self::LYRICIST, self::ORIGINAL_LYRICIST, self::RADIO_STATION_NAME, self::INFO_URL, self::ARTIST_URL, self::AUDIO_SOURCE_URL, self::RADIO_STATION_URL, self::BUY_THIS_URL, self::ISRC_NUMBER, self::CATALOG_NUMBER, self::ORIGINAL_ARTIST, self::COPYRIGHT, self::REPORT_DATETIME, self::REPORT_LOCATION, self::REPORT_ORGANIZATION, self::SUBJECT, self::CONTRIBUTOR, self::LANGUAGE, self::FILE_EXISTS, self::SOUNDCLOUD_ID, self::SOUNDCLOUD_ERROR_CODE, self::SOUNDCLOUD_ERROR_MSG, self::SOUNDCLOUD_LINK_TO_FILE, self::SOUNDCLOUD_UPLOAD_TIME, self::REPLAY_GAIN, self::OWNER_ID, self::CUEIN, self::CUEOUT, self::SILAN_CHECK, self::HIDDEN, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'MIME', 'FTYPE', 'DIRECTORY', 'FILEPATH', 'STATE', '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', ), + BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'mime', 'ftype', 'directory', 'filepath', 'state', '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', ), + 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, ) ); /** @@ -263,12 +266,12 @@ abstract class BaseCcFilesPeer { * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbMime' => 2, 'DbFtype' => 3, 'DbDirectory' => 4, 'DbFilepath' => 5, 'DbState' => 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, 'DbHidden' => 66, ), - BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbMime' => 2, 'dbFtype' => 3, 'dbDirectory' => 4, 'dbFilepath' => 5, 'dbState' => 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, 'dbHidden' => 66, ), - BasePeer::TYPE_COLNAME => array (self::ID => 0, self::NAME => 1, self::MIME => 2, self::FTYPE => 3, self::DIRECTORY => 4, self::FILEPATH => 5, self::STATE => 6, self::CURRENTLYACCESSING => 7, self::EDITEDBY => 8, self::MTIME => 9, self::UTIME => 10, self::LPTIME => 11, self::MD5 => 12, self::TRACK_TITLE => 13, self::ARTIST_NAME => 14, self::BIT_RATE => 15, self::SAMPLE_RATE => 16, self::FORMAT => 17, self::LENGTH => 18, self::ALBUM_TITLE => 19, self::GENRE => 20, self::COMMENTS => 21, self::YEAR => 22, self::TRACK_NUMBER => 23, self::CHANNELS => 24, self::URL => 25, self::BPM => 26, self::RATING => 27, self::ENCODED_BY => 28, self::DISC_NUMBER => 29, self::MOOD => 30, self::LABEL => 31, self::COMPOSER => 32, self::ENCODER => 33, self::CHECKSUM => 34, self::LYRICS => 35, self::ORCHESTRA => 36, self::CONDUCTOR => 37, self::LYRICIST => 38, self::ORIGINAL_LYRICIST => 39, self::RADIO_STATION_NAME => 40, self::INFO_URL => 41, self::ARTIST_URL => 42, self::AUDIO_SOURCE_URL => 43, self::RADIO_STATION_URL => 44, self::BUY_THIS_URL => 45, self::ISRC_NUMBER => 46, self::CATALOG_NUMBER => 47, self::ORIGINAL_ARTIST => 48, self::COPYRIGHT => 49, self::REPORT_DATETIME => 50, self::REPORT_LOCATION => 51, self::REPORT_ORGANIZATION => 52, self::SUBJECT => 53, self::CONTRIBUTOR => 54, self::LANGUAGE => 55, self::FILE_EXISTS => 56, self::SOUNDCLOUD_ID => 57, self::SOUNDCLOUD_ERROR_CODE => 58, self::SOUNDCLOUD_ERROR_MSG => 59, self::SOUNDCLOUD_LINK_TO_FILE => 60, self::SOUNDCLOUD_UPLOAD_TIME => 61, self::REPLAY_GAIN => 62, self::OWNER_ID => 63, self::CUEIN => 64, self::CUEOUT => 65, self::HIDDEN => 66, ), - BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'MIME' => 2, 'FTYPE' => 3, 'DIRECTORY' => 4, 'FILEPATH' => 5, 'STATE' => 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, 'HIDDEN' => 66, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'mime' => 2, 'ftype' => 3, 'directory' => 4, 'filepath' => 5, 'state' => 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, 'hidden' => 66, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbMime' => 2, 'DbFtype' => 3, 'DbDirectory' => 4, 'DbFilepath' => 5, 'DbState' => 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, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbMime' => 2, 'dbFtype' => 3, 'dbDirectory' => 4, 'dbFilepath' => 5, 'dbState' => 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, ), + BasePeer::TYPE_COLNAME => array (self::ID => 0, self::NAME => 1, self::MIME => 2, self::FTYPE => 3, self::DIRECTORY => 4, self::FILEPATH => 5, self::STATE => 6, self::CURRENTLYACCESSING => 7, self::EDITEDBY => 8, self::MTIME => 9, self::UTIME => 10, self::LPTIME => 11, self::MD5 => 12, self::TRACK_TITLE => 13, self::ARTIST_NAME => 14, self::BIT_RATE => 15, self::SAMPLE_RATE => 16, self::FORMAT => 17, self::LENGTH => 18, self::ALBUM_TITLE => 19, self::GENRE => 20, self::COMMENTS => 21, self::YEAR => 22, self::TRACK_NUMBER => 23, self::CHANNELS => 24, self::URL => 25, self::BPM => 26, self::RATING => 27, self::ENCODED_BY => 28, self::DISC_NUMBER => 29, self::MOOD => 30, self::LABEL => 31, self::COMPOSER => 32, self::ENCODER => 33, self::CHECKSUM => 34, self::LYRICS => 35, self::ORCHESTRA => 36, self::CONDUCTOR => 37, self::LYRICIST => 38, self::ORIGINAL_LYRICIST => 39, self::RADIO_STATION_NAME => 40, self::INFO_URL => 41, self::ARTIST_URL => 42, self::AUDIO_SOURCE_URL => 43, self::RADIO_STATION_URL => 44, self::BUY_THIS_URL => 45, self::ISRC_NUMBER => 46, self::CATALOG_NUMBER => 47, self::ORIGINAL_ARTIST => 48, self::COPYRIGHT => 49, self::REPORT_DATETIME => 50, self::REPORT_LOCATION => 51, self::REPORT_ORGANIZATION => 52, self::SUBJECT => 53, self::CONTRIBUTOR => 54, self::LANGUAGE => 55, self::FILE_EXISTS => 56, self::SOUNDCLOUD_ID => 57, self::SOUNDCLOUD_ERROR_CODE => 58, self::SOUNDCLOUD_ERROR_MSG => 59, self::SOUNDCLOUD_LINK_TO_FILE => 60, self::SOUNDCLOUD_UPLOAD_TIME => 61, self::REPLAY_GAIN => 62, self::OWNER_ID => 63, self::CUEIN => 64, self::CUEOUT => 65, self::SILAN_CHECK => 66, self::HIDDEN => 67, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'MIME' => 2, 'FTYPE' => 3, 'DIRECTORY' => 4, 'FILEPATH' => 5, 'STATE' => 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, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'mime' => 2, 'ftype' => 3, 'directory' => 4, 'filepath' => 5, 'state' => 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, ), + 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, ) ); /** @@ -406,6 +409,7 @@ abstract class BaseCcFilesPeer { $criteria->addSelectColumn(CcFilesPeer::OWNER_ID); $criteria->addSelectColumn(CcFilesPeer::CUEIN); $criteria->addSelectColumn(CcFilesPeer::CUEOUT); + $criteria->addSelectColumn(CcFilesPeer::SILAN_CHECK); $criteria->addSelectColumn(CcFilesPeer::HIDDEN); } else { $criteria->addSelectColumn($alias . '.ID'); @@ -474,6 +478,7 @@ abstract class BaseCcFilesPeer { $criteria->addSelectColumn($alias . '.OWNER_ID'); $criteria->addSelectColumn($alias . '.CUEIN'); $criteria->addSelectColumn($alias . '.CUEOUT'); + $criteria->addSelectColumn($alias . '.SILAN_CHECK'); $criteria->addSelectColumn($alias . '.HIDDEN'); } } diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php index 074a7dc46..775895eb8 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php @@ -72,6 +72,7 @@ * @method CcFilesQuery orderByDbOwnerId($order = Criteria::ASC) Order by the owner_id column * @method CcFilesQuery orderByDbCuein($order = Criteria::ASC) Order by the cuein column * @method CcFilesQuery orderByDbCueout($order = Criteria::ASC) Order by the cueout column + * @method CcFilesQuery orderByDbSilanCheck($order = Criteria::ASC) Order by the silan_check column * @method CcFilesQuery orderByDbHidden($order = Criteria::ASC) Order by the hidden column * * @method CcFilesQuery groupByDbId() Group by the id column @@ -140,6 +141,7 @@ * @method CcFilesQuery groupByDbOwnerId() Group by the owner_id column * @method CcFilesQuery groupByDbCuein() Group by the cuein column * @method CcFilesQuery groupByDbCueout() Group by the cueout column + * @method CcFilesQuery groupByDbSilanCheck() Group by the silan_check column * @method CcFilesQuery groupByDbHidden() Group by the hidden column * * @method CcFilesQuery leftJoin($relation) Adds a LEFT JOIN clause to the query @@ -243,6 +245,7 @@ * @method CcFiles findOneByDbOwnerId(int $owner_id) Return the first CcFiles filtered by the owner_id column * @method CcFiles findOneByDbCuein(string $cuein) Return the first CcFiles filtered by the cuein column * @method CcFiles findOneByDbCueout(string $cueout) Return the first CcFiles filtered by the cueout column + * @method CcFiles findOneByDbSilanCheck(boolean $silan_check) Return the first CcFiles filtered by the silan_check column * @method CcFiles findOneByDbHidden(boolean $hidden) Return the first CcFiles filtered by the hidden column * * @method array findByDbId(int $id) Return CcFiles objects filtered by the id column @@ -311,6 +314,7 @@ * @method array findByDbOwnerId(int $owner_id) Return CcFiles objects filtered by the owner_id column * @method array findByDbCuein(string $cuein) Return CcFiles objects filtered by the cuein column * @method array findByDbCueout(string $cueout) Return CcFiles objects filtered by the cueout column + * @method array findByDbSilanCheck(boolean $silan_check) Return CcFiles objects filtered by the silan_check column * @method array findByDbHidden(boolean $hidden) Return CcFiles objects filtered by the hidden column * * @package propel.generator.airtime.om @@ -2007,6 +2011,23 @@ abstract class BaseCcFilesQuery extends ModelCriteria return $this->addUsingAlias(CcFilesPeer::CUEOUT, $dbCueout, $comparison); } + /** + * Filter the query on the silan_check column + * + * @param boolean|string $dbSilanCheck The value to use as filter. + * Accepts strings ('false', 'off', '-', 'no', 'n', and '0' are false, the rest is true) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CcFilesQuery The current query, for fluid interface + */ + public function filterByDbSilanCheck($dbSilanCheck = null, $comparison = null) + { + if (is_string($dbSilanCheck)) { + $silan_check = in_array(strtolower($dbSilanCheck), array('false', 'off', '-', 'no', 'n', '0')) ? false : true; + } + return $this->addUsingAlias(CcFilesPeer::SILAN_CHECK, $dbSilanCheck, $comparison); + } + /** * Filter the query on the hidden column * diff --git a/airtime_mvc/application/views/scripts/form/edit-user.phtml b/airtime_mvc/application/views/scripts/form/edit-user.phtml index 7f203035d..cd4b70bd9 100644 --- a/airtime_mvc/application/views/scripts/form/edit-user.phtml +++ b/airtime_mvc/application/views/scripts/form/edit-user.phtml @@ -157,7 +157,7 @@ - + \ No newline at end of file diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml index e2d02fd66..a67043b3a 100644 --- a/airtime_mvc/build/schema.xml +++ b/airtime_mvc/build/schema.xml @@ -78,6 +78,7 @@ + diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index b8e0cccde..ebd0d6c5b 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -96,6 +96,7 @@ CREATE TABLE "cc_files" "owner_id" INTEGER, "cuein" interval default '00:00:00', "cueout" interval default '00:00:00', + "silan_check" BOOLEAN default 'f', "hidden" BOOLEAN default 'f', PRIMARY KEY ("id") ); diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo index 509613a0b..d23b307da 100644 Binary files a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po index af455d532..cacc4f1bb 100644 --- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-15 10:36-0500\n" -"PO-Revision-Date: 2013-01-04 17:37+0100\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2013-01-18 10:51-0500\n" +"Last-Translator: Denise Rigato \n" "Language-Team: German Localization \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" #: airtime_mvc/application/configs/navigation.php:12 msgid "Now Playing" @@ -715,7 +715,7 @@ msgstr "'%value%' liegt nicht zwischen einschließlich '%min%' und '%max%'" #: airtime_mvc/application/forms/helpers/ValidationTypes.php:89 msgid "Passwords do not match" -msgstr "" +msgstr "Passwörter stimmen nicht überein" #: airtime_mvc/application/forms/AddShowRebroadcastDates.php:15 #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:6 @@ -844,7 +844,7 @@ msgstr "Passwort:" #: airtime_mvc/application/forms/AddUser.php:40 #: airtime_mvc/application/forms/EditUser.php:50 msgid "Verify Password:" -msgstr "" +msgstr "Passwort bestätigen" #: airtime_mvc/application/forms/AddUser.php:48 #: airtime_mvc/application/forms/EditUser.php:59 @@ -973,11 +973,11 @@ msgstr "Nutzername" #: airtime_mvc/application/forms/StreamSettingSubForm.php:195 msgid "Admin User" -msgstr "" +msgstr "Admin Nutzer" #: airtime_mvc/application/forms/StreamSettingSubForm.php:207 msgid "Admin Password" -msgstr "" +msgstr "Admin Passwort" #: airtime_mvc/application/forms/StreamSettingSubForm.php:218 #: airtime_mvc/application/controllers/LocaleController.php:173 @@ -1124,15 +1124,15 @@ msgstr "Name des Senders - Namen der Sendung" #: airtime_mvc/application/forms/StreamSetting.php:63 msgid "Off Air Metadata" -msgstr "" +msgstr "Off Air Metadaten" #: airtime_mvc/application/forms/StreamSetting.php:69 msgid "Enable Replay Gain" -msgstr "" +msgstr "Replay Gain ermöglichen" #: airtime_mvc/application/forms/StreamSetting.php:75 msgid "Replay Gain Modifier" -msgstr "" +msgstr "Replay Gain Modifier" #: airtime_mvc/application/forms/PasswordRestore.php:14 msgid "E-mail" @@ -1434,7 +1434,7 @@ msgstr "Alle meine Sendungen:" #: airtime_mvc/application/forms/EditUser.php:118 msgid "Timezone:" -msgstr "" +msgstr "Zeitzone:" #: airtime_mvc/application/forms/AddShowLiveStream.php:10 msgid "Use Airtime Authentication:" @@ -1483,11 +1483,11 @@ msgstr "Aktiviert" #: airtime_mvc/application/forms/GeneralPreferences.php:56 msgid "Default Interface Language" -msgstr "" +msgstr "Standard Interface Sprache" #: airtime_mvc/application/forms/GeneralPreferences.php:64 msgid "Default Interface Timezone" -msgstr "" +msgstr "Standard Interface Zeitzone" #: airtime_mvc/application/forms/GeneralPreferences.php:72 msgid "Week Starts On" @@ -1721,7 +1721,7 @@ msgstr "Benutzer erfolgreich aktualisiert!" #: airtime_mvc/application/controllers/UserController.php:164 msgid "Settings updated successfully!" -msgstr "" +msgstr "Einstellungen erfolgreich aktualisiert!" #: airtime_mvc/application/controllers/LocaleController.php:36 msgid "Recording:" @@ -1795,7 +1795,7 @@ msgstr "Sie können zu Playlisten nur Tracks, Smart Blocks und Webstreams hinzu #: airtime_mvc/application/controllers/LocaleController.php:57 msgid "Please select a cursor position on timeline." -msgstr "" +msgstr "Positionieren Sie bitte den Mauszeiger auf der Timeline" #: airtime_mvc/application/controllers/LocaleController.php:61 #: airtime_mvc/application/controllers/LibraryController.php:190 @@ -1939,7 +1939,7 @@ msgstr "Playlist gespeichert" #: airtime_mvc/application/controllers/LocaleController.php:121 msgid "Playlist shuffled" -msgstr "" +msgstr "Playliste geshuffelt" #: airtime_mvc/application/controllers/LocaleController.php:123 msgid "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore." @@ -2002,12 +2002,12 @@ msgstr "Wiedergegeben" #: airtime_mvc/application/controllers/LocaleController.php:160 #, php-format msgid "Copied %s row%s to the clipboard" -msgstr "" +msgstr " %s Reihe%s zum Clipboard kopiert" #: airtime_mvc/application/controllers/LocaleController.php:161 #, php-format msgid "%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished." -msgstr "" +msgstr "%sDruckansicht%sBenutzen Sie bitte die Druckfunktion des Browsers, um diese Tabelle auszudrucken. Wenn Sie fertig sind, klicken Sie auf Escape." #: airtime_mvc/application/controllers/LocaleController.php:163 msgid "Choose Storage Folder" @@ -2086,7 +2086,7 @@ msgstr "Wenn Sie den Benutzernamen oder das Passwort für einen aktivierten Stre #: airtime_mvc/application/controllers/LocaleController.php:186 msgid "This is the admin username and password for Icecast/SHOUTcast to get listener statistics." -msgstr "" +msgstr "Das sind Admin Nutzername und Password für Icecast/SHOUTcast um Hörerstatistiken zu erhalten." #: airtime_mvc/application/controllers/LocaleController.php:190 msgid "No result found" @@ -2146,7 +2146,7 @@ msgstr "Für diese Sendung sind keine Inhalte programmiert." #: airtime_mvc/application/controllers/LocaleController.php:214 msgid "This show is not completely filled with content." -msgstr "" +msgstr "Die Sendung ist vollständig mit Inhalt gefüllt." #: airtime_mvc/application/controllers/LocaleController.php:218 msgid "January" @@ -2388,79 +2388,79 @@ msgstr "Öffnen" #: airtime_mvc/application/controllers/LocaleController.php:317 msgid "Guests can do the following:" -msgstr "" +msgstr "Gäste können folgendes tun:" #: airtime_mvc/application/controllers/LocaleController.php:318 msgid "View schedule" -msgstr "" +msgstr "Zeitplan ansehen" #: airtime_mvc/application/controllers/LocaleController.php:319 msgid "View show content" -msgstr "" +msgstr "Inhalt der Sendung ansehen" #: airtime_mvc/application/controllers/LocaleController.php:320 msgid "DJs can do the following:" -msgstr "" +msgstr "DJs können folgendes tun:" #: airtime_mvc/application/controllers/LocaleController.php:321 msgid "Manage assigned show content" -msgstr "" +msgstr "Zugeordneten Inhalt der Sendung verwalten" #: airtime_mvc/application/controllers/LocaleController.php:322 msgid "Import media files" -msgstr "" +msgstr "Mediadateien importieren" #: airtime_mvc/application/controllers/LocaleController.php:323 msgid "Create playlists, smart blocks, and webstreams" -msgstr "" +msgstr "Playlisten, Smart Blocks und Webstreams anlegen" #: airtime_mvc/application/controllers/LocaleController.php:324 msgid "Manage their own library content" -msgstr "" +msgstr "Inhalt der eigenen Library verwalten" #: airtime_mvc/application/controllers/LocaleController.php:325 msgid "Progam Managers can do the following:" -msgstr "" +msgstr "Programm-Manager können folgendes tun:" #: airtime_mvc/application/controllers/LocaleController.php:326 msgid "View and manage show content" -msgstr "" +msgstr "Inhalt einer Sendung sehen und verwalten" #: airtime_mvc/application/controllers/LocaleController.php:327 msgid "Schedule shows" -msgstr "" +msgstr "Sendungen programmieren" #: airtime_mvc/application/controllers/LocaleController.php:328 msgid "Manage all library content" -msgstr "" +msgstr "Gesamten Inhalt der Library verwalten" #: airtime_mvc/application/controllers/LocaleController.php:329 msgid "Admins can do the following:" -msgstr "" +msgstr "Admins können folgendes tun:" #: airtime_mvc/application/controllers/LocaleController.php:330 msgid "Manage preferences" -msgstr "" +msgstr "Einstellungen verwalten" #: airtime_mvc/application/controllers/LocaleController.php:331 msgid "Manage users" -msgstr "" +msgstr "Nutzer verwalten" #: airtime_mvc/application/controllers/LocaleController.php:332 msgid "Manage watched folders" -msgstr "" +msgstr "Gesehene Ordner verwalten" #: airtime_mvc/application/controllers/LocaleController.php:334 msgid "View system status" -msgstr "" +msgstr "Systemstatus sehen" #: airtime_mvc/application/controllers/LocaleController.php:335 msgid "Access playout history" -msgstr "" +msgstr "Auf Playout History zugreifen" #: airtime_mvc/application/controllers/LocaleController.php:336 msgid "View listener stats" -msgstr "" +msgstr "Hörerstatistiken sehen" #: airtime_mvc/application/controllers/LocaleController.php:338 msgid "Show / hide columns" @@ -2534,99 +2534,99 @@ msgstr "Fertig" #: airtime_mvc/application/controllers/LocaleController.php:361 msgid "Select files" -msgstr "" +msgstr "Dateien auswählen" #: airtime_mvc/application/controllers/LocaleController.php:362 #: airtime_mvc/application/controllers/LocaleController.php:363 msgid "Add files to the upload queue and click the start button." -msgstr "" +msgstr "Dateien zu Uploadliste hinzufügen und den Startbutton klicken" #: airtime_mvc/application/controllers/LocaleController.php:366 msgid "Add Files" -msgstr "" +msgstr "Dateien hinzufügen" #: airtime_mvc/application/controllers/LocaleController.php:367 msgid "Stop Upload" -msgstr "" +msgstr "Upload stoppen" #: airtime_mvc/application/controllers/LocaleController.php:368 msgid "Start upload" -msgstr "" +msgstr "Upload starten" #: airtime_mvc/application/controllers/LocaleController.php:369 msgid "Add files" -msgstr "" +msgstr "Dateien hinzufügen" #: airtime_mvc/application/controllers/LocaleController.php:370 #, php-format msgid "Uploaded %d/%d files" -msgstr "" +msgstr "%d/%d Dateien hochgeladen" #: airtime_mvc/application/controllers/LocaleController.php:371 msgid "N/A" -msgstr "" +msgstr "N/A" #: airtime_mvc/application/controllers/LocaleController.php:372 msgid "Drag files here." -msgstr "" +msgstr "Dateien hierhin ziehen" #: airtime_mvc/application/controllers/LocaleController.php:373 msgid "File extension error." -msgstr "" +msgstr "Fehler in der Dateierweiterung." #: airtime_mvc/application/controllers/LocaleController.php:374 msgid "File size error." -msgstr "" +msgstr "Fehler in der Dateigröße." #: airtime_mvc/application/controllers/LocaleController.php:375 msgid "File count error." -msgstr "" +msgstr "Fehler in der Dateizählung" #: airtime_mvc/application/controllers/LocaleController.php:376 msgid "Init error." -msgstr "" +msgstr "Init Fehler." #: airtime_mvc/application/controllers/LocaleController.php:377 msgid "HTTP Error." -msgstr "" +msgstr "HTTP Fehler." #: airtime_mvc/application/controllers/LocaleController.php:378 msgid "Security error." -msgstr "" +msgstr "Sicherheitsfehler." #: airtime_mvc/application/controllers/LocaleController.php:379 msgid "Generic error." -msgstr "" +msgstr "Generischer Fehler." #: airtime_mvc/application/controllers/LocaleController.php:380 msgid "IO error." -msgstr "" +msgstr "IO Fehler." #: airtime_mvc/application/controllers/LocaleController.php:381 #, php-format msgid "File: %s" -msgstr "" +msgstr "Datei: %s" #: airtime_mvc/application/controllers/LocaleController.php:383 #, php-format msgid "%d files queued" -msgstr "" +msgstr "%d Dateien aufgereiht" #: airtime_mvc/application/controllers/LocaleController.php:384 msgid "File: %f, size: %s, max file size: %m" -msgstr "" +msgstr "Datei: %f, Größe: %s, max. Dateigröße: %m" #: airtime_mvc/application/controllers/LocaleController.php:385 msgid "Upload URL might be wrong or doesn't exist" -msgstr "" +msgstr "Die Upload-URL ist falsch oder existiert nicht" #: airtime_mvc/application/controllers/LocaleController.php:386 msgid "Error: File too large: " -msgstr "" +msgstr "Fehler: Datei zu groß" #: airtime_mvc/application/controllers/LocaleController.php:387 msgid "Error: Invalid file extension: " -msgstr "" +msgstr "Fehler: ungültige Dateierweiterung" #: airtime_mvc/application/controllers/ShowbuilderController.php:190 #: airtime_mvc/application/controllers/LibraryController.php:161 @@ -2659,7 +2659,7 @@ msgstr "Sendung existiert nicht" #: airtime_mvc/application/controllers/ListenerstatController.php:56 msgid "Please make sure admin user/password is correct on System->Streams page." -msgstr "" +msgstr "Bitte prüfen Sie, ob Admin Nutzer/Password auf System->Stream Seite korrekt ist." #: airtime_mvc/application/controllers/ApiController.php:57 #: airtime_mvc/application/controllers/ApiController.php:84 @@ -2719,7 +2719,7 @@ msgstr "Download" #: airtime_mvc/application/controllers/LibraryController.php:198 msgid "Duplicate Playlist" -msgstr "" +msgstr "Duplizierte Playlist" #: airtime_mvc/application/controllers/LibraryController.php:213 #: airtime_mvc/application/controllers/LibraryController.php:235 @@ -2760,7 +2760,7 @@ msgstr "Einige programmierte Dateien konnten nicht gelöscht werden." #: airtime_mvc/application/controllers/LibraryController.php:375 #, php-format msgid "Copy of %s" -msgstr "" +msgstr "Kopie von %s" #: airtime_mvc/application/controllers/PlaylistController.php:45 #, php-format @@ -2928,7 +2928,7 @@ msgstr "%sSourcefabric%s o.p.s. Airtime wird vertrieben unter %s GNU GPL v.3 %s #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:3 msgid "Share" -msgstr "" +msgstr "Teilen" #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:64 msgid "Select stream:" @@ -3374,7 +3374,7 @@ msgstr "Anschluß URL für die Quelle der Sendung:" #: airtime_mvc/application/views/scripts/form/edit-user.phtml:1 #, php-format msgid "%s's Settings" -msgstr "" +msgstr "%s's Einstellungen" #: airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml:4 msgid "Repeat Days:" @@ -3451,7 +3451,7 @@ msgstr "Globale Einstellungen" #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88 msgid "dB" -msgstr "" +msgstr "dB" #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107 msgid "Output Stream Settings" @@ -3474,7 +3474,7 @@ msgstr "ISRC-Nummer:" #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:21 msgid "File Path:" -msgstr "" +msgstr "Dateipfad:" #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:39 msgid "Web Stream" diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo index 29af9bc07..52cc736dc 100644 Binary files a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po index 78d0b0bb8..e79a17573 100644 --- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-15 10:36-0500\n" -"PO-Revision-Date: 2013-01-04 17:49+0100\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2013-01-17 14:46-0500\n" +"Last-Translator: Denise Rigato \n" "Language-Team: Russian Localization \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" @@ -2885,7 +2885,7 @@ msgstr "Время станции" #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:3 msgid "Your trial expires in" -msgstr "Ваш испытательный период истекает через" +msgstr "лизензия истекает через" #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9 msgid "Purchase your copy of Airtime" diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b763d2720..bd42e4da6 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2978,6 +2978,7 @@ dd .stream-status { float: left; margin-top: 4px; margin-left: 2px; + clear: left; } .edit-user-global dd { diff --git a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql index fcfa4b935..e878b60bc 100644 --- a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql @@ -1,6 +1,13 @@ DELETE FROM cc_pref WHERE keystr = 'system_version'; INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.3.0'); +INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('off_air_meta', 'Airtime - offline', 'string'); +INSERT INTO cc_pref("keystr", "valstr") VALUES('enable_replay_gain', 1); + +--Make sure that cc_music_dir has a trailing '/' and cc_files does not have a leading '/' +UPDATE cc_music_dir SET directory = directory || '/' where id in (select id from cc_music_dirs where substr(directory, length(directory)) != '/'); +UPDATE cc_files SET filepath = substring(filepath from 2) where id in (select id from cc_files where substring(filepath from 1 for 1) = '/') + CREATE SEQUENCE cc_listener_count_id_seq START WITH 1 INCREMENT BY 1 @@ -55,6 +62,7 @@ CREATE TABLE cc_timestamp ( ALTER TABLE cc_files ADD COLUMN cuein interval DEFAULT '00:00:00'::interval, ADD COLUMN cueout interval DEFAULT '00:00:00'::interval, + ADD COLUMN silan_check boolean DEFAULT false, ADD COLUMN hidden boolean DEFAULT false; ALTER TABLE cc_listener_count @@ -75,3 +83,15 @@ ALTER TABLE cc_listener_count ALTER TABLE cc_listener_count ADD CONSTRAINT cc_timestamp_inst_fkey FOREIGN KEY (timestamp_id) REFERENCES cc_timestamp(id) ON DELETE CASCADE; +INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA'); + +INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA'); + +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ko_KR', '한국어'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español'); +INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文'); diff --git a/python_apps/api_clients/api_client.cfg b/python_apps/api_clients/api_client.cfg index 10d091b77..d9a67b608 100644 --- a/python_apps/api_clients/api_client.cfg +++ b/python_apps/api_clients/api_client.cfg @@ -126,3 +126,7 @@ get_stream_parameters = 'get-stream-parameters/api_key/%%api_key%%/format/json' push_stream_stats = 'push-stream-stats/api_key/%%api_key%%/format/json' update_stream_setting_table = 'update-stream-setting-table/api_key/%%api_key%%/format/json' + +get_files_without_silan_value = 'get-files-without-silan-value/api_key/%%api_key%%' + +update_cue_values_by_silan = 'update-cue-values-by-silan/api_key/%%api_key%%' diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index 2e0e65f68..048da729c 100644 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -356,6 +356,14 @@ class AirtimeApiClient(object): """ #http://localhost/api/get-files-without-replay-gain/dir_id/1 return self.services.get_files_without_replay_gain(dir_id=dir_id) + + def get_files_without_silan_value(self): + """ + Download a list of files that need to have their cue in/out value + calculated. This list of files is downloaded into a file and the path + to this file is the return value. + """ + return self.services.get_files_without_silan_value() def update_replay_gain_values(self, pairs): """ @@ -364,6 +372,13 @@ class AirtimeApiClient(object): """ self.logger.debug(self.services.update_replay_gain_value( _post_data={'data': json.dumps(pairs)})) + + def update_cue_values_by_silan(self, pairs): + """ + 'pairs' is a list of pairs in (x, y), where x is the file's database + row id and y is the file's cue values in dB + """ + print self.services.update_cue_values_by_silan(_post_data={'data': json.dumps(pairs)}) def notify_webstream_data(self, data, media_id): diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php index 237bf7011..a780b1243 100644 --- a/utils/airtime-check-system.php +++ b/utils/airtime-check-system.php @@ -106,8 +106,11 @@ class AirtimeCheck { } public static function GetStatus($p_baseUrl, $p_basePort, $p_baseDir, $p_apiKey){ - - $url = "http://$p_baseUrl:$p_basePort/$p_baseDir/api/status/format/json/api_key/%%api_key%%"; + if ($p_baseDir == '/') { + $url = "http://$p_baseUrl:$p_basePort/api/status/format/json/api_key/%%api_key%%"; + } else { + $url = "http://$p_baseUrl:$p_basePort/$p_baseDir"."api/status/format/json/api_key/%%api_key%%"; + } self::output_status("AIRTIME_STATUS_URL", $url); $url = str_replace("%%api_key%%", $p_apiKey, $url); diff --git a/utils/airtime-silan/airtime-silan b/utils/airtime-silan/airtime-silan new file mode 100755 index 000000000..be88f8954 --- /dev/null +++ b/utils/airtime-silan/airtime-silan @@ -0,0 +1,22 @@ +#!/bin/bash + +virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" +. ${virtualenv_bin}activate + +invokePwd=$PWD + +#airtime_silan_path="/usr/lib/airtime/utils/airtime-silan/" +airtime_silan_path="/home/james/src/airtime/utils/airtime-silan/" +airtime_silan_script="airtime-silan.py" + +api_client_path="/usr/lib/airtime/" +cd ${airtime_silan_path} + +exec 2>&1 + +export PYTHONPATH=${api_client_path} + +# Note the -u when calling python! we need it to get unbuffered binary stdout and stderr +exec python -u ${airtime_silan_path}${airtime_silan_script} --dir "$invokePwd" "$@" + +# EOF diff --git a/utils/airtime-silan/airtime-silan.py b/utils/airtime-silan/airtime-silan.py new file mode 100644 index 000000000..d5f691698 --- /dev/null +++ b/utils/airtime-silan/airtime-silan.py @@ -0,0 +1,81 @@ +import logging +from api_clients import api_client as apc +import json +import shutil +import commands +import os +import sys +from configobj import ConfigObj +import subprocess +import traceback + +# create logger +logger = logging.getLogger() + +# no logging +ch = logging.StreamHandler() +logging.disable(50) + +# add ch to logger +logger.addHandler(ch) + +if (os.geteuid() != 0): + print 'Must be a root user.' + sys.exit() + +# loading config file +try: + config = ConfigObj('/etc/airtime/media-monitor.cfg') +except Exception, e: + print('Error loading config file: %s', e) + sys.exit() + +api_client = apc.AirtimeApiClient(config) + +try: + # keep getting few rows at a time for current music_dir (stor + # or watched folder). + subtotal = 0 + while True: + # return a list of pairs where the first value is the + # file's database row id and the second value is the + # filepath + files = api_client.get_files_without_silan_value() + total_files = len(files) + if total_files == 0: break + processed_data = [] + total = 0 + for f in files: + full_path = f['fp'] + # silence detect(set default queue in and out) + try: + command = ['silan', '-f', 'JSON', full_path] + proc = subprocess.Popen(command, stdout=subprocess.PIPE) + out = proc.stdout.read() + info = json.loads(out) + data = {} + data['cuein'] = str('{0:f}'.format(info['sound'][0][0])) + data['cueout'] = str('{0:f}'.format(info['sound'][-1][1])) + processed_data.append((f['id'], data)) + total += 1 + if (total % 5 == 0): + print "Total %s / %s files has been processed.." % (total, total_files) + except Exception, e: + print e + print traceback.format_exc() + break + print "Processed: %d songs" % total + subtotal += total + total = 0 + try: + api_client.update_cue_values_by_silan(processed_data) + except Exception ,e: + print e + print traceback.format_exc() + print "Total %d songs Processed" % subtotal + +except Exception, e: + print e + print traceback.format_exc() + +#update_cue_values_by_silan