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

CC-2651: Prevent chaning the storage dir while import is happening 

- done
This commit is contained in:
James 2011-08-08 17:07:52 -04:00
parent bfa2fa6535
commit 05b2a9679b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -162,7 +162,7 @@ class PreferenceController extends Zend_Controller_Action
public function isImportInProgressAction(){ public function isImportInProgressAction(){
$now = time(); $now = time();
$res = false; $res = false;
if(Application_Model_Preference::GetImportTimestamp()+5 > $now){ if(Application_Model_Preference::GetImportTimestamp()+10 > $now){
$res = true; $res = true;
} }
die(json_encode($res)); die(json_encode($res));

2
airtime_mvc/application/models/MusicDir.php
View File

@ -244,6 +244,8 @@ class MusicDir {
{ {
if(!is_dir($p_dir)){ if(!is_dir($p_dir)){
return array("code"=>2, "error"=>"'$p_dir' is not a valid directory."); return array("code"=>2, "error"=>"'$p_dir' is not a valid directory.");
}else if(Application_Model_Preference::GetImportTimestamp()+10 > $now){
return array("code"=>3, "error"=>"Airtime is currently importing files. Please wait until this is complete before changing the storage directory.");
} }
$dir = self::getStorDir(); $dir = self::getStorDir();
// if $p_dir doesn't exist in DB // if $p_dir doesn't exist in DB

4
airtime_mvc/public/js/airtime/library/library.js
View File

@ -59,7 +59,7 @@ function checkImportStatus(){
$.getJSON('/Preference/is-import-in-progress', function(data){ $.getJSON('/Preference/is-import-in-progress', function(data){
var div = $('#library_display_processing'); var div = $('#library_display_processing');
if(data == true){ if(data == true){
div.html("Import is being processed"); div.html("File import in progress...");
div.css('visibility', 'visible'); div.css('visibility', 'visible');
}else{ }else{
div.css('visibility', 'hidden'); div.css('visibility', 'hidden');
@ -187,5 +187,5 @@ $(document).ready(function() {
}).fnSetFilteringDelay(350); }).fnSetFilteringDelay(350);
checkImportStatus() checkImportStatus()
setInterval( "checkImportStatus()", 2000 ); setInterval( "checkImportStatus()", 5000 );
}); });