Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/controllers/LibraryController.php

@@ -133,6 +133,10 @@ class LibraryController extends Zend_Controller_Action
                 $this->view->message = "file doesn't exist";
                 return;
             }
+            
+            
+            $data = array("filepath"=>$file->getFilePath());
+            RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
 
             $res = $file->delete();
 

airtime_mvc/application/models/MusicDir.php

@@ -102,11 +102,10 @@ class MusicDir {
                     ->findOne();
 
         $mus_dir = new MusicDir($dir);
-        $mus_dir->_dir = $dir;
 
         return $mus_dir;
-    }
-
+    }    
+    
     public static function setStorDir($p_dir)
     {
         $dir = self::getStorDir();

airtime_mvc/application/models/StoredFile.php

@@ -813,6 +813,8 @@ class StoredFile {
         $storDir = MusicDir::getStorDir();
         $stor = $storDir->getDirectory();
 
+        $stor .= "/organize";
+        
 	    $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
 
         $r = @copy($audio_file, $audio_stor);