versions provide more information when throwing hooks
This commit is contained in:
parent
97b2e19c78
commit
b6e03fe261
|
@ -210,9 +210,9 @@ class Storage {
|
||||||
$versions = self::getVersions($uid, $filename);
|
$versions = self::getVersions($uid, $filename);
|
||||||
if (!empty($versions)) {
|
if (!empty($versions)) {
|
||||||
foreach ($versions as $v) {
|
foreach ($versions as $v) {
|
||||||
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path . $v['version']));
|
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path . $v['version'], 'trigger' => 'master file deleted'));
|
||||||
self::deleteVersion($view, $filename . '.v' . $v['version']);
|
self::deleteVersion($view, $filename . '.v' . $v['version']);
|
||||||
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path . $v['version']));
|
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path . $v['version'], 'trigger' => 'master file deleted'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -309,6 +309,7 @@ class Storage {
|
||||||
Storage::scheduleExpire($uid, $file);
|
Storage::scheduleExpire($uid, $file);
|
||||||
\OC_Hook::emit('\OCP\Versions', 'rollback', array(
|
\OC_Hook::emit('\OCP\Versions', 'rollback', array(
|
||||||
'path' => $filename,
|
'path' => $filename,
|
||||||
|
'revision' => $revision,
|
||||||
));
|
));
|
||||||
return true;
|
return true;
|
||||||
} else if ($versionCreated) {
|
} else if ($versionCreated) {
|
||||||
|
@ -444,9 +445,9 @@ class Storage {
|
||||||
$view = new \OC\Files\View('/' . $uid . '/files_versions');
|
$view = new \OC\Files\View('/' . $uid . '/files_versions');
|
||||||
if (!empty($toDelete)) {
|
if (!empty($toDelete)) {
|
||||||
foreach ($toDelete as $version) {
|
foreach ($toDelete as $version) {
|
||||||
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));
|
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => 'retention constraint'));
|
||||||
self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
|
self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
|
||||||
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version']));
|
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => 'retention constraint'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -705,9 +706,9 @@ class Storage {
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($toDelete as $key => $path) {
|
foreach($toDelete as $key => $path) {
|
||||||
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path));
|
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path, 'trigger' => 'versions quota exceeded'));
|
||||||
self::deleteVersion($versionsFileview, $path);
|
self::deleteVersion($versionsFileview, $path);
|
||||||
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path));
|
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path, 'trigger' => 'versions quota exceeded'));
|
||||||
unset($allVersions[$key]); // update array with the versions we keep
|
unset($allVersions[$key]); // update array with the versions we keep
|
||||||
\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::DEBUG);
|
\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::DEBUG);
|
||||||
}
|
}
|
||||||
|
@ -722,9 +723,9 @@ class Storage {
|
||||||
reset($allVersions);
|
reset($allVersions);
|
||||||
while ($availableSpace < 0 && $i < $numOfVersions) {
|
while ($availableSpace < 0 && $i < $numOfVersions) {
|
||||||
$version = current($allVersions);
|
$version = current($allVersions);
|
||||||
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));
|
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => 'versions quota exceeded'));
|
||||||
self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
|
self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
|
||||||
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version']));
|
\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => 'versions quota exceeded'));
|
||||||
\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::DEBUG);
|
\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::DEBUG);
|
||||||
$versionsSize -= $version['size'];
|
$versionsSize -= $version['size'];
|
||||||
$availableSpace += $version['size'];
|
$availableSpace += $version['size'];
|
||||||
|
|
|
@ -652,7 +652,9 @@ class Test_Files_Versioning extends \Test\TestCase {
|
||||||
'path' => '/sub/test.txt',
|
'path' => '/sub/test.txt',
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->assertEquals($expectedParams, $params);
|
$this->assertEquals($expectedParams['path'], $params['path']);
|
||||||
|
$this->assertTrue(array_key_exists('revision', $params));
|
||||||
|
$this->assertTrue($params['revision'] > 0);
|
||||||
|
|
||||||
$this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
|
$this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
|
||||||
$info2 = $this->rootView->getFileInfo($filePath);
|
$info2 = $this->rootView->getFileInfo($filePath);
|
||||||
|
|
Loading…
Reference in New Issue