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

cc-3936: 

Sexified code. Added section for user handling.
This commit is contained in:
Rudi Grinberg 2012-08-23 10:21:39 -04:00
parent 9893282e43
commit 23e3f6137d
1 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,30 +24,30 @@ class Application_Model_StoredFile
* array of db metadata -> propel * array of db metadata -> propel
*/ */
private $_dbMD = array ( private $_dbMD = array (
"track_title" => "DbTrackTitle", "track_title" => "DbTrackTitle",
"artist_name" => "DbArtistName", "artist_name" => "DbArtistName",
"album_title" => "DbAlbumTitle", "album_title" => "DbAlbumTitle",
"genre" => "DbGenre", "genre" => "DbGenre",
"mood" => "DbMood", "mood" => "DbMood",
"track_number" => "DbTrackNumber", "track_number" => "DbTrackNumber",
"bpm" => "DbBpm", "bpm" => "DbBpm",
"label" => "DbLabel", "label" => "DbLabel",
"composer" => "DbComposer", "composer" => "DbComposer",
"encoded_by" => "DbEncodedBy", "encoded_by" => "DbEncodedBy",
"conductor" => "DbConductor", "conductor" => "DbConductor",
"year" => "DbYear", "year" => "DbYear",
"info_url" => "DbInfoUrl", "info_url" => "DbInfoUrl",
"isrc_number" => "DbIsrcNumber", "isrc_number" => "DbIsrcNumber",
"copyright" => "DbCopyright", "copyright" => "DbCopyright",
"length" => "DbLength", "length" => "DbLength",
"bit_rate" => "DbBitRate", "bit_rate" => "DbBitRate",
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"mime" => "DbMime", "mime" => "DbMime",
"md5" => "DbMd5", "md5" => "DbMd5",
"ftype" => "DbFtype", "ftype" => "DbFtype",
"language" => "DbLanguage", "language" => "DbLanguage",
"replay_gain" => "DbReplayGain", "replay_gain" => "DbReplayGain",
"directory" => "DbDirectory" "directory" => "DbDirectory"
); );
public function __construct() public function __construct()
@ -266,8 +266,8 @@ class Application_Model_StoredFile
foreach ($c['user'] as $constant => $value) { foreach ($c['user'] as $constant => $value) {
if (preg_match('/^MDATA_KEY/', $constant)) { if (preg_match('/^MDATA_KEY/', $constant)) {
if (isset($dbmd_copy[$value])) { if (isset($dbmd_copy[$value])) {
$propelColumn = $dbmd_copy[$value]; $propelColumn = $dbmd_copy[$value];
$method = "get$propelColumn"; $method = "get$propelColumn";
$md[$constant] = $this->_file->$method(); $md[$constant] = $this->_file->$method();
} }
} }
@ -594,31 +594,31 @@ class Application_Model_StoredFile
"language", "filepath" "language", "filepath"
); );
$plSelect = array(); $plSelect = array();
$blSelect = array(); $blSelect = array();
$fileSelect = array(); $fileSelect = array();
$streamSelect = array(); $streamSelect = array();
foreach ($displayColumns as $key) { foreach ($displayColumns as $key) {
if ($key === "id") { if ($key === "id") {
$plSelect[] = "PL.id AS ".$key; $plSelect[] = "PL.id AS ".$key;
$blSelect[] = "BL.id AS ".$key; $blSelect[] = "BL.id AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "ws.id AS ".$key; $streamSelect[] = "ws.id AS ".$key;
} elseif ($key === "track_title") { } elseif ($key === "track_title") {
$plSelect[] = "name AS ".$key; $plSelect[] = "name AS ".$key;
$blSelect[] = "name AS ".$key; $blSelect[] = "name AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "name AS ".$key; $streamSelect[] = "name AS ".$key;
} elseif ($key === "ftype") { } elseif ($key === "ftype") {
$plSelect[] = "'playlist'::varchar AS ".$key; $plSelect[] = "'playlist'::varchar AS ".$key;
$blSelect[] = "'block'::varchar AS ".$key; $blSelect[] = "'block'::varchar AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "'stream'::varchar AS ".$key; $streamSelect[] = "'stream'::varchar AS ".$key;
} elseif ($key === "artist_name") { } elseif ($key === "artist_name") {
$plSelect[] = "login AS ".$key; $plSelect[] = "login AS ".$key;
$blSelect[] = "login AS ".$key; $blSelect[] = "login AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "login AS ".$key; $streamSelect[] = "login AS ".$key;
} }
//same columns in each table. //same columns in each table.
@ -635,26 +635,26 @@ class Application_Model_StoredFile
} }
//need to cast certain data as ints for the union to search on. //need to cast certain data as ints for the union to search on.
else if (in_array($key, array("track_number", "bit_rate", "sample_rate", "bpm"))) { else if (in_array($key, array("track_number", "bit_rate", "sample_rate", "bpm"))) {
$plSelect[] = "NULL::int AS ".$key; $plSelect[] = "NULL::int AS ".$key;
$blSelect[] = "NULL::int AS ".$key; $blSelect[] = "NULL::int AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "NULL::int AS ".$key; $streamSelect[] = "NULL::int AS ".$key;
} else if ($key === "filepath") { } else if ($key === "filepath") {
$plSelect[] = "NULL::VARCHAR AS ".$key; $plSelect[] = "NULL::VARCHAR AS ".$key;
$blSelect[] = "NULL::VARCHAR AS ".$key; $blSelect[] = "NULL::VARCHAR AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "url AS ".$key; $streamSelect[] = "url AS ".$key;
} else { } else {
$plSelect[] = "NULL::text AS ".$key; $plSelect[] = "NULL::text AS ".$key;
$blSelect[] = "NULL::text AS ".$key; $blSelect[] = "NULL::text AS ".$key;
$fileSelect[] = $key; $fileSelect[] = $key;
$streamSelect[] = "NULL::text AS ".$key; $streamSelect[] = "NULL::text AS ".$key;
} }
} }
$plSelect = "SELECT ". join(",", $plSelect); $plSelect = "SELECT ". join(",", $plSelect);
$blSelect = "SELECT ". join(",", $blSelect); $blSelect = "SELECT ". join(",", $blSelect);
$fileSelect = "SELECT ". join(",", $fileSelect); $fileSelect = "SELECT ". join(",", $fileSelect);
$streamSelect = "SELECT ". join(",", $streamSelect); $streamSelect = "SELECT ". join(",", $streamSelect);
$type = intval($datatables["type"]); $type = intval($datatables["type"]);
@ -881,8 +881,8 @@ class Application_Model_StoredFile
// Check if liquidsoap can play this file // Check if liquidsoap can play this file
if(!self::liquidsoapFilePlayabilityTest($audio_file)) { if(!self::liquidsoapFilePlayabilityTest($audio_file)) {
return array( return array(
"code" => 110, "code" => 110,
"message" => "This file appears to be corrupted and will not "message" => "This file appears to be corrupted and will not
be added to media library."); be added to media library.");
} }
@ -895,12 +895,18 @@ class Application_Model_StoredFile
#warn the user that the file wasn't uploaded and they should check if there is enough disk space. #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($audio_file);//remove the file after failed rename
return array( return array(
"code" => 108, "code" => 108,
"message" => " "message" => "
The file was not uploaded, this error can occur if the computer The file was not uploaded, this error can occur if the computer
hard drive does not have enough disk space or the stor hard drive does not have enough disk space or the stor
directory does not have correct write permissions. "); 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();
if (file_put_contents($audio_stor,$uid) === false) {
Logging::info("Could write file to identify user: '$uid'");
}
return null; return null;
} }