Skip to content

Add Albums view #1142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 12 commits into from
Aug 23, 2022
Merged

Add Albums view #1142

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
10f44aa
add album database management bits
icewind1991 Jul 29, 2022
4aa8a0a
retreive more metadata for album files
icewind1991 Aug 1, 2022
3cd7fed
dav api
icewind1991 Aug 1, 2022
62dbf99
use unique filenames in albums
icewind1991 Aug 2, 2022
9c68a0f
fix copyright headers
icewind1991 Aug 8, 2022
3b62ffb
better error for duplicate
icewind1991 Aug 8, 2022
6bb2c7a
cast to int
icewind1991 Aug 8, 2022
fe215a8
expose more metadata
icewind1991 Aug 12, 2022
f4dea80
store album location and last added photo
icewind1991 Aug 12, 2022
ef3780d
expose location and last-photo in dav
icewind1991 Aug 12, 2022
0f2bcda
Bump @nextcloud/axios from 1.9.0 to 1.10.0
dependabot[bot] Apr 30, 2022
c8bf3a5
Add Albums view
artonge Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cast to int 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@icewind1991 @artonge
icewind1991 authored and artonge committed Aug 22, 2022
commit 6bb2c7a864fd9a6ba3ce96cc9e2f42daba635011
6 changes: 3 additions & 3 deletions lib/Album/AlbumMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function getForUser(string $userId): array {
->where($query->expr()->eq('user', $query->createNamedParameter($userId)));
$rows = $query->executeQuery()->fetchAll();
return array_map(function (array $row) use ($userId) {
return new AlbumInfo($row['album_id'], $userId, $row['name']);
return new AlbumInfo((int)$row['album_id'], $userId, $row['name']);
}, $rows);
}

Expand Down Expand Up @@ -120,11 +120,11 @@ public function getForUserWithFiles(string $userId): array {
$filesByAlbum = [];
$albumsById = [];
foreach ($rows as $row) {
$albumId = $row['album_id'];
$albumId = (int)$row['album_id'];
if ($row['fileid']) {
$mimeId = $row['mimetype'];
$mimeType = $this->mimeTypeLoader->getMimetypeById($mimeId);
$filesByAlbum[$albumId][] = new AlbumFile($row['fileid'], $row['file_name'], $mimeType, $row['size'], $row['mtime'], $row['etag']);
$filesByAlbum[$albumId][] = new AlbumFile((int)$row['fileid'], $row['file_name'], $mimeType, (int)$row['size'], (int)$row['mtime'], $row['etag']);
}

if (!isset($albumsById[$albumId])) {
Expand Down