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

cc-3936: 

Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
This commit is contained in:
Rudi Grinberg 2012-08-24 12:37:16 -04:00
parent e53c20bbcd
commit 5841cb7066
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -918,22 +918,6 @@ class Application_Model_StoredFile
// Did all the checks for realz, now trying to copy // Did all the checks for realz, now trying to copy
$audio_stor = Application_Common_OsPath::join($stor, "organize", $fileName); $audio_stor = Application_Common_OsPath::join($stor, "organize", $fileName);
Logging::info("copyFileToStor: moving file $audio_file to $audio_stor");
// Martin K.: changed to rename: Much less load + quicker since this is
// an atomic operation
if (@rename($audio_file, $audio_stor) === false) {
//something went wrong likely there wasn't enough space in the audio_stor to move the file too.
//warn the user that the file wasn't uploaded and they should check if there is enough disk space.
unlink($audio_file); //remove the file after failed rename
return array(
"code" => 108,
"message" => "
The file was not uploaded, this error can occur if the computer
hard drive does not have enough disk space or the stor
directory does not have correct write permissions.");
}
// Now that we successfully added this file, we will add another tag
// file that will identify the user that owns it
$uid = Application_Model_User::getCurrentUser()->getId(); $uid = Application_Model_User::getCurrentUser()->getId();
$id_file = "$audio_stor.identifier"; $id_file = "$audio_stor.identifier";
if (file_put_contents($id_file,$uid) === false) { if (file_put_contents($id_file,$uid) === false) {
@ -945,6 +929,23 @@ class Application_Model_StoredFile
Logging::info("Successfully written identification file for Logging::info("Successfully written identification file for
uploaded '$audio_stor'"); uploaded '$audio_stor'");
} }
Logging::info("copyFileToStor: moving file $audio_file to $audio_stor");
// Martin K.: changed to rename: Much less load + quicker since this is
// an atomic operation
if (@rename($audio_file, $audio_stor) === false) {
//something went wrong likely there wasn't enough space in the audio_stor to move the file too.
//warn the user that the file wasn't uploaded and they should check if there is enough disk space.
unlink($audio_file); //remove the file after failed rename
unlink($id_file); // Also remove the identifier file
return array(
"code" => 108,
"message" => "
The file was not uploaded, this error can occur if the computer
hard drive does not have enough disk space or the stor
directory does not have correct write permissions.");
}
// Now that we successfully added this file, we will add another tag
// file that will identify the user that owns it
return null; return null;
} }