Skip to content

[stable10] Store new dav chunks directly, no hooks #28817

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
PVince81 merged 3 commits into from
Aug 29, 2017
Merged

[stable10] Store new dav chunks directly, no hooks #28817

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b2b066
Store new dav chunks directly, no hooks
Aug 24, 2017
2011c95
Adjust checksum tests for new dav chunking
Aug 25, 2017
6428fab
Directory::createFileDirectly
Aug 28, 2017
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
Directory::createFileDirectly
  • Loading branch information
Vincent Petry committed Aug 28, 2017
commit 6428fab13bb50ab969a6b5a7af6d99bcaf3a131c
10 changes: 10 additions & 0 deletions apps/dav/lib/Connector/Sabre/Directory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,4 +461,14 @@ public function moveInto($targetName, $fullSourcePath, INode $sourceNode) {

return true;
}

/**
* Create a file directly, bypassing the hooks
*
* @param string $name name
* @param resource $data data
*/
public function createFileDirectly($name, $data) {
$this->fileView->file_put_contents($this->getPath() . '/' . $name, $data);
}
}
5 changes: 0 additions & 5 deletions apps/dav/lib/Connector/Sabre/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,4 @@ protected function sanitizeMtime ($mtimeFromRequest) {
}
return $mtime;
}

public function getView() {
return $this->fileView;
}

}
4 changes: 2 additions & 2 deletions apps/dav/lib/Upload/UploadFolder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ function __construct(Directory $node) {
}

function createFile($name, $data = null) {
$view = $this->node->getView();
$view->file_put_contents($this->node->getPath() . '/' . $name, $data);
// need to bypass hooks for individual chunks
$this->node->createFileDirectly($name, $data);
}

function createDirectory($name) {
Expand Down