Skip to content

s3 external storage fixes #29220

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
skjnldsv merged 11 commits into from
Oct 22, 2021
Merged

s3 external storage fixes #29220

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
09ffac5
s3 external storage listing rework
icewind1991 Oct 13, 2021
5e3c8b3
doesDirectoryExist fixes
icewind1991 Oct 14, 2021
294af42
more reliable directory copy
icewind1991 Oct 14, 2021
294b218
ci
icewind1991 Oct 14, 2021
d3bd0b5
optimize filetype for s3 directories a bit
icewind1991 Oct 15, 2021
3463769
remove old migration method
icewind1991 Oct 15, 2021
4bd08af
more reliable hasUpdated for s3
icewind1991 Oct 15, 2021
55346b5
more reliable return value for Watcher::checkUpdate
icewind1991 Oct 15, 2021
247e12d
always set Key field in `headObject`
icewind1991 Oct 15, 2021
eb6e6e3
minor directory detect improvements
icewind1991 Oct 19, 2021
a1ca901
cache versioning enabled status
icewind1991 Oct 19, 2021
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
always set Key field in headObject 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Oct 15, 2021
commit 247e12da966aeceb833e8c60b833e089bee89f8a
4 changes: 3 additions & 1 deletion apps/files_external/lib/Lib/Storage/AmazonS3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ private function headObject($key) {
}
}

if (is_array($this->objectCache[$key]) && !isset($this->objectCache[$key]["Key"])) {
$this->objectCache[$key]["Key"] = $key;
}
return $this->objectCache[$key];
}

Expand Down Expand Up @@ -345,7 +348,6 @@ public function stat($path) {
if ($object === false) {
return false;
}
$object["Key"] = $path;
$stat = $this->objectToMetaData($object);
}
$stat['atime'] = time();
Expand Down