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

-compare relative paths instead of full paths on bootup

Browse source
This commit is contained in:
martin 2011-07-07 17:41:08 -04:00
parent 8574eb7063
commit 9d994aa225
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

4
python_apps/api_clients/api_client.py
View file

@ -407,6 +407,10 @@ class AirTimeApiClient(ApiClientInterface):
return response
#returns a list of all db files for a given directory in JSON format:
#{"files":["path/to/file1", "path/to/file2"]}
#Note that these are relative paths to the given directory. The full
#path is not returned.
def list_all_db_files(self, dir_id):
logger = logging.getLogger()
try:

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

@ -55,7 +55,7 @@ class AirtimeMediaMonitorBootstrap():
all_files_set = set()
for file_path in new_files:
if len(file_path.strip(" \n")) > 0:
all_files_set.add(file_path)
all_files_set.add(file_path[len(dir)+1:])
if os.path.exists("/var/tmp/airtime/.media_monitor_boot"):
@ -73,7 +73,7 @@ class AirtimeMediaMonitorBootstrap():
for file_path in new_files:
if len(file_path.strip(" \n")) > 0:
new_and_modified_files.add(file_path)
new_and_modified_files.add(file_path[len(dir)+1:])
#new_and_modified_files gives us a set of files that were either copied or modified
#since the last time media-monitor was running. These files were collected based on
@ -94,14 +94,16 @@ class AirtimeMediaMonitorBootstrap():
open("/var/tmp/airtime/.media_monitor_boot","w")
for file_path in deleted_files_set:
self.pe.handle_removed_file(False, file_path)
self.pe.handle_removed_file(False, "%s/%s" % (dir, file_path))
for file_path in new_files_set:
if os.path.exists(file_path):
file_path = "%s/%s" % (dir, file_path)
self.pe.handle_created_file(False, os.path.basename(file_path), file_path)
for file_path in modified_files_set:
if os.path.exists(file_path):
file_path = "%s/%s" % (dir, file_path)
self.pe.handle_modified_file(False, os.path.basename(file_path), file_path)
def execCommand(self, command):