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

CC-1799 : Live Studio Playout from media library (pytagsfs) 

-code cleanup
This commit is contained in:
martin 2011-07-05 17:45:56 -04:00
parent 2be05a8004
commit 3424dcc12d
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
install/include/AirtimeInstall.php
View File

@ -121,34 +121,38 @@ class AirtimeInstall
{ {
global $CC_CONFIG, $CC_DBC; global $CC_CONFIG, $CC_DBC;
echo "* Storage directory setup".PHP_EOL; echo "* Storage directory setup".PHP_EOL;
$stor_dir = $CC_CONFIG['storageDir']; $dirs = array($CC_CONFIG['storageDir'], $CC_CONFIG['storageDir']."/organize");
if (!file_exists($stor_dir)) { foreach ($dirs as $dir){
@mkdir($stor_dir, 02777, true); if (!file_exists($dir)) {
if (file_exists($stor_dir)) { @mkdir($dir, 02777, true);
$rp = realpath($stor_dir); if (file_exists($dir)) {
echo "* Directory $rp created".PHP_EOL; $rp = realpath($dir);
} else { echo "* Directory $rp created".PHP_EOL;
echo "* Failed creating {$stor_dir}".PHP_EOL; } else {
echo "* Failed creating {$dir}".PHP_EOL;
exit(1);
}
}
else if (is_writable($dir)) {
$rp = realpath($dir);
echo "* Skipping directory already exists: $rp".PHP_EOL;
}
else {
$rp = realpath($dir);
echo "* Error: Directory already exists, but is not writable: $rp".PHP_EOL;
exit(1); exit(1);
} }
}
else if (is_writable($stor_dir)) {
$rp = realpath($stor_dir);
echo "* Skipping directory already exists: $rp".PHP_EOL;
}
else {
$rp = realpath($stor_dir);
echo "* WARNING: Directory already exists, but is not writable: $rp".PHP_EOL;
return;
}
echo "* Giving Apache permission to access $rp".PHP_EOL; echo "* Giving Apache permission to access $rp".PHP_EOL;
$success = chgrp($rp, $CC_CONFIG["webServerUser"]); $success = chgrp($rp, $CC_CONFIG["webServerUser"]);
$success = chown($rp, "pypo"); $success = chown($rp, "pypo");
$success = chmod($rp, 02777); $success = chmod($rp, 02777);
$CC_CONFIG['storageDir'] = $rp; }
//July 5th, 2011: Why is this here - MK?????
//$CC_CONFIG['storageDir'] = $rp;
} }
public static function CreateDatabaseUser() public static function CreateDatabaseUser()

1
python_apps/media-monitor/MediaMonitor.py
View File

@ -52,6 +52,7 @@ try:
logger.info("Storage Directory is: %s", storage_directory) logger.info("Storage Directory is: %s", storage_directory)
config.storage_directory = storage_directory config.storage_directory = storage_directory
config.imported_directory = storage_directory + '/imported' config.imported_directory = storage_directory + '/imported'
config.organize_directory = storage_directory + '/organize'
multi_queue = mpQueue() multi_queue = mpQueue()
logger.info("Initializing event processor") logger.info("Initializing event processor")

12
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View File

@ -220,18 +220,20 @@ class AirtimeProcessEvent(ProcessEvent):
def handle_created_file(self, dir, name, pathname): def handle_created_file(self, dir, name, pathname):
self.logger.debug("dir: %s, name: %s, pathname: %s ", dir, name, pathname) self.logger.debug("dir: %s, name: %s, pathname: %s ", dir, name, pathname)
storage_directory = self.config.storage_directory storage_directory = self.config.storage_directory
organize_directory = self.config.organize_directory
if not dir: if not dir:
#event is because of a created file #event is because of a created file
if self.is_temp_file(name) : if self.is_temp_file(name) :
#file created is a tmp file which will be modified and then moved back to the original filename. #file created is a tmp file which will be modified and then moved back to the original filename.
self.temp_files[pathname] = None self.temp_files[pathname] = None
elif self.is_audio_file(pathname): elif self.is_audio_file(pathname):
if self.is_parent_directory(pathname, storage_directory): if self.is_parent_directory(pathname, organize_directory):
#file was created in /srv/airtime/stor. Need to process and copy #file was created in /srv/airtime/stor/organize. Need to process and copy
#to /srv/airtime/stor/imported #to /srv/airtime/stor/imported
self.set_needed_file_permissions(pathname, dir) self.set_needed_file_permissions(pathname, dir)
self.process_new_file(pathname) self.organize_new_file(pathname)
else: else:
self.set_needed_file_permissions(pathname, dir)
self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': pathname, 'is_recorded_show': False}) self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': pathname, 'is_recorded_show': False})
else: else:
@ -240,7 +242,7 @@ class AirtimeProcessEvent(ProcessEvent):
self.set_needed_file_permissions(pathname, dir) self.set_needed_file_permissions(pathname, dir)
def process_new_file(self, pathname): def organize_new_file(self, pathname):
self.logger.info("Processing new file: %s", pathname) self.logger.info("Processing new file: %s", pathname)
file_md = self.md_manager.get_md_from_file(pathname) file_md = self.md_manager.get_md_from_file(pathname)
@ -377,6 +379,8 @@ class AirtimeProcessEvent(ProcessEvent):
self.file_events = [] self.file_events = []
#use items() because we are going to be modifying this
#dictionary while iterating over it.
for k, pair in self.cookies_IN_MOVED_FROM.items(): for k, pair in self.cookies_IN_MOVED_FROM.items():
event = pair[0] event = pair[0]
timestamp = pair[1] timestamp = pair[1]