Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
Martin Konecny
commit
3fee646e35
|
|
@ -7,7 +7,7 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm
|
|||
{
|
||||
// Add record element
|
||||
$this->addElement('checkbox', 'add_show_record', array(
|
||||
'label' => 'Record?',
|
||||
'label' => 'Record from Line In?',
|
||||
'required' => false,
|
||||
));
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ class Application_Form_AddUser extends Zend_Form
|
|||
$firstName = new Zend_Form_Element_Text('first_name');
|
||||
$firstName->setLabel('Firstname:');
|
||||
$firstName->setAttrib('class', 'input_text');
|
||||
$firstName->setRequired(true);
|
||||
$firstName->addFilter('StringTrim');
|
||||
$firstName->addValidator('NotEmpty');
|
||||
$this->addElement($firstName);
|
||||
|
|
@ -42,7 +41,6 @@ class Application_Form_AddUser extends Zend_Form
|
|||
$lastName = new Zend_Form_Element_Text('last_name');
|
||||
$lastName->setLabel('Lastname:');
|
||||
$lastName->setAttrib('class', 'input_text');
|
||||
$lastName->setRequired(true);
|
||||
$lastName->addFilter('StringTrim');
|
||||
$lastName->addValidator('NotEmpty');
|
||||
$this->addElement($lastName);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
|
|||
|
||||
$this->addElement('text', 'storageFolder', array(
|
||||
'class' => 'input_text',
|
||||
'label' => 'Airtime\'s Storage Folder:',
|
||||
'label' => 'Import Folder:',
|
||||
'required' => false,
|
||||
'filters' => array('StringTrim'),
|
||||
'value' => '',
|
||||
|
|
@ -22,7 +22,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
|
|||
|
||||
$this->addElement('text', 'watchedFolder', array(
|
||||
'class' => 'input_text',
|
||||
'label' => 'Choose a Watched Folder:',
|
||||
'label' => 'Watched Folders:',
|
||||
'required' => false,
|
||||
'filters' => array('StringTrim'),
|
||||
'value' => '',
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ class Application_Model_RabbitMq
|
|||
$channel->exchange_declare($EXCHANGE, 'direct', false, true);
|
||||
|
||||
$now = new DateTime("@".time());
|
||||
$end_timestamp = new DateTime("@".time() + 3600*2);
|
||||
$end_timestamp = new DateTime("@".(time() + 3600*2));
|
||||
|
||||
$temp['event_type'] = $event_type;
|
||||
$temp['server_timezone'] = Application_Model_Preference::GetTimezone();
|
||||
|
|
|
|||
|
|
@ -804,7 +804,7 @@ class Application_Model_Show {
|
|||
|
||||
$utcStartDateTime->add(new DateInterval("P".$daysAdd."D"));
|
||||
}
|
||||
if (is_null($endDateTime) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) {
|
||||
if (is_null($endDate) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) {
|
||||
$showDay = new CcShowDays();
|
||||
$showDay->setDbFirstShow($utcStartDateTime->format("Y-m-d"));
|
||||
$showDay->setDbLastShow($endDate);
|
||||
|
|
|
|||
|
|
@ -83,15 +83,15 @@ class Application_Model_StreamSetting {
|
|||
$sql = "SELECT COUNT(*) FROM cc_stream_setting"
|
||||
." WHERE keyname = '$keyname'";
|
||||
$result = $CC_DBC->GetOne($sql);
|
||||
|
||||
if ($result == 1){
|
||||
$sql = "UPDATE cc_stream_setting"
|
||||
." SET value = '$value'"
|
||||
." SET value = '$msg'"
|
||||
." WHERE keyname = '$keyname'";
|
||||
}else{
|
||||
$sql = "INSERT INTO cc_stream_setting (keyname, value, type)"
|
||||
." VALUES ($keyname, '$msg', 'string')";
|
||||
." VALUES ('$keyname', '$msg', 'string')";
|
||||
}
|
||||
$res = $CC_DBC->query($sql);
|
||||
}
|
||||
|
||||
public static function getLiquidsoapError($stream_id){
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
</ul>
|
||||
<?php endif; ?>
|
||||
</dd>
|
||||
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
|
||||
<dd class="block-display selected-item"><strong>Current Import Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
|
||||
|
||||
<dt id="watchedFolder-label" class="block-display">
|
||||
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,17 @@ function removeAddShowButton(){
|
|||
span.remove();
|
||||
}
|
||||
|
||||
function pad(number, length) {
|
||||
|
||||
var str = '' + number;
|
||||
while (str.length < length) {
|
||||
str = '0' + str;
|
||||
}
|
||||
|
||||
return str;
|
||||
|
||||
}
|
||||
|
||||
function makeTimeStamp(date){
|
||||
var sy, sm, sd, h, m, s, timestamp;
|
||||
sy = date.getFullYear();
|
||||
|
|
@ -57,7 +68,7 @@ function makeTimeStamp(date){
|
|||
m = date.getMinutes();
|
||||
s = date.getSeconds();
|
||||
|
||||
timestamp = sy+"-"+ sm +"-"+ sd +" "+ h +":"+ m +":"+ s;
|
||||
timestamp = sy+"-"+ pad(sm, 2) +"-"+ pad(sd, 2) +" "+ pad(h, 2) +":"+ pad(m, 2) +":"+ pad(s, 2);
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -577,7 +577,9 @@ class AirTimeApiClient(ApiClientInterface):
|
|||
url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_liquidsoap_error"])
|
||||
|
||||
url = url.replace("%%api_key%%", self.config["api_key"])
|
||||
url = url.replace("%%error_msg%%", error_msg)
|
||||
error_msg = error_msg.replace('/', ' ')
|
||||
encoded_msg = urllib.quote(error_msg, '')
|
||||
url = url.replace("%%error_msg%%", encoded_msg)
|
||||
url = url.replace("%%stream_id%%", stream_id)
|
||||
logger.debug(url)
|
||||
req = urllib2.Request(url)
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@ end
|
|||
|
||||
def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, description, genre, user, s, stream) =
|
||||
def on_error(msg)
|
||||
system("airtime-check-system > ~/temp/temp1.log 2>&1")
|
||||
system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --error='#{msg}' --stream-id=#{stream} > ~/temp/temp.log 2>&1")
|
||||
system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --error='#{msg}' --stream-id=#{stream}")
|
||||
log("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --error='#{msg}' --stream-id=#{stream}")
|
||||
5.
|
||||
end
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ SCRIPT=`readlink -f $0`
|
|||
# Absolute path this script is in
|
||||
SCRIPTPATH=`dirname $SCRIPT`
|
||||
|
||||
cd ${SCRIPTPATH}/../ && python pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &
|
||||
cd ${SCRIPTPATH}/../ && python pypo-notify.py "$@"
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ parser = OptionParser(usage=usage)
|
|||
# Options
|
||||
parser.add_option("-d", "--data", help="Pass JSON data from liquidsoap into this script.", metavar="data")
|
||||
parser.add_option("-m", "--media-id", help="ID of the file that is currently playing.", metavar="media_id")
|
||||
parser.add_option("-e", "--error", help="liquidsoap error msg.", metavar="error_msg")
|
||||
parser.add_option("-e", "--error", action="store", dest="error", type="string", help="liquidsoap error msg.", metavar="error_msg")
|
||||
parser.add_option("-s", "--stream-id", help="ID stream", metavar="stream_id")
|
||||
parser.add_option("-c", "--connect", help="liquidsoap connected", action="store_true", metavar="connect")
|
||||
|
||||
|
|
@ -109,13 +109,13 @@ if __name__ == '__main__':
|
|||
# initialize
|
||||
logger = logging.getLogger()
|
||||
|
||||
if options.error_msg and options.stream_id:
|
||||
if options.error and options.stream_id:
|
||||
try:
|
||||
n = Notify()
|
||||
n.notify_liquidsoap_error(options.error_msg, options.stream_id)
|
||||
n.notify_liquidsoap_error(options.error, options.stream_id)
|
||||
except Exception, e:
|
||||
print e
|
||||
elif optioins.connect and options.stream_id:
|
||||
elif options.connect and options.stream_id:
|
||||
try:
|
||||
n = Notify()
|
||||
n.notify_liquidsoap_connection(options.stream_id)
|
||||
|
|
|
|||
Loading…
Reference in New Issue