Public/pics
2
2
Fork 2
Code Issues 6 Pull Requests 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 +5 -11
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b7e83e11e - Show all commits

16
controllers/Download.php
View File

@ -29,22 +29,16 @@ class Download
exit;
}
private function exportAlbum($album)
private function exportAlbum(Tag $album)
{
$files = [];
$album_ids = array_merge([$album->id_tag], $this->getChildAlbumIds($album->id_tag));
foreach($album_ids as $album_id)
{
$iterator = AssetIterator::getByOptions(
[
'id_tag' => $album_id
]
);
while($asset = $iterator->Next())
{
$files[] = join(DIRECTORY_SEPARATOR, ['.', $asset->getSubdir(), $asset->getFilename()]);
}
$iterator = AssetIterator::getByOptions(['id_tag' => $album_id]);
while ($asset = $iterator->next())
$files[] = join(DIRECTORY_SEPARATOR, [$asset->getSubdir(), $asset->getFilename()]);
}
$descriptorspec = [
@ -52,7 +46,7 @@ class Download
1 => ['pipe', 'w'],
];
$command = 'tar --null -cf - -T -';
$command = 'tar -cf - -C ' . escapeshellarg(ASSETSDIR) . ' --null -T -';
$proc = proc_open($command, $descriptorspec, $pipes, ASSETSDIR);