Skip to content

Prefix $path for filename for internal file cache #14211

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 2 commits into from
Feb 19, 2019
Merged

Prefix $path for filename for internal file cache #14211

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659ed3e
Prefix $path for filename for internal file cache
kesselb Feb 14, 2019
0d667d1
Call headObject if file not in filecache :see_no_evil:
kesselb Feb 14, 2019
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
4 changes: 2 additions & 2 deletions 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 @@ -309,7 +309,7 @@ public function opendir($path) {
$files[] = $file;

// store this information for later usage
$this->filesCache[$file] = [
$this->filesCache[$path . $file] = [
'ContentLength' => $object['Size'],
'LastModified' => (string)$object['LastModified'],
];
Expand Down Expand Up @@ -408,7 +408,7 @@ public function filetype($path) {
}

try {
if ($this->headObject($path)) {
if (isset($this->filesCache[$path]) && $this->headObject($path)) {
Copy link
Member

@icewind1991 icewind1991 Feb 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reasoning here?

Copy link
Contributor Author

@kesselb kesselb Feb 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If filesCache has been populated by opendir we already know that path is a file or not without calling headObject. If you wonder about "only call headObject if $path isset in filescache" 0d667d1

return 'file';
}
if ($this->headObject($path . '/')) {
Expand Down