|
@@ -99,8 +99,8 @@ discard block |
|
|
block discarded – undo |
|
99
|
99
|
foreach ($versionsOnFS as $version) { |
|
100
|
100
|
$versionEntity = new VersionEntity(); |
|
101
|
101
|
$versionEntity->setFileId($file->getId()); |
|
102
|
|
- $versionEntity->setTimestamp((int)$version['version']); |
|
103
|
|
- $versionEntity->setSize((int)$version['size']); |
|
|
102
|
+ $versionEntity->setTimestamp((int) $version['version']); |
|
|
103
|
+ $versionEntity->setSize((int) $version['size']); |
|
104
|
104
|
$versionEntity->setMimetype($this->mimeTypeLoader->getId($version['mimetype'])); |
|
105
|
105
|
$versionEntity->setMetadata([]); |
|
106
|
106
|
$this->versionsMapper->insert($versionEntity); |
|
@@ -135,16 +135,16 @@ discard block |
|
|
block discarded – undo |
|
135
|
135
|
public function createVersion(IUser $user, FileInfo $file) { |
|
136
|
136
|
$userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
137
|
137
|
$relativePath = $userFolder->getRelativePath($file->getPath()); |
|
138
|
|
- $userView = new View('/' . $user->getUID()); |
|
|
138
|
+ $userView = new View('/'.$user->getUID()); |
|
139
|
139
|
// create all parent folders |
|
140
|
140
|
Storage::createMissingDirectories($relativePath, $userView); |
|
141
|
141
|
|
|
142
|
142
|
Storage::scheduleExpire($user->getUID(), $relativePath); |
|
143
|
143
|
|
|
144
|
144
|
// store a new version of a file |
|
145
|
|
- $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
|
145
|
+ $userView->copy('files/'.$relativePath, 'files_versions/'.$relativePath.'.v'.$file->getMtime()); |
|
146
|
146
|
// ensure the file is scanned |
|
147
|
|
- $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
|
147
|
+ $userView->getFileInfo('files_versions/'.$relativePath.'.v'.$file->getMtime()); |
|
148
|
148
|
} |
|
149
|
149
|
|
|
150
|
150
|
public function rollback(IVersion $version) { |
|
@@ -166,7 +166,7 @@ discard block |
|
|
block discarded – undo |
|
166
|
166
|
public function read(IVersion $version) { |
|
167
|
167
|
$versions = $this->getVersionFolder($version->getUser()); |
|
168
|
168
|
/** @var File $file */ |
|
169
|
|
- $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId()); |
|
|
169
|
+ $file = $versions->get($version->getVersionPath().'.v'.$version->getRevisionId()); |
|
170
|
170
|
return $file->fopen('r'); |
|
171
|
171
|
} |
|
172
|
172
|
|
|
@@ -174,7 +174,7 @@ discard block |
|
|
block discarded – undo |
|
174
|
174
|
$userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
175
|
175
|
$versionFolder = $this->getVersionFolder($user); |
|
176
|
176
|
/** @var File $file */ |
|
177
|
|
- $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision); |
|
|
177
|
+ $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()).'.v'.$revision); |
|
178
|
178
|
return $file; |
|
179
|
179
|
} |
|
180
|
180
|
|