Skip to content

Add the mimetype to the preview arrays #300

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
MorrisJobke merged 3 commits into from
Nov 7, 2018
Merged

Add the mimetype to the preview arrays #300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45f7a8b
Add the mimetype to the preview arrays
nickvergessen Oct 11, 2018
09446c2
Add the view and the fileId too
nickvergessen Oct 11, 2018
190f6c8
Adjust unit tests
nickvergessen Nov 7, 2018
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
Add the view and the fileId too 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Nov 7, 2018
commit 09446c23ef05204e7372872979f85e29c4f6d9c1
19 changes: 12 additions & 7 deletions docs/endpoint-v2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ Field name | Type | Value description
`source` | string | Full URL of the image to be displayed
`link` | string | Full URL the preview should be wrapped in
`mimeType` | string | The mime type of the file (not the preview)
`fileId` | int | The if of the actual file
`view` | string | The view where the file can be found (either `files` or `trashbin`)
`isMimeTypeIcon` | bool | True if `source` points to a mime type icon instead of a real preview

In case the endpoint returns more fields, they should be ignored and are deprecated (only for backwards compatibility usage) or internal.
Expand All @@ -113,15 +115,15 @@ In case the endpoint returns more fields, they should be ignored and are depreca
"type": "file_created",
"user": "test1",
"affecteduser": "admin",
"subject": "test1 created hello.jpg",
"subject": "test1 created hello.txt",
"subject_rich": {
"0": "test1 created {file1}",
"1": {
"file1": {
"type": "file",
"id": 23,
"name": "hello.jpg",
"path": "\/test\/hello.jpg"
"name": "hello.txt",
"path": "\/test\/hello.txt"
}
}
},
Expand All @@ -134,12 +136,15 @@ In case the endpoint returns more fields, they should be ignored and are depreca
"link": "",
"object_type": "files",
"object_id": 23,
"object_name": "\/test\/hello.jpg",
"object_name": "\/test\/hello.txt",
"previews": [
{
"link": "https:\/\/localhost\/index.php\/apps\/files\/?dir=\/test&scrollto=hello.jpg",
"source": "https:\/\/localhost\/index.php\/core\/preview.png?file=\/hello.jpg&x=150&y=150",
"isMimeTypeIcon": false
"link": "https:\/\/localhost\/index.php\/apps\/files\/?dir=\/test&scrollto=hello.txt",
"source": "https:\/\/localhost\/index.php\/core\/preview.png?file=\/hello.txt&x=150&y=150",
"mimeType": "text/plain",
"view": "files",
"fileId": 23,
"isMimeTypeIcon": false
}
]
}
Expand Down
10 changes: 7 additions & 3 deletions lib/Controller/APIv2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,16 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr
$info = $this->infoCache->getInfoById($owner, $fileId, $filePath);

if (!$info['exists'] || $info['view'] !== '') {
return $this->getPreviewFromPath($filePath, $info);
return $this->getPreviewFromPath($fileId, $filePath, $info);
}

$preview = [
'link' => $this->getPreviewLink($info['path'], $info['is_dir'], $info['view']),
'source' => '',
'mimeType' => 'application/octet-stream',
'isMimeTypeIcon' => true,
'fileId' => $fileId,
'view' => $info['view'] ?: 'files',
];

// show a preview image if the file still exists
Expand All @@ -371,7 +373,7 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr
$this->view->chroot('/' . $owner . '/files');
$fileInfo = $this->view->getFileInfo($info['path']);
if (!$fileInfo instanceof FileInfo) {
$preview = $this->getPreviewFromPath($filePath, $info);
$preview = $this->getPreviewFromPath($fileId, $filePath, $info);
} else if ($this->preview->isAvailable($fileInfo)) {
$preview['source'] = $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreview', [
'file' => $info['path'],
Expand All @@ -390,13 +392,15 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr
return $preview;
}

protected function getPreviewFromPath(string $filePath, array $info): array {
protected function getPreviewFromPath(int $fileId, string $filePath, array $info): array {
$mimeType = $info['is_dir'] ? 'dir' : $this->mimeTypeDetector->detectPath($filePath);
return [
'link' => $this->getPreviewLink($info['path'], $info['is_dir'], $info['view']),
'source' => $this->getPreviewPathFromMimeType($mimeType),
'mimeType' => $mimeType,
'isMimeTypeIcon' => true,
'fileId' => $fileId,
'view' => $info['view'] ?: 'files',
];
}

Expand Down