CC-2651: import idicator
- Threshold is 10 seconds - record timestamp once every 5 seconds - "File import inprogress..." displays above search box - pyinotify read_freq changed to 0.1 from 1
This commit is contained in:
parent
05b2a9679b
commit
968c0f96a2
6 changed files with 10 additions and 8 deletions
|
@ -244,7 +244,7 @@ class MusicDir {
|
|||
{
|
||||
if(!is_dir($p_dir)){
|
||||
return array("code"=>2, "error"=>"'$p_dir' is not a valid directory.");
|
||||
}else if(Application_Model_Preference::GetImportTimestamp()+10 > $now){
|
||||
}else if(Application_Model_Preference::GetImportTimestamp()+10 > time()){
|
||||
return array("code"=>3, "error"=>"Airtime is currently importing files. Please wait until this is complete before changing the storage directory.");
|
||||
}
|
||||
$dir = self::getStorDir();
|
||||
|
|
|
@ -359,7 +359,9 @@ class Application_Model_Preference
|
|||
|
||||
public static function SetImportTimestamp(){
|
||||
$now = time();
|
||||
Application_Model_Preference::SetValue("import_timestamp", $now);
|
||||
if(Application_Model_Preference::GetImportTimestamp()+5 < $now){
|
||||
Application_Model_Preference::SetValue("import_timestamp", $now);
|
||||
}
|
||||
}
|
||||
|
||||
public static function GetImportTimestamp(){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue