From bb2f9316af0aff7ed6698703316420cf76b1c132 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 15 Jan 2013 11:16:50 -0500 Subject: [PATCH 01/15] CC-4841: Silan script - temp commit --- airtime_mvc/application/models/StoredFile.php | 8 ++- .../models/airtime/map/CcFilesTableMap.php | 1 + .../models/airtime/om/BaseCcFiles.php | 62 +++++++++++++++++-- .../models/airtime/om/BaseCcFilesPeer.php | 31 ++++++---- .../models/airtime/om/BaseCcFilesQuery.php | 21 +++++++ airtime_mvc/build/schema.xml | 1 + airtime_mvc/build/sql/schema.sql | 1 + 7 files changed, 106 insertions(+), 19 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index bbeacdfe3..3fac651e5 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; 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/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") ); From 0f9e870d87d6ef3143a8a1019d1210a7793e95c5 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 11:07:52 -0500 Subject: [PATCH 02/15] Upgrade script missing cc_stream_setting->off_air_meta and cc_pref->enable_replay_gain --- install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql | 3 +++ 1 file changed, 3 insertions(+) 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..b5f1622ef 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,9 @@ 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); + CREATE SEQUENCE cc_listener_count_id_seq START WITH 1 INCREMENT BY 1 From 1604e4a31c457ebc8461271b9eee70bb0b10880e Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 11:13:46 -0500 Subject: [PATCH 03/15] Added locales and default locale settings to upgrade script --- .../upgrades/airtime-2.3.0/data/upgrade.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 b5f1622ef..f42d57cd2 100644 --- a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql @@ -78,3 +78,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', '简体中文'); From 796099b4130d8764355169aacc98144a5caf3034 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 13:37:32 -0500 Subject: [PATCH 04/15] CC-4860: Library -> Context Menu -> Can't download files -fixed --- airtime_mvc/application/controllers/LibraryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 68575f308..69d94e6a3 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') { From afaecbc24ae58d746d49a69490992e79672c21c7 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 13:58:43 -0500 Subject: [PATCH 05/15] CC-4861: airtime-check-system AIRTIME_STATUS_URL isn't formatted properly -fixed --- utils/airtime-check-system.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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); From 57629b4eac74566e5f021b07dbed0828c8ba6647 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 14:31:40 -0500 Subject: [PATCH 06/15] Changed path to locale directory from absolute to relative --- airtime_mvc/application/models/Locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } From 6acc5696f99f480e82380df12f7c174e02d647ff Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 14:34:18 -0500 Subject: [PATCH 07/15] Save button on edit user settings was not translating --- airtime_mvc/application/views/scripts/form/edit-user.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 76cd86ada88389c59e6dea87f9e3a4da39d8bfcf Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 14:52:01 -0500 Subject: [PATCH 08/15] Small change to Russian po file --- .../locale/ru_RU/LC_MESSAGES/airtime.mo | Bin 73237 -> 73068 bytes .../locale/ru_RU/LC_MESSAGES/airtime.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo index 29af9bc07344d8aff9cdbdc77a7f9a0f6e9b1fec..52cc736dc06860653f9b3cde4d713d09e3ec34d0 100644 GIT binary patch delta 15393 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 delta 15588 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 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" From 94a87a0b2edf4098f33f4de6646d3d7633f20276 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 17 Jan 2013 16:19:35 -0500 Subject: [PATCH 09/15] Smart block tooltip content breaks when language setting is not english --- airtime_mvc/application/controllers/LibraryController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 69d94e6a3..2b38349dd 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -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; From e2b83a0c8cefbac292c227e5bd19a406dfef6f95 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 17 Jan 2013 22:20:28 -0500 Subject: [PATCH 10/15] CC-4857: Playlist length will increase every time I duplicate it. - fixed --- airtime_mvc/application/models/airtime/CcPlaylist.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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"; } From a3477106cf66ff6e4cc933139df8bbb69e7ca487 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 18 Jan 2013 10:39:06 -0500 Subject: [PATCH 11/15] CC-4734: French - UI breaks in several places -fixed --- airtime_mvc/public/css/styles.css | 1 + 1 file changed, 1 insertion(+) 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 { From 0d3962f34ec1ef9f2a93cdc1223d3cb3228b33a5 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 18 Jan 2013 10:55:37 -0500 Subject: [PATCH 12/15] Updating German po file --- .../locale/de_DE/LC_MESSAGES/airtime.mo | Bin 58246 -> 63064 bytes .../locale/de_DE/LC_MESSAGES/airtime.po | 138 +++++++++--------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo index 509613a0b8e2a19d3ddcc3ec23e8dd0406b96f90..d23b307dad5c7972878cea83aac019831823a2c5 100644 GIT binary patch delta 20703 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 delta 16098 zcmZwM2Xqz1|M&5|DI|o@A#_M+2_=mxklF%w4Is#&g|Z(-#+x6cEZ>FLoUCC4%c}f$0>{p zLLBFWuj2$qs@8ELsymJ!mca;&!cy2Co8owEhNqBQosf9PseqAK7`tIGj<@BR*7f+V z zGhr$Q;)m$V{La#hjN`08g5az|4fH7z2xmK%LocfRCaV4?^x_>Xh9A{-oOQSt{V}nQ z>DL?cQ0|YJaRR=NGchakJDKY`PIkgUm>YZ#uw|N25yKNs4aHGWYhxAp$5E-Iq?h86K1X2T*4&6bpJNc^)R39^8W7LzjK;6&{HDC&sz_qCU zr_c}2q84}w6_LBB!}`ivf&(^@ax)CXbExsJHX{Dole<*Z#V4qND>pVBt6@0hI;e^J zp&~E`iK4R>3*dd!8S!gk4si_X@ODQ%&|J)oi%<*QWXp%#WQtO88TGn6MGcs}sd>%H zAm_>{FbS$0m{*%#@ zKd=V2z+pq}^+;5x=AaJEa_biKp}Ze;2oIsgIf_~E9A?Aom;>*jBJ~P& z#&WPvfqMV*kjaTfP&Y)QCaQtDu{q|(uBay%ig|Dh5<+J#=EpSDLe8TW@HJ}hf3!Zr zT$Ep-BAc}>@z)I@WV9!RQ03C74&|(sP)`<*3TZ>sf)Y@Nw+DveB-8@epvKvRirjY8 z{RdDHK4I&BZcF@oQt^}uEueinGeCD#B>JKvGYa*DGqDt|K`rDIYM~cV_g_ba_7~J4 zyoY*iv$Qvnh(<-GI_AMf?TNphq%##7a4>4X(Wn(qLJd3%73#&P2@azAeTjO~)2K*X zK)t4qZ8)2Kd1-r zd(SK=KbE5$hMMplRKM1!v(y2#fc~fla*rhwLT0sXNJrgx3iIN5)D!-Kf%>4}1Io`j zI8GD1+0iVtY$wyNlQj`__>wRm4#kSx{{ia5bf|O2hsy0t?CLm->3oA)c}zDGnog(% z^hYglA}X{?FdX+-f5ZZm0~5`j7RRcTtD+W=g4)_~sK`yRc{A3{asC@Pd+VaB0DossLPQ~t9pKSdp~zim0NySXnHmZ81?7RS06!2C{a1KsE#!O5k3U=gK^>})9_E2cp%zjW^%hmJK!03~nrH(m0$Whyq@%X%6ly`2Z2OO>x8M=_ zqkoc#a27Y2Fe-ARCaR2jpKGDs*EY7?3pK%L)P$+1w__1j#4V^j{t>mXr>KQIM?LX> zs7Ph$Z6cWs)z6)mjP|+!szVrRqLQdRs)Ty-=2!|_qXr(0THqwq6M0at=~C2$J5c@h z+xBCq!+9Dt{&mytcJ7nW6Fft`-{F1CX>W)cxFu%7_SP<_2=zjpozbX;%tB4D0`<0R zK~0o~HSstS1SeBpv$e@sP{03+$Y`LQ7=TAnPkaXTdR;_?`abH(oPOr?2c!CjVP-6Y z`qo!O?R|690y<%79Dq9g9@K;F#C*)}>?Wg7pU0AT54FeH`kRRgSz}NW)klRo0fR6J z6@kI1$V@^_ya+YXI#dL=pdQqV>USL7TIqE%deUD}Ti_aC%3-L5#913+Amuig1v{fo zbzkg>6R{B9L2ZRkvRPP8EKa$&wLa>s^+_iF8mK=NI=v$?7*kQFa}jF7k5F5(2D9P@ z)C6g^d<^x3mu>xZ)HwH05qge_h-;v^KPReOY#{O10-~wVfN!Hh*#ui*N7UYLLoMhi zY70)HCcK1-z%|rac!F8+C8~cwin%`vD#Br?2Z^)wHQi*i7j021?u%OS2-LzRq7Kz; zRA@J#COnE-=nd3_k5K*o!YUXt$n5<)7(ux;HpOwMg`UJ5=)OQkE4zhyqF1PiU4zZS zvZ59ih8ideb7FhcZ$MvEgx*K>TYwsP73#r0vmVFtl&_;6FknbV#QFY{(UXN?G{$3X zOhzqeJL(jt+46qOMfnKob@~RikUvn7$UM|6Bp>FaToUzwRcw6%YTQofr}w`H8T~r- zL4{^2YM|MuP%p#m=tVu@5mbaO*zyh3efLlceS$jOFHmRT6>7qNQIYW8J1@-<% zlTn8zm^>^8#u<+KrNQoe%KG4DvTWvx)5A8X4S zP~Vx0=nf(CoQ$?0>nQVAY#D4uxe=Dbg{ZwhjG=fRD`J+>CPFn){n}$JPR7Q#3%lcg zSQ@*JF@KJyq86}q4Dl~P<`NYO)pHEQSEz;gjy2_isL+-`MXC(4-A)WDQfp9Kw!^j` zL`CixYTT2kEjoi*;McZ3(>UUc(uR35h?2m#Ae22RK5h~RGq88#qWEHt!%#DSxH%6l(yx8b=mXpzqt55^2#VVL)IyjF|PxKTu z;s06|0_*K14N=P zRzyFnikhH024F+<#{^q$i|W_e+8uRBd!s*2u=UfhB;^mV4DLWh;QCbJufuVh3LUl= zr~!SanE?V(Pm&E)pVyWPq81j0(_Nec^r!qe2ctUfMV*Nk*aJ(=Fn^$=qE7#Bs1ICF zD)HAIwNEvNYYc`_o`qWRHq-!@u`yPi$=?V#5o7QGhU0Ij{vjVQ7QT&j(1U9K1~uWo zsJEi&EVHE@++^xfF$#lmKW4&Hs1RL1ZOJw3_ozL-g+chUt$&O1~iP`49(s+&f zvKWDWa|k;|q9W!FoNGd#4U1Ay5cOfGhU>5y7Qknyz0LZe`2dy1GL&m$DeRA>aUSZB z?y;W79F*^%CVYW9y#F9;bvt?InTc0pb{Y=j1-yv5VfB0ykqxLbupRY!eU2LFE94D! zenRbSPmc-h1k6c!CF;H%sPT4T3hu-DdjHEU;AB%V7_}AYs2l&mV9dVIM5r)opa|3! zMWP~7$@&h~q@0AYxDK^--=gljf$Dz?HU2Bq*U$-GWDZqz+(vm6YVX4rn~21q%C)d7 zHbxD+(bjLps+7}EhweA5jIm4jwT({v98y;3gc70T{ZRA2N(UekPpl%ZYz>j&sxs z^K)9`WAi#TLmkExRH){lLjDQ1;3*n;4fSDUu7be165xD3t$N>i1An) z-_?(fCKyXaE}V_J;S<#BwF&h>*@fltskPW@^MPrGI#gpYz~wj-Pz#^2#+-rm7)SXU zzJqx_HGdIx$NH3yxydLrS=O2fbEBTLC~D73q1vNR3#)?qEvRMdyPytL66!(RSQzJF zC~iX^Jdb{O3A5l;%!=;YWO9>vf{K9uIuok=s2eJv7E%>;CTgKx(@xd_)^V7Z`dO&{ zt1$#OV;TGsOW;G)xH;Bmd>45C$!H~|QF~Jf^#lp1l@37NFbcKM@t6tcp(a{_{eDKj81JT2H*x%=ysqYa1!<8S8e;R z7)bedY>6*X572ar`7q74&O?p25VdtHFf;DNc-*&z_-kb^snDMMhkD{nTg}A9QF|7P zT5)^SAsdalZ!T&J7TWR_tmWcgI%Cw>%ao-a@lI?SV^Dj)2qQ2JOXE!}i<#0)gkw=3q83;a z`?<+z0h>^v+KpP-A=FBb+VW}Z1q`G9iY>pe{*8)=Yqz;C05x7V)K-O{4tX(Ku7o)# zyW`1dPnx49d>6y9E9wcRqXycBL70Y-co@szW7PMcz#j7fDuX(_Z=)t|j-l8d_2i>a zXKFt3pl)XsnJiSSLw&(MLq+5$YT%2gC%c6T@mtkrNke^NFQX=Wf*K&_Uem86>NHnCUu=L{a1+$R+M^cI z4HeN|sD1-%d5|rSRGImmv1D}PB-B=XfQrOItbpq=A6`d2(Nok1Ci6b?H(xwzYm!kD zk3v1+c+|v`Q4csBGsZ=2!FqHn#A&wTI2NFM1-0joQ3Jog^60bQ3=oZ4P;FGi-oyMj z0=2-os0r3#LEMG)@q#Uf954%wJwW{Re)myZ@d^u}>!7JGa*+6IrIA!;5VYM>$b7LG-|9iOAN z>IN$0cToKvphEoz>VbR?nGaS7>UArR8b2Nt*;Z~cnz%Ez#=bZX51=ND`@)2HsP#is zB(|a^-i3v6FDlemQ44sAdQ#`GSy*9fDOA5G)S-4aCZm;g!m^lb8jBaN)8J*TssF0q=B6tmT$X=ip zko}0cF#@9~*GGMzhM`XNGR%uxQG0#_71_(ENZiB~_!kz(rAM`3H~-3&k)b1&q~Sh> zV)kR^^@%|ZR0%avE!6wo%C>h!ZAlN*1N29Qb~x$*W}qVZ32M)`p%$2qIhfx$r3_w2 zJ;4K1C|$=*$nv8mjzry96E$!G4#3{F{5ASfeu!Gg6U>Bvp+fF+!Ys5HYQAuEtK(Z_ z6rwt)GtdPCFxA%2vu;H#;1ntX*HCZI9W07}qVCUg()>o$#8Aq~s0rtwzAqnRQ%pZe z`~%4NpE7^BWX0~3o1p5qqMm#g>IqJup6F-PmOMZmsu!pQ1%G9}hy_p)YK)3xB5F%U zq56G*8h6Q8#9!~}CMtBu4q`N3#UKngZJsa}YUN>A4d2Ej9FFRD1GTWb7>K{2CVqjT znC*Z0W7K^e-DI@qNvOj&4uf$OYQSyikGn7&_n{(l8+E82pic8kR3r+YHKC5h zER^eDFg8cs*AaC_dY~`5``F9?+hGuDPe)-1oR0cnY(_2UI4WXiQBQCSHPAzRiNE7q zynl|LZX9#o{GXI&7t9CkV{AkHx7b$iebF+BM>@Z+$H)qOc2w z;%rpNx1m=24Qj#%s7U>X8rb)`8890vas{m=Q1_QdMWziZ0!gU*$D{gByiWY}WtvGv zK3s;A(Q7+a{mz8?ZPbmmPtbu$z8JOl%TXa;jT>iJ2%;{f@DqlcFD$xDC z328ZNOVsHci4}1ZCg2ZP1EYR0|E(z5x)D|X3u-|nZ?Z`2gVk^&#^P<%naca4`O?Kb<$sWkfH8tP|Z4w52K2?tPDhs5@0Tob6% z^(A$$um036r!d%748tO}pF0~FJ=OocbZB&CWuTp;f5`8m@0a)|TlCo1?hU}%& z7i*GqZ6cLP4DQ zdPtuj)T{OSdP=4wb+<{YN#T?~vW*KU>zd|b{+Sf?3e`jXH@q>VIT_97-~DHhFGpQC zX%cA=DVG+8RY|(iDQj){N$tthCY2>$gZ3e6u-6isUup02*Z%Xnlkx5@qp~Au8Raji z-)lR)zPTltQlxgY@qKclXfI9PkJRXOC)D9>Y|E!;dqw_*EswWj_M*NN$$iT<^r29g zG>x>2PW?!+smpoZu2)YYIsW8`F(Qkl5&wx#!pD6Nk>Vc)Q!dl+&6*z zr{qg&|6ALER$^}&cH1)T&i^RqrF>5Xdp&!d!Q-@#!Gg9f7Y?INS4BI{pX5)IA5IFg zb!x9pze)PPl>fi0v+a0=#_e?c9=F+!`DklSeuOOxz5gfZ_mEVJbeul*Ne4*_NI9tU zlJ3}hUXnjY{dw(w9?}*nR-mpn$ zwkOiJ2uW8>45zIfdG{4t`4feDr1O-2!=JDKX(##4=ps!ey}tI_{O8z!r2pJji^eG! ziDyar-0CV#-Aepe{g_zS-{gC0|J#!JippZ7uBI*HpKsZY2Pt)>PX*jhIzuW>+H2c4 z&^D3so7X$kow4nz-$zYYuGFllM*HfpfGHJUqI)6F;&ww5}RiRG5hG8UMQY3Z7 z?9Gd5yG!1mG>rT>tVH@B{q&o!D~__R;Dp?&OxwGZXHs^*pV7px6O|)K%}Mu2 zx&rJC`zUuOoh6N>ZY*v6NdJ;5k#v1*`wq1CKEA4#8)e|;?=^T?L-V>6q7hx+#97vgCg$KW$ag(zo1U5lx|M7l=45hjzo87=(z zg;hwG6#uVjh~%bo_=?oU4zSd!dj^o+CWTU$LZ7!ty7p5Zj-&CJts6@IbLxuQay`oJ zDeoZlp{_1vT~SySFVQ zY1>AM;l9Rr($?pu{2|GmMy0M03SG$GBy}Y}(bn%H|K`=5!eiQ&kXGBaHPoe$mfDVM zQ3w0Yt1*4Q;GVW`jMvUZw*-1^q9Mrkj;BKe<=;q~Np&cP&^Da>>+3r*lS!qhn}GcL zg_BhSQ*Ht8*-6%866p|ix`rAu{+~cI>gQ?pyxg>t!g|~2!S|@EMhdWXMajRuGSRo` z8)eluAoZv22hWpQx!vXHQQmg{m)ghV3*toTb>$-;Og@@?W&8lEtAXn)QWn~E%{Dk6 z+VUt{zD~K89c!L#Q`1^g=XN?#nPxlZ#Emo@#*wxz8|@FsPsU#O1a&

5uo5w%o+} zHttaet^`}RgE2oRrBl`^9*dvR9;m;mx{+x}iluTIrqQ7sHo^_0(bPwiTq;w4l>D35 zFSlTacehUe^|qFXi3%K3*jqCiSL#20x=;9QobkXQHkfROYJvE`QB`}+Ej%n8bE@E9qC zzD005b;%?*n9=Z=w@eyeusQ?v^XedVdp7K%3>&RC?UH?({GhRSlzmPsA zeL?!2x_52A8RY9wrz@xJyNI^GY+m(cDWB5*HzaeCG?&VCwnM0TaP_ACTU%F@aw_>3 zq&?J^$>_n^Ag}9P>ic4TTMnaqfc!2sVmHdVzQOaj6+iK*%WoZ-vvjCzJ8Yz}gnDw7 zr2Yo>!|Ak_M_r{!htxlGSW2jOc##R{M@F@0aiHa(U);nBr;L@v*l{r%o=<+0J`B2f9r2bnM#GbERuRZ*(_b zm#223+j}q3$Ep%r3cD@4Y|Mpmd68XFr| zsgmdSd7;%}Duu>YjjLF-Tuf|COi;7Lp~E8E3`ra~bU@;;lp%4U^%4j6?KL2@Nn&!Z zp`q1#W|X4(spM%ozon&~Ly>pP--JSDv!dtZ5@UEa34j=H=Rb_cjT!}g?k z=A;+*B&XN)Tu3kGt-H64%d>gkQg6!sioV{hhd%T3PCc62&)eeELzlPK=@%|<Ng`eV 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" From f70ca93b538700e9304322f50a03ef5fa9ffdf3a Mon Sep 17 00:00:00 2001 From: James Date: Fri, 18 Jan 2013 11:53:26 -0500 Subject: [PATCH 13/15] CC-4841: Silan script done --- .../application/controllers/ApiController.php | 35 ++++++++ airtime_mvc/application/models/StoredFile.php | 23 ++++++ python_apps/api_clients/api_client.cfg | 4 + python_apps/api_clients/api_client.py | 15 ++++ utils/airtime-silan/airtime-silan | 22 +++++ utils/airtime-silan/airtime-silan.py | 81 +++++++++++++++++++ 6 files changed, 180 insertions(+) create mode 100755 utils/airtime-silan/airtime-silan create mode 100644 utils/airtime-silan/airtime-silan.py diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index b3a8d8229..6bbe480da 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') @@ -903,6 +904,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() { @@ -921,6 +934,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/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 3fac651e5..bd50f2826 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -1111,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/python_apps/api_clients/api_client.cfg b/python_apps/api_clients/api_client.cfg index 369f74eb8..4de375c96 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 c4a12b2c3..b472f08ef 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-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 From 00078dc05c8b111c87a635d3acafc5644e7000ae Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 18 Jan 2013 12:06:12 -0500 Subject: [PATCH 14/15] replay gain does not work sometimes --- install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql | 4 ++++ 1 file changed, 4 insertions(+) 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 f42d57cd2..08746609c 100644 --- a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql @@ -4,6 +4,10 @@ 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 From a9a571ff751c2f067042a51de617482bbe542dec Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 18 Jan 2013 12:22:00 -0500 Subject: [PATCH 15/15] added silan changes to upgrade script --- install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql | 1 + 1 file changed, 1 insertion(+) 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 08746609c..e878b60bc 100644 --- a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql @@ -62,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