Public/pics
2
2
Fork 2
Code Issues 6 Pull Requests 2 Releases Wiki Activity

Rework album/tag downloads #19

Merged
Roflin merged 6 commits from tag-download into master 2020-03-11 20:04:31 +01:00
Conversation 0 Commits 6 Files Changed 1 +8 -28
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 354e54a0af - Show all commits

36
controllers/Download.php
View File

@ -6,7 +6,7 @@
* Kabuki CMS (C) 2013-2019, Aaron van Geffen
*****************************************************************************/
class Download extends HTMLController
class Download
{
public function __construct()
{
@ -15,38 +15,18 @@ class Download extends HTMLController
if (!$user->isLoggedIn())
throw new NotAllowedException();
if(!isset($_GET['tag']))
throw new UnexpectedValueException('Must specify an album to download');
if (!isset($_GET['tag']))
throw new UserFacingException('No album or tag has been specified for download.');
$tag = (int)$_GET['tag'];
$album = Tag::fromId($tag);
if($album->kind !== 'Album')
throw new UnexpectedValueException('Specified tag does not correspond to an album');
if (isset($_SESSION['current_export']))
Roflin commented 2020-03-11 12:50:24 +01:00
Review
Copy Link

Ik zie deze check, maar ik zie niet waar deze session variable geset word? Of mis ik iets.

Ik zie deze check, maar ik zie niet waar deze session variable geset word? Of mis ik iets.
Aaron commented 2020-03-11 17:11:45 +01:00
Review
Copy Link

Oef, terecht. Ik vermoed dat ik die ben verloren in een overijverige rebase. Gaan we fixen.

Oef, terecht. Ik vermoed dat ik die ben verloren in een overijverige rebase. Gaan we fixen.
throw new UserFacingException('An export of "' . $tag->tag . '" is ongoing. Please try again later.');
//Yes TOCTOU but it does not need to be perfect.
$lock_file = join('/', [sys_get_temp_dir(), 'pics-export.lock']);
if(!file_exists($lock_file))
{
try
{
$fp = fopen($lock_file, 'x');
if(!$fp)
throw new UnexpectedValueException('Could not open lock-file');
$this->exportAlbum($album);
}
finally
{
fclose($fp);
unlink($lock_file);
}
}
else
throw new UnexpectedValueException('Another export is busy, please try again later');
exit();
// So far so good?
$this->exportAlbum($album);
exit;
}
private function exportAlbum($album)