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:
martin 2011-08-31 15:14:44 -04:00
parent f9a7ebcab5 c460519a88
commit 0517bf0c82
8 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CREDITS
View File

@ -1,6 +1,17 @@
=======
CREDITS
=======
Version 1.9.3
-------------
Same as previous version.
Version 1.9.2
-------------
Same as previous version.
Version 1.9.1
-------------
Same as previous version.
Version 1.9.0
-------------

4
airtime_mvc/application/controllers/LibraryController.php
View File

@ -178,9 +178,10 @@ class LibraryController extends Zend_Controller_Action
{
$request = $this->getRequest();
$form = new Application_Form_EditAudioMD();
$file_id = $this->_getParam('id', null);
$file = StoredFile::Recall($file_id);
$form->populate($file->getDbColMetadata());
if ($request->isPost()) {
if ($form->isValid($request->getPost())) {
@ -196,7 +197,6 @@ class LibraryController extends Zend_Controller_Action
}
}
$form->populate($file->getDbColMetadata());
$this->view->form = $form;
}

6
airtime_mvc/application/forms/EditAudioMD.php
View File

@ -29,21 +29,15 @@ class Application_Form_EditAudioMD extends Zend_Form
// Add title field
$this->addElement('text', 'track_title', array(
'label' => 'Title:',
'required' => true,
'class' => 'input_text',
'filters' => array('StringTrim'),
'validators' => array(
'NotEmpty',
)
));
// Add artist field
$this->addElement('text', 'artist_name', array(
'label' => 'Artist:',
'required' => true,
'class' => 'input_text',
'filters' => array('StringTrim'),
'validators' => array('NotEmpty')
));
// Add album field

5
airtime_mvc/application/models/StoredFile.php
View File

@ -728,7 +728,7 @@ class StoredFile {
$chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0;
$chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0;
$fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
Logging::log(__FILE__.':uploadFile(): filename='.$fileName);
// Clean the fileName for security reasons
//this needs fixing for songs not in ascii.
//$fileName = preg_replace('/[^\w\._]+/', '', $fileName);
@ -823,7 +823,7 @@ class StoredFile {
public static function copyFileToStor($p_targetDir, $fileName){
$audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
Logging::log('copyFileToStor: moving file '.$audio_file);
$md5 = md5_file($audio_file);
$duplicate = StoredFile::RecallByMd5($md5);
if ($duplicate) {
@ -844,6 +844,7 @@ class StoredFile {
$audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
$r = @copy($audio_file, $audio_stor);
//$r = @unlink($audio_file);
}
public static function getFileCount()

2
airtime_mvc/public/js/airtime/library/plupload.js
View File

@ -25,7 +25,7 @@ $(document).ready(function() {
$("#plupload_error").find("table").append(row);
}else{
$.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){
$.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name), function(json){
var jr = jQuery.parseJSON(json);
if(jr.error !== undefined) {
var row = $("<tr/>")

3
install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
View File

@ -547,7 +547,8 @@ class Airtime190Upgrade{
public static function InstallAirtimePhpServerCode($phpDir)
{
// delete old files
exec("rm -rf ".$phpDir);
$AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
echo "* Installing PHP code to ".$phpDir.PHP_EOL;

2
install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
View File

@ -159,6 +159,8 @@ class Airtime200Upgrade{
$AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
// delete old files
exec("rm -rf ".$phpDir);
echo "* Installing PHP code to ".$phpDir.PHP_EOL;
exec("mkdir -p ".$phpDir);
exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir);

2
python_apps/show-recorder/recorder.py
View File

@ -157,7 +157,7 @@ class ShowRecorder(Thread):
self.upload_file(filepath)
os.remove(filepath)
except Exceptio, e:
except Exception, e:
self.logger.error(e)
else:
self.logger.info("problem recording show")