|
@@ -51,7 +51,7 @@ discard block |
|
|
block discarded – undo |
|
51
|
51
|
if ($storage->instanceOfStorage(ISharedStorage::class)) { |
|
52
|
52
|
$owner = $storage->getOwner(''); |
|
53
|
53
|
if ($owner === false) { |
|
54
|
|
- throw new NotFoundException('No owner for ' . $file->getPath()); |
|
|
54
|
+ throw new NotFoundException('No owner for '.$file->getPath()); |
|
55
|
55
|
} |
|
56
|
56
|
|
|
57
|
57
|
$user = $this->userManager->get($owner); |
|
@@ -84,11 +84,11 @@ discard block |
|
|
block discarded – undo |
|
84
|
84
|
// Insert entries in the DB for existing versions. |
|
85
|
85
|
$relativePath = $userFolder->getRelativePath($file->getPath()); |
|
86
|
86
|
if ($relativePath === null) { |
|
87
|
|
- throw new NotFoundException("Relative path not found for file $fileId (" . $file->getPath() . ')'); |
|
|
87
|
+ throw new NotFoundException("Relative path not found for file $fileId (".$file->getPath().')'); |
|
88
|
88
|
} |
|
89
|
89
|
|
|
90
|
90
|
$currentVersion = [ |
|
91
|
|
- 'version' => (string)$file->getMtime(), |
|
|
91
|
+ 'version' => (string) $file->getMtime(), |
|
92
|
92
|
'size' => $file->getSize(), |
|
93
|
93
|
'mimetype' => $file->getMimetype(), |
|
94
|
94
|
]; |
|
@@ -118,8 +118,8 @@ discard block |
|
|
block discarded – undo |
|
118
|
118
|
if (empty($versions['db']) && !empty($versions['fs'])) { |
|
119
|
119
|
$versions['db'] = new VersionEntity(); |
|
120
|
120
|
$versions['db']->setFileId($fileId); |
|
121
|
|
- $versions['db']->setTimestamp((int)$versions['fs']['version']); |
|
122
|
|
- $versions['db']->setSize((int)$versions['fs']['size']); |
|
|
121
|
+ $versions['db']->setTimestamp((int) $versions['fs']['version']); |
|
|
122
|
+ $versions['db']->setSize((int) $versions['fs']['size']); |
|
123
|
123
|
$versions['db']->setMimetype($this->mimeTypeLoader->getId($versions['fs']['mimetype'])); |
|
124
|
124
|
$versions['db']->setMetadata([]); |
|
125
|
125
|
$this->versionsMapper->insert($versions['db']); |
|
@@ -150,16 +150,16 @@ discard block |
|
|
block discarded – undo |
|
150
|
150
|
public function createVersion(IUser $user, FileInfo $file) { |
|
151
|
151
|
$userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
152
|
152
|
$relativePath = $userFolder->getRelativePath($file->getPath()); |
|
153
|
|
- $userView = new View('/' . $user->getUID()); |
|
|
153
|
+ $userView = new View('/'.$user->getUID()); |
|
154
|
154
|
// create all parent folders |
|
155
|
155
|
Storage::createMissingDirectories($relativePath, $userView); |
|
156
|
156
|
|
|
157
|
157
|
Storage::scheduleExpire($user->getUID(), $relativePath); |
|
158
|
158
|
|
|
159
|
159
|
// store a new version of a file |
|
160
|
|
- $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
|
160
|
+ $userView->copy('files/'.$relativePath, 'files_versions/'.$relativePath.'.v'.$file->getMtime()); |
|
161
|
161
|
// ensure the file is scanned |
|
162
|
|
- $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
|
162
|
+ $userView->getFileInfo('files_versions/'.$relativePath.'.v'.$file->getMtime()); |
|
163
|
163
|
} |
|
164
|
164
|
|
|
165
|
165
|
public function rollback(IVersion $version) { |
|
@@ -185,7 +185,7 @@ discard block |
|
|
block discarded – undo |
|
185
|
185
|
public function read(IVersion $version) { |
|
186
|
186
|
$versions = $this->getVersionFolder($version->getUser()); |
|
187
|
187
|
/** @var File $file */ |
|
188
|
|
- $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId()); |
|
|
188
|
+ $file = $versions->get($version->getVersionPath().'.v'.$version->getRevisionId()); |
|
189
|
189
|
return $file->fopen('r'); |
|
190
|
190
|
} |
|
191
|
191
|
|
|
@@ -208,7 +208,7 @@ discard block |
|
|
block discarded – undo |
|
208
|
208
|
|
|
209
|
209
|
$versionFolder = $this->getVersionFolder($user); |
|
210
|
210
|
/** @var File $file */ |
|
211
|
|
- $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision); |
|
|
211
|
+ $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()).'.v'.$revision); |
|
212
|
212
|
return $file; |
|
213
|
213
|
} |
|
214
|
214
|
|
|
@@ -328,10 +328,10 @@ discard block |
|
|
block discarded – undo |
|
328
|
328
|
$relativePath = $userFolder->getRelativePath($target->getPath()); |
|
329
|
329
|
|
|
330
|
330
|
if ($relativePath === null) { |
|
331
|
|
- throw new \Exception('Target does not have a relative path' . $target->getPath()); |
|
|
331
|
+ throw new \Exception('Target does not have a relative path'.$target->getPath()); |
|
332
|
332
|
} |
|
333
|
333
|
|
|
334
|
|
- $userView = new View('/' . $user->getUID()); |
|
|
334
|
+ $userView = new View('/'.$user->getUID()); |
|
335
|
335
|
// create all parent folders |
|
336
|
336
|
Storage::createMissingDirectories($relativePath, $userView); |
|
337
|
337
|
Storage::scheduleExpire($user->getUID(), $relativePath); |
|
@@ -342,7 +342,7 @@ discard block |
|
|
block discarded – undo |
|
342
|
342
|
if ($version->getTimestamp() !== $source->getMTime()) { |
|
343
|
343
|
$backend = $version->getBackend(); |
|
344
|
344
|
$versionFile = $backend->getVersionFile($user, $source, $version->getRevisionId()); |
|
345
|
|
- $newVersionPath = 'files_versions/' . $relativePath . '.v' . $version->getTimestamp(); |
|
|
345
|
+ $newVersionPath = 'files_versions/'.$relativePath.'.v'.$version->getTimestamp(); |
|
346
|
346
|
|
|
347
|
347
|
$versionContent = $versionFile->fopen('r'); |
|
348
|
348
|
if ($versionContent === false) { |
|
@@ -377,14 +377,14 @@ discard block |
|
|
block discarded – undo |
|
377
|
377
|
|
|
378
|
378
|
$relativePath = $userFolder->getRelativePath($source->getPath()); |
|
379
|
379
|
if ($relativePath === null) { |
|
380
|
|
- throw new Exception('Relative path not found for node with path: ' . $source->getPath()); |
|
|
380
|
+ throw new Exception('Relative path not found for node with path: '.$source->getPath()); |
|
381
|
381
|
} |
|
382
|
382
|
|
|
383
|
383
|
$versionFolder = $this->getVersionFolder($user); |
|
384
|
384
|
|
|
385
|
385
|
$versions = Storage::getVersions($userId, $relativePath); |
|
386
|
386
|
foreach ($versions as $version) { |
|
387
|
|
- $versionFolder->get($version['path'] . '.v' . (int)$version['version'])->delete(); |
|
|
387
|
+ $versionFolder->get($version['path'].'.v'.(int) $version['version'])->delete(); |
|
388
|
388
|
} |
|
389
|
389
|
|
|
390
|
390
|
$this->versionsMapper->deleteAllVersionsForFileId($target->getId()); |