Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
james 2011-06-27 14:38:16 -04:00
parent 6a7f1d3588 363a73af10
commit 4eea4f11b0
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -16,7 +16,7 @@ function setWatchedDirEvents() {
systemImageUrl: 'img/browser/', systemImageUrl: 'img/browser/',
handlerUrl: '/Preference/server-browse/format/json', handlerUrl: '/Preference/server-browse/format/json',
title: 'Choose Storage Folder', title: 'Choose Storage Folder',
basePath: '/home', basePath: '',
requestMethod: 'POST', requestMethod: 'POST',
}); });
@ -36,7 +36,7 @@ function setWatchedDirEvents() {
systemImageUrl: 'img/browser/', systemImageUrl: 'img/browser/',
handlerUrl: '/Preference/server-browse/format/json', handlerUrl: '/Preference/server-browse/format/json',
title: 'Choose Folder to Watch', title: 'Choose Folder to Watch',
basePath: '/home', basePath: '',
requestMethod: 'POST', 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 row = $(this).parent();
var folder = $(this).prev().text(); var folder = $(this).prev().text();

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

@ -32,8 +32,7 @@ class AirtimeNotifier(Notifier):
time.sleep(5) time.sleep(5)
def init_rabbit_mq(self): def init_rabbit_mq(self):
logger = logging.getLogger('fetch') self.logger.info("Initializing RabbitMQ stuff")
logger.info("Initializing RabbitMQ stuff")
try: try:
schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True) schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem") schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
@ -43,7 +42,7 @@ class AirtimeNotifier(Notifier):
consumer.register_callback(self.handle_message) consumer.register_callback(self.handle_message)
consumer.consume() consumer.consume()
except Exception, e: except Exception, e:
logger.error(e) self.logger.error(e)
return False return False
return True return True