Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel

This commit is contained in:
Naomi Aro 2011-06-27 18:31:13 +02:00
parent 5f9dd83c38 f3746ff197
commit 363a73af10
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View File

@ -34,15 +34,18 @@
<?php endif; ?>
</dd>
<?php $watched_dirs = MusicDir::getWatchedDirs(); ?>
<dd id="watchedFolder-table" class="block-display selected-item">
<?php if (count($watched_dirs) > 0): ?>
<?php foreach($watched_dirs as $watched_dir): ?>
<span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
<dd class="block-display selected-item">
<span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
</dd>
<?php endforeach; ?>
<?php else: ?>
<span>You are not watching any music folders.</span>
<dd class="block-display selected-item">
<span>You are not watching any music folders.</span>
</dd>
<?php endif; ?>
</dd>
</dl>
</fieldset>

6
airtime_mvc/public/js/airtime/preferences/musicdirs.js
View File

@ -16,7 +16,7 @@ function setWatchedDirEvents() {
systemImageUrl: 'img/browser/',
handlerUrl: '/Preference/server-browse/format/json',
title: 'Choose Storage Folder',
basePath: '/home',
basePath: '',
requestMethod: 'POST',
});
@ -36,7 +36,7 @@ function setWatchedDirEvents() {
systemImageUrl: 'img/browser/',
handlerUrl: '/Preference/server-browse/format/json',
title: 'Choose Folder to Watch',
basePath: '/home',
basePath: '',
requestMethod: 'POST',
});
@ -72,7 +72,7 @@ function setWatchedDirEvents() {
});
});
$('#watchedFolder-table').find('.ui-icon-close').click(function(){
$('.selected-item').find('.ui-icon-close').click(function(){
var row = $(this).parent();
var folder = $(this).prev().text();

9
python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
View File

@ -30,10 +30,9 @@ class AirtimeNotifier(Notifier):
while not self.init_rabbit_mq():
logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
time.sleep(5)
def init_rabbit_mq(self):
logger = logging.getLogger('fetch')
logger.info("Initializing RabbitMQ stuff")
self.logger.info("Initializing RabbitMQ stuff")
try:
schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
@ -43,9 +42,9 @@ class AirtimeNotifier(Notifier):
consumer.register_callback(self.handle_message)
consumer.consume()
except Exception, e:
logger.error(e)
self.logger.error(e)
return False
return True
def handle_message(self, body, message):