Skip to content

rework: follow file mime if accepted #37

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
ylebre merged 1 commit into from
Jun 23, 2026
+22 −14
Merged

rework: follow file mime if accepted #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 22 additions & 14 deletions src/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private function handle(string $method, string $path, $contents, $request): Resp
break;
case 'GET':
case 'HEAD':
$mime = $this->getRequestedMimeType($request->getHeaderLine("Accept"));
$mime = $this->getRequestedMimeTypes($request->getHeaderLine("Accept"));
$response = $this->handleReadRequest($response, $path, $contents, $mime);
if ($method === 'HEAD') {
$response->getBody()->rewind();
Expand Down Expand Up @@ -672,27 +672,29 @@ private function handleUpdateRequest(Response $response, string $path, string $c
return $response;
}

private function getRequestedMimeType($accept)
private function getRequestedMimeTypes($accept)
{
$requestedTypes = [];

// text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
$mimes = explode(",", $accept);
foreach ($mimes as $mime) {
$parts = explode(";", $mime);
$mimeInfo = $parts[0];
switch ($mimeInfo) {
case "text/turtle": // turtle
case "application/ld+json": //json
case "application/rdf+xml": //rdf
return $mimeInfo;
break;
}
$parts = explode(";", $mime);
$mimeInfo = $parts[0];
$requestedTypes[] = $mimeInfo;
}
return '';
return $requestedTypes;
}

private function handleReadRequest(Response $response, string $path, $contents, $mime=''): Response
private function handleReadRequest(Response $response, string $path, $contents, $acceptedMimeTypes=[]): Response
{
$filesystem = $this->filesystem;
if (empty($acceptedMimeTypes)) {
$mime = '';
} else {
$mime = $acceptedMimeTypes[0];
}

if ($path === "/") { // FIXME: this is a patch to make it work for Solid-Nextcloud; we should be able to just list '/';
$contents = $this->listDirectoryAsTurtle($path);
$response->getBody()->write($contents);
Expand Down Expand Up @@ -734,7 +736,13 @@ private function handleReadRequest(Response $response, string $path, $contents,
$mimetype = $filesystem->asMime($mime)->getMimetype($path);
}

$contents = $filesystem->asMime($mime)->read($path);
$fileMimeType = $filesystem->asMime('')->getMimetype($path);
if (in_array($fileMimeType, $acceptedMimeTypes)) {
$contents = $filesystem->asMime('')->read($path);
$mimetype = $fileMimeType;
} else {
$contents = $filesystem->asMime($mime)->read($path);
}

if ($contents !== false) {
$response->getBody()->write($contents);
Expand Down
Loading