Merge pull request #48793 from nextcloud/dav-open-log-path

This commit is contained in:
John Molakvoæ 2024-12-04 20:18:17 +01:00 committed by GitHub
commit 6669c495d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -458,14 +458,19 @@ class File extends Node implements IFile {
// do a if the file did not exist
throw new NotFound();
}
$path = ltrim($this->path, '/');
try {
$res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
$res = $this->fileView->fopen($path, 'rb');
} catch (\Exception $e) {
$this->convertToSabreException($e);
}
if ($res === false) {
throw new ServiceUnavailable($this->l10n->t('Could not open file'));
if ($this->fileView->file_exists($path)) {
throw new ServiceUnavailable($this->l10n->t('Could not open file: %1$s, file does seem to exist', [$path]));
} else {
throw new ServiceUnavailable($this->l10n->t('Could not open file: %1$s, file doesn\'t seem to exist', [$path]));
}
}
// comparing current file size with the one in DB