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

cc-2419: media monitor import on startup

Browse source 
-fixed support for watched dirs #2
This commit is contained in:
martin 2011-07-04 17:59:02 -04:00
parent df1dec2078
commit 805d3616fe
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/StoredFile.php
View file

@ -820,14 +820,14 @@ class StoredFile {
} }
public static function listAllFiles($dir_id){ public static function listAllFiles($dir_id){
global $CC_CONFIG, $CC_DBC; global $CC_DBC;
$sql = "SELECT m.directory || '/' || f.filepath as fp" $sql = "SELECT m.directory || '/' || f.filepath as fp"
." FROM CC_MUSIC_DIRS m" ." FROM CC_MUSIC_DIRS m"
." LEFT JOIN CC_FILES f" ." LEFT JOIN CC_FILES f"
." ON m.id = f.directory" ." ON m.id = f.directory"
." WHERE m.id = f.directory" ." WHERE m.id = f.directory"
." AND directory = $dir_id"; ." AND m.id = $dir_id";
$rows = $CC_DBC->getAll($sql); $rows = $CC_DBC->getAll($sql);
$results = array(); $results = array();

2
python_apps/api_clients/api_client.py
View file

@ -431,9 +431,7 @@ class AirTimeApiClient(ApiClientInterface):
try: try:
url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["list_all_watched_dirs"]) url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["list_all_watched_dirs"])
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
logger.debug(url)
req = urllib2.Request(url) req = urllib2.Request(url)
response = urllib2.urlopen(req).read() response = urllib2.urlopen(req).read()

3
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
View file

@ -26,7 +26,8 @@ class AirtimeMediaMonitorBootstrap():
self.logger.info("watched directories found: %s", directories) self.logger.info("watched directories found: %s", directories)
for id, dir in directories: for id, dir in directories.iteritems():
self.logger.debug("%s, %s", id, dir)
self.check_for_diff(id, dir) self.check_for_diff(id, dir)
def list_db_files(self, dir_id): def list_db_files(self, dir_id):

4
python_apps/media-monitor/media-monitor.cfg
View file

@ -29,10 +29,10 @@ upload_recorded = 'upload-recorded/format/json/api_key/%%api_key%%/fileid/%%file
update_media_url = 'reload-metadata/format/json/api_key/%%api_key%%/mode/%%mode%%' update_media_url = 'reload-metadata/format/json/api_key/%%api_key%%/mode/%%mode%%'
# URL to tell Airtime we want a listing of all files it knows about # URL to tell Airtime we want a listing of all files it knows about
list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%' list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'
# URL to tell Airtime we want a listing of all dirs its watching (including the stor dir) # URL to tell Airtime we want a listing of all dirs its watching (including the stor dir)
list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%' list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%'
############################################ ############################################
# RabbitMQ settings # # RabbitMQ settings #