Skip to content

Commit

Permalink
Merge pull request #48793 from nextcloud/dav-open-log-path
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Dec 4, 2024
2 parents c2f474f + ca241ba commit 6669c49
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions apps/dav/lib/Connector/Sabre/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -458,14 +458,19 @@ public function get() {
// 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
Expand Down

0 comments on commit 6669c49

Please sign in to comment.