PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-01-31 03:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed caching

Browse source
This commit is contained in:
nelsonlaquet 2013-09-01 14:28:29 -05:00
parent 2604cdce47
commit f4ee6c8add
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/controllers/TracksController.php
View file

@ -75,14 +75,22 @@
ResourceLogItem::logItem('track', $id, ResourceLogItem::PLAY, $format['index']); ResourceLogItem::logItem('track', $id, ResourceLogItem::PLAY, $format['index']);
$response = Response::make('', 200); $response = Response::make('', 200);
$filename = $track->getFileFor('MP3');
if (Config::get('app.sendfile')) { if (Config::get('app.sendfile')) {
$response->header('X-Sendfile', $track->getFileFor('MP3')); $response->header('X-Sendfile', $filename);
} else { } else {
$response->header('X-Accel-Redirect', $track->getFileFor('MP3')); $response->header('X-Accel-Redirect', $filename);
} }
$response->header('Content-Disposition', 'filename="' . $track->getFilenameFor('MP3') . '"'); $time = gmdate(filemtime($filename));
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $time == $_SERVER['HTTP_IF_MODIFIED_SINCE']) {
header('HTTP/1.0 304 Not Modified');
exit();
}
$response->header('Last-Modified', $time);
$response->header('Content-Type', $format['mime_type']); $response->header('Content-Type', $format['mime_type']);
return $response; return $response;
@ -110,15 +118,24 @@
ResourceLogItem::logItem('track', $id, ResourceLogItem::DOWNLOAD, $format['index']); ResourceLogItem::logItem('track', $id, ResourceLogItem::DOWNLOAD, $format['index']);
$response = Response::make('', 200); $response = Response::make('', 200);
$filename = $track->getFileFor($format);
if (Config::get('app.sendfile')) { if (Config::get('app.sendfile')) {
$response->header('X-Sendfile', $track->getFileFor('MP3')); $response->header('X-Sendfile', $filename);
$response->header('Content-Disposition', 'attachment; filename="' . $track->getDownloadFilenameFor($formatName) . '"'); $response->header('Content-Disposition', 'attachment; filename="' . $track->getDownloadFilenameFor($formatName) . '"');
} else { } else {
$response->header('X-Accel-Redirect', $track->getFileFor('MP3')); $response->header('X-Accel-Redirect', $filename);
$response->header('Content-Disposition', 'attachment; filename=' . $track->getDownloadFilenameFor($formatName)); $response->header('Content-Disposition', 'attachment; filename=' . $track->getDownloadFilenameFor($formatName));
} }
$time = gmdate(filemtime($filename));
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $time == $_SERVER['HTTP_IF_MODIFIED_SINCE']) {
header('HTTP/1.0 304 Not Modified');
exit();
}
$response->header('Last-Modified', $time);
$response->header('Content-Type', $format['mime_type']); $response->header('Content-Type', $format['mime_type']);
return $response; return $response;