@@ -29,118 +29,118 @@ |
||
29 | 29 | * |
30 | 30 | */ |
31 | 31 | class OC_Hook{ |
32 | - public static $thrownExceptions = []; |
|
32 | + public static $thrownExceptions = []; |
|
33 | 33 | |
34 | - static private $registered = array(); |
|
34 | + static private $registered = array(); |
|
35 | 35 | |
36 | - /** |
|
37 | - * connects a function to a hook |
|
38 | - * |
|
39 | - * @param string $signalClass class name of emitter |
|
40 | - * @param string $signalName name of signal |
|
41 | - * @param string|object $slotClass class name of slot |
|
42 | - * @param string $slotName name of slot |
|
43 | - * @return bool |
|
44 | - * |
|
45 | - * This function makes it very easy to connect to use hooks. |
|
46 | - * |
|
47 | - * TODO: write example |
|
48 | - */ |
|
49 | - static public function connect($signalClass, $signalName, $slotClass, $slotName ) { |
|
50 | - // If we're trying to connect to an emitting class that isn't |
|
51 | - // yet registered, register it |
|
52 | - if( !array_key_exists($signalClass, self::$registered )) { |
|
53 | - self::$registered[$signalClass] = array(); |
|
54 | - } |
|
55 | - // If we're trying to connect to an emitting method that isn't |
|
56 | - // yet registered, register it with the emitting class |
|
57 | - if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
58 | - self::$registered[$signalClass][$signalName] = array(); |
|
59 | - } |
|
36 | + /** |
|
37 | + * connects a function to a hook |
|
38 | + * |
|
39 | + * @param string $signalClass class name of emitter |
|
40 | + * @param string $signalName name of signal |
|
41 | + * @param string|object $slotClass class name of slot |
|
42 | + * @param string $slotName name of slot |
|
43 | + * @return bool |
|
44 | + * |
|
45 | + * This function makes it very easy to connect to use hooks. |
|
46 | + * |
|
47 | + * TODO: write example |
|
48 | + */ |
|
49 | + static public function connect($signalClass, $signalName, $slotClass, $slotName ) { |
|
50 | + // If we're trying to connect to an emitting class that isn't |
|
51 | + // yet registered, register it |
|
52 | + if( !array_key_exists($signalClass, self::$registered )) { |
|
53 | + self::$registered[$signalClass] = array(); |
|
54 | + } |
|
55 | + // If we're trying to connect to an emitting method that isn't |
|
56 | + // yet registered, register it with the emitting class |
|
57 | + if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
58 | + self::$registered[$signalClass][$signalName] = array(); |
|
59 | + } |
|
60 | 60 | |
61 | - // don't connect hooks twice |
|
62 | - foreach (self::$registered[$signalClass][$signalName] as $hook) { |
|
63 | - if ($hook['class'] === $slotClass and $hook['name'] === $slotName) { |
|
64 | - return false; |
|
65 | - } |
|
66 | - } |
|
67 | - // Connect the hook handler to the requested emitter |
|
68 | - self::$registered[$signalClass][$signalName][] = array( |
|
69 | - "class" => $slotClass, |
|
70 | - "name" => $slotName |
|
71 | - ); |
|
61 | + // don't connect hooks twice |
|
62 | + foreach (self::$registered[$signalClass][$signalName] as $hook) { |
|
63 | + if ($hook['class'] === $slotClass and $hook['name'] === $slotName) { |
|
64 | + return false; |
|
65 | + } |
|
66 | + } |
|
67 | + // Connect the hook handler to the requested emitter |
|
68 | + self::$registered[$signalClass][$signalName][] = array( |
|
69 | + "class" => $slotClass, |
|
70 | + "name" => $slotName |
|
71 | + ); |
|
72 | 72 | |
73 | - // No chance for failure ;-) |
|
74 | - return true; |
|
75 | - } |
|
73 | + // No chance for failure ;-) |
|
74 | + return true; |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * emits a signal |
|
79 | - * |
|
80 | - * @param string $signalClass class name of emitter |
|
81 | - * @param string $signalName name of signal |
|
82 | - * @param mixed $params default: array() array with additional data |
|
83 | - * @return bool true if slots exists or false if not |
|
84 | - * @throws \OC\HintException |
|
85 | - * @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references! |
|
86 | - * |
|
87 | - * TODO: write example |
|
88 | - */ |
|
89 | - static public function emit($signalClass, $signalName, $params = []) { |
|
77 | + /** |
|
78 | + * emits a signal |
|
79 | + * |
|
80 | + * @param string $signalClass class name of emitter |
|
81 | + * @param string $signalName name of signal |
|
82 | + * @param mixed $params default: array() array with additional data |
|
83 | + * @return bool true if slots exists or false if not |
|
84 | + * @throws \OC\HintException |
|
85 | + * @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references! |
|
86 | + * |
|
87 | + * TODO: write example |
|
88 | + */ |
|
89 | + static public function emit($signalClass, $signalName, $params = []) { |
|
90 | 90 | |
91 | - // Return false if no hook handlers are listening to this |
|
92 | - // emitting class |
|
93 | - if( !array_key_exists($signalClass, self::$registered )) { |
|
94 | - return false; |
|
95 | - } |
|
91 | + // Return false if no hook handlers are listening to this |
|
92 | + // emitting class |
|
93 | + if( !array_key_exists($signalClass, self::$registered )) { |
|
94 | + return false; |
|
95 | + } |
|
96 | 96 | |
97 | - // Return false if no hook handlers are listening to this |
|
98 | - // emitting method |
|
99 | - if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
100 | - return false; |
|
101 | - } |
|
97 | + // Return false if no hook handlers are listening to this |
|
98 | + // emitting method |
|
99 | + if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
100 | + return false; |
|
101 | + } |
|
102 | 102 | |
103 | - // Call all slots |
|
104 | - foreach( self::$registered[$signalClass][$signalName] as $i ) { |
|
105 | - try { |
|
106 | - call_user_func( array( $i["class"], $i["name"] ), $params ); |
|
107 | - } catch (Exception $e){ |
|
108 | - self::$thrownExceptions[] = $e; |
|
109 | - \OC::$server->getLogger()->logException($e); |
|
110 | - if($e instanceof \OC\HintException) { |
|
111 | - throw $e; |
|
112 | - } |
|
113 | - if($e instanceof \OC\ServerNotAvailableException) { |
|
114 | - throw $e; |
|
115 | - } |
|
116 | - } |
|
117 | - } |
|
103 | + // Call all slots |
|
104 | + foreach( self::$registered[$signalClass][$signalName] as $i ) { |
|
105 | + try { |
|
106 | + call_user_func( array( $i["class"], $i["name"] ), $params ); |
|
107 | + } catch (Exception $e){ |
|
108 | + self::$thrownExceptions[] = $e; |
|
109 | + \OC::$server->getLogger()->logException($e); |
|
110 | + if($e instanceof \OC\HintException) { |
|
111 | + throw $e; |
|
112 | + } |
|
113 | + if($e instanceof \OC\ServerNotAvailableException) { |
|
114 | + throw $e; |
|
115 | + } |
|
116 | + } |
|
117 | + } |
|
118 | 118 | |
119 | - return true; |
|
120 | - } |
|
119 | + return true; |
|
120 | + } |
|
121 | 121 | |
122 | - /** |
|
123 | - * clear hooks |
|
124 | - * @param string $signalClass |
|
125 | - * @param string $signalName |
|
126 | - */ |
|
127 | - static public function clear($signalClass='', $signalName='') { |
|
128 | - if ($signalClass) { |
|
129 | - if ($signalName) { |
|
130 | - self::$registered[$signalClass][$signalName]=array(); |
|
131 | - }else{ |
|
132 | - self::$registered[$signalClass]=array(); |
|
133 | - } |
|
134 | - }else{ |
|
135 | - self::$registered=array(); |
|
136 | - } |
|
137 | - } |
|
122 | + /** |
|
123 | + * clear hooks |
|
124 | + * @param string $signalClass |
|
125 | + * @param string $signalName |
|
126 | + */ |
|
127 | + static public function clear($signalClass='', $signalName='') { |
|
128 | + if ($signalClass) { |
|
129 | + if ($signalName) { |
|
130 | + self::$registered[$signalClass][$signalName]=array(); |
|
131 | + }else{ |
|
132 | + self::$registered[$signalClass]=array(); |
|
133 | + } |
|
134 | + }else{ |
|
135 | + self::$registered=array(); |
|
136 | + } |
|
137 | + } |
|
138 | 138 | |
139 | - /** |
|
140 | - * DO NOT USE! |
|
141 | - * For unit tests ONLY! |
|
142 | - */ |
|
143 | - static public function getHooks() { |
|
144 | - return self::$registered; |
|
145 | - } |
|
139 | + /** |
|
140 | + * DO NOT USE! |
|
141 | + * For unit tests ONLY! |
|
142 | + */ |
|
143 | + static public function getHooks() { |
|
144 | + return self::$registered; |
|
145 | + } |
|
146 | 146 | } |
@@ -26,14 +26,14 @@ |
||
26 | 26 | use OCP\AutoloadNotAllowedException; |
27 | 27 | |
28 | 28 | class RegularJob extends \OC\BackgroundJob\Job { |
29 | - public function run($argument) { |
|
30 | - try { |
|
31 | - if (is_callable($argument)) { |
|
32 | - call_user_func($argument); |
|
33 | - } |
|
34 | - } catch (AutoloadNotAllowedException $e) { |
|
35 | - // job is from a disabled app, ignore |
|
36 | - return null; |
|
37 | - } |
|
38 | - } |
|
29 | + public function run($argument) { |
|
30 | + try { |
|
31 | + if (is_callable($argument)) { |
|
32 | + call_user_func($argument); |
|
33 | + } |
|
34 | + } catch (AutoloadNotAllowedException $e) { |
|
35 | + // job is from a disabled app, ignore |
|
36 | + return null; |
|
37 | + } |
|
38 | + } |
|
39 | 39 | } |
@@ -24,12 +24,12 @@ |
||
24 | 24 | namespace OC\BackgroundJob\Legacy; |
25 | 25 | |
26 | 26 | class QueuedJob extends \OC\BackgroundJob\QueuedJob { |
27 | - public function run($argument) { |
|
28 | - $class = $argument['klass']; |
|
29 | - $method = $argument['method']; |
|
30 | - $parameters = $argument['parameters']; |
|
31 | - if (is_callable(array($class, $method))) { |
|
32 | - call_user_func(array($class, $method), $parameters); |
|
33 | - } |
|
34 | - } |
|
27 | + public function run($argument) { |
|
28 | + $class = $argument['klass']; |
|
29 | + $method = $argument['method']; |
|
30 | + $parameters = $argument['parameters']; |
|
31 | + if (is_callable(array($class, $method))) { |
|
32 | + call_user_func(array($class, $method), $parameters); |
|
33 | + } |
|
34 | + } |
|
35 | 35 | } |
@@ -26,67 +26,67 @@ |
||
26 | 26 | use OCP\Settings\IIconSection; |
27 | 27 | |
28 | 28 | class Section implements IIconSection { |
29 | - /** @var string */ |
|
30 | - private $id; |
|
31 | - /** @var string */ |
|
32 | - private $name; |
|
33 | - /** @var int */ |
|
34 | - private $priority; |
|
35 | - /** @var string */ |
|
36 | - private $icon; |
|
29 | + /** @var string */ |
|
30 | + private $id; |
|
31 | + /** @var string */ |
|
32 | + private $name; |
|
33 | + /** @var int */ |
|
34 | + private $priority; |
|
35 | + /** @var string */ |
|
36 | + private $icon; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param string $id |
|
40 | - * @param string $name |
|
41 | - * @param int $priority |
|
42 | - * @param string $icon |
|
43 | - */ |
|
44 | - public function __construct($id, $name, $priority, $icon = '') { |
|
45 | - $this->id = $id; |
|
46 | - $this->name = $name; |
|
47 | - $this->priority = $priority; |
|
48 | - $this->icon = $icon; |
|
49 | - } |
|
38 | + /** |
|
39 | + * @param string $id |
|
40 | + * @param string $name |
|
41 | + * @param int $priority |
|
42 | + * @param string $icon |
|
43 | + */ |
|
44 | + public function __construct($id, $name, $priority, $icon = '') { |
|
45 | + $this->id = $id; |
|
46 | + $this->name = $name; |
|
47 | + $this->priority = $priority; |
|
48 | + $this->icon = $icon; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
53 | - * e.g. 'ldap' |
|
54 | - * |
|
55 | - * @returns string |
|
56 | - */ |
|
57 | - public function getID() { |
|
58 | - return $this->id; |
|
59 | - } |
|
51 | + /** |
|
52 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
53 | + * e.g. 'ldap' |
|
54 | + * |
|
55 | + * @returns string |
|
56 | + */ |
|
57 | + public function getID() { |
|
58 | + return $this->id; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
63 | - * integration'. Use the L10N service to translate it. |
|
64 | - * |
|
65 | - * @return string |
|
66 | - */ |
|
67 | - public function getName() { |
|
68 | - return $this->name; |
|
69 | - } |
|
61 | + /** |
|
62 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
63 | + * integration'. Use the L10N service to translate it. |
|
64 | + * |
|
65 | + * @return string |
|
66 | + */ |
|
67 | + public function getName() { |
|
68 | + return $this->name; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @return int whether the form should be rather on the top or bottom of |
|
73 | - * the settings navigation. The sections are arranged in ascending order of |
|
74 | - * the priority values. It is required to return a value between 0 and 99. |
|
75 | - * |
|
76 | - * E.g.: 70 |
|
77 | - */ |
|
78 | - public function getPriority() { |
|
79 | - return $this->priority; |
|
80 | - } |
|
71 | + /** |
|
72 | + * @return int whether the form should be rather on the top or bottom of |
|
73 | + * the settings navigation. The sections are arranged in ascending order of |
|
74 | + * the priority values. It is required to return a value between 0 and 99. |
|
75 | + * |
|
76 | + * E.g.: 70 |
|
77 | + */ |
|
78 | + public function getPriority() { |
|
79 | + return $this->priority; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * returns the relative path to an 16*16 icon describing the section. |
|
84 | - * e.g. '/core/img/places/files.svg' |
|
85 | - * |
|
86 | - * @returns string |
|
87 | - * @since 12 |
|
88 | - */ |
|
89 | - public function getIcon() { |
|
90 | - return $this->icon; |
|
91 | - } |
|
82 | + /** |
|
83 | + * returns the relative path to an 16*16 icon describing the section. |
|
84 | + * e.g. '/core/img/places/files.svg' |
|
85 | + * |
|
86 | + * @returns string |
|
87 | + * @since 12 |
|
88 | + */ |
|
89 | + public function getIcon() { |
|
90 | + return $this->icon; |
|
91 | + } |
|
92 | 92 | } |
@@ -28,105 +28,105 @@ |
||
28 | 28 | use ZipStreamer\ZipStreamer; |
29 | 29 | |
30 | 30 | class Streamer { |
31 | - // array of regexp. Matching user agents will get tar instead of zip |
|
32 | - private $preferTarFor = [ '/macintosh|mac os x/i' ]; |
|
31 | + // array of regexp. Matching user agents will get tar instead of zip |
|
32 | + private $preferTarFor = [ '/macintosh|mac os x/i' ]; |
|
33 | 33 | |
34 | - // streamer instance |
|
35 | - private $streamerInstance; |
|
34 | + // streamer instance |
|
35 | + private $streamerInstance; |
|
36 | 36 | |
37 | - public function __construct(){ |
|
38 | - /** @var \OCP\IRequest */ |
|
39 | - $request = \OC::$server->getRequest(); |
|
37 | + public function __construct(){ |
|
38 | + /** @var \OCP\IRequest */ |
|
39 | + $request = \OC::$server->getRequest(); |
|
40 | 40 | |
41 | - if ($request->isUserAgent($this->preferTarFor)) { |
|
42 | - $this->streamerInstance = new TarStreamer(); |
|
43 | - } else { |
|
44 | - $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]); |
|
45 | - } |
|
46 | - } |
|
41 | + if ($request->isUserAgent($this->preferTarFor)) { |
|
42 | + $this->streamerInstance = new TarStreamer(); |
|
43 | + } else { |
|
44 | + $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]); |
|
45 | + } |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Send HTTP headers |
|
50 | - * @param string $name |
|
51 | - */ |
|
52 | - public function sendHeaders($name){ |
|
53 | - $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar'; |
|
54 | - $fullName = $name . $extension; |
|
55 | - $this->streamerInstance->sendHeaders($fullName); |
|
56 | - } |
|
48 | + /** |
|
49 | + * Send HTTP headers |
|
50 | + * @param string $name |
|
51 | + */ |
|
52 | + public function sendHeaders($name){ |
|
53 | + $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar'; |
|
54 | + $fullName = $name . $extension; |
|
55 | + $this->streamerInstance->sendHeaders($fullName); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * Stream directory recursively |
|
60 | - * @param string $dir |
|
61 | - * @param string $internalDir |
|
62 | - */ |
|
63 | - public function addDirRecursive($dir, $internalDir='') { |
|
64 | - $dirname = basename($dir); |
|
65 | - $rootDir = $internalDir . $dirname; |
|
66 | - if (!empty($rootDir)) { |
|
67 | - $this->streamerInstance->addEmptyDir($rootDir); |
|
68 | - } |
|
69 | - $internalDir .= $dirname . '/'; |
|
70 | - // prevent absolute dirs |
|
71 | - $internalDir = ltrim($internalDir, '/'); |
|
58 | + /** |
|
59 | + * Stream directory recursively |
|
60 | + * @param string $dir |
|
61 | + * @param string $internalDir |
|
62 | + */ |
|
63 | + public function addDirRecursive($dir, $internalDir='') { |
|
64 | + $dirname = basename($dir); |
|
65 | + $rootDir = $internalDir . $dirname; |
|
66 | + if (!empty($rootDir)) { |
|
67 | + $this->streamerInstance->addEmptyDir($rootDir); |
|
68 | + } |
|
69 | + $internalDir .= $dirname . '/'; |
|
70 | + // prevent absolute dirs |
|
71 | + $internalDir = ltrim($internalDir, '/'); |
|
72 | 72 | |
73 | - $files= \OC\Files\Filesystem::getDirectoryContent($dir); |
|
74 | - foreach($files as $file) { |
|
75 | - $filename = $file['name']; |
|
76 | - $file = $dir . '/' . $filename; |
|
77 | - if(\OC\Files\Filesystem::is_file($file)) { |
|
78 | - $filesize = \OC\Files\Filesystem::filesize($file); |
|
79 | - $fileTime = \OC\Files\Filesystem::filemtime($file); |
|
80 | - $fh = \OC\Files\Filesystem::fopen($file, 'r'); |
|
81 | - $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime); |
|
82 | - fclose($fh); |
|
83 | - }elseif(\OC\Files\Filesystem::is_dir($file)) { |
|
84 | - $this->addDirRecursive($file, $internalDir); |
|
85 | - } |
|
86 | - } |
|
87 | - } |
|
73 | + $files= \OC\Files\Filesystem::getDirectoryContent($dir); |
|
74 | + foreach($files as $file) { |
|
75 | + $filename = $file['name']; |
|
76 | + $file = $dir . '/' . $filename; |
|
77 | + if(\OC\Files\Filesystem::is_file($file)) { |
|
78 | + $filesize = \OC\Files\Filesystem::filesize($file); |
|
79 | + $fileTime = \OC\Files\Filesystem::filemtime($file); |
|
80 | + $fh = \OC\Files\Filesystem::fopen($file, 'r'); |
|
81 | + $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime); |
|
82 | + fclose($fh); |
|
83 | + }elseif(\OC\Files\Filesystem::is_dir($file)) { |
|
84 | + $this->addDirRecursive($file, $internalDir); |
|
85 | + } |
|
86 | + } |
|
87 | + } |
|
88 | 88 | |
89 | - /** |
|
90 | - * Add a file to the archive at the specified location and file name. |
|
91 | - * |
|
92 | - * @param string $stream Stream to read data from |
|
93 | - * @param string $internalName Filepath and name to be used in the archive. |
|
94 | - * @param int $size Filesize |
|
95 | - * @param int|bool $time File mtime as int, or false |
|
96 | - * @return bool $success |
|
97 | - */ |
|
98 | - public function addFileFromStream($stream, $internalName, $size, $time) { |
|
99 | - $options = []; |
|
100 | - if ($time) { |
|
101 | - $options = [ |
|
102 | - 'timestamp' => $time |
|
103 | - ]; |
|
104 | - } |
|
89 | + /** |
|
90 | + * Add a file to the archive at the specified location and file name. |
|
91 | + * |
|
92 | + * @param string $stream Stream to read data from |
|
93 | + * @param string $internalName Filepath and name to be used in the archive. |
|
94 | + * @param int $size Filesize |
|
95 | + * @param int|bool $time File mtime as int, or false |
|
96 | + * @return bool $success |
|
97 | + */ |
|
98 | + public function addFileFromStream($stream, $internalName, $size, $time) { |
|
99 | + $options = []; |
|
100 | + if ($time) { |
|
101 | + $options = [ |
|
102 | + 'timestamp' => $time |
|
103 | + ]; |
|
104 | + } |
|
105 | 105 | |
106 | - if ($this->streamerInstance instanceof ZipStreamer) { |
|
107 | - return $this->streamerInstance->addFileFromStream($stream, $internalName, $options); |
|
108 | - } else { |
|
109 | - return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options); |
|
110 | - } |
|
111 | - } |
|
106 | + if ($this->streamerInstance instanceof ZipStreamer) { |
|
107 | + return $this->streamerInstance->addFileFromStream($stream, $internalName, $options); |
|
108 | + } else { |
|
109 | + return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options); |
|
110 | + } |
|
111 | + } |
|
112 | 112 | |
113 | - /** |
|
114 | - * Add an empty directory entry to the archive. |
|
115 | - * |
|
116 | - * @param string $dirName Directory Path and name to be added to the archive. |
|
117 | - * @return bool $success |
|
118 | - */ |
|
119 | - public function addEmptyDir($dirName){ |
|
120 | - return $this->streamerInstance->addEmptyDir($dirName); |
|
121 | - } |
|
113 | + /** |
|
114 | + * Add an empty directory entry to the archive. |
|
115 | + * |
|
116 | + * @param string $dirName Directory Path and name to be added to the archive. |
|
117 | + * @return bool $success |
|
118 | + */ |
|
119 | + public function addEmptyDir($dirName){ |
|
120 | + return $this->streamerInstance->addEmptyDir($dirName); |
|
121 | + } |
|
122 | 122 | |
123 | - /** |
|
124 | - * Close the archive. |
|
125 | - * A closed archive can no longer have new files added to it. After |
|
126 | - * closing, the file is completely written to the output stream. |
|
127 | - * @return bool $success |
|
128 | - */ |
|
129 | - public function finalize(){ |
|
130 | - return $this->streamerInstance->finalize(); |
|
131 | - } |
|
123 | + /** |
|
124 | + * Close the archive. |
|
125 | + * A closed archive can no longer have new files added to it. After |
|
126 | + * closing, the file is completely written to the output stream. |
|
127 | + * @return bool $success |
|
128 | + */ |
|
129 | + public function finalize(){ |
|
130 | + return $this->streamerInstance->finalize(); |
|
131 | + } |
|
132 | 132 | } |
@@ -23,35 +23,35 @@ |
||
23 | 23 | namespace OC\Memcache; |
24 | 24 | |
25 | 25 | trait CASTrait { |
26 | - abstract public function get($key); |
|
26 | + abstract public function get($key); |
|
27 | 27 | |
28 | - abstract public function set($key, $value, $ttl = 0); |
|
28 | + abstract public function set($key, $value, $ttl = 0); |
|
29 | 29 | |
30 | - abstract public function remove($key); |
|
30 | + abstract public function remove($key); |
|
31 | 31 | |
32 | - abstract public function add($key, $value, $ttl = 0); |
|
32 | + abstract public function add($key, $value, $ttl = 0); |
|
33 | 33 | |
34 | - /** |
|
35 | - * Compare and set |
|
36 | - * |
|
37 | - * @param string $key |
|
38 | - * @param mixed $old |
|
39 | - * @param mixed $new |
|
40 | - * @return bool |
|
41 | - */ |
|
42 | - public function cas($key, $old, $new) { |
|
43 | - //no native cas, emulate with locking |
|
44 | - if ($this->add($key . '_lock', true)) { |
|
45 | - if ($this->get($key) === $old) { |
|
46 | - $this->set($key, $new); |
|
47 | - $this->remove($key . '_lock'); |
|
48 | - return true; |
|
49 | - } else { |
|
50 | - $this->remove($key . '_lock'); |
|
51 | - return false; |
|
52 | - } |
|
53 | - } else { |
|
54 | - return false; |
|
55 | - } |
|
56 | - } |
|
34 | + /** |
|
35 | + * Compare and set |
|
36 | + * |
|
37 | + * @param string $key |
|
38 | + * @param mixed $old |
|
39 | + * @param mixed $new |
|
40 | + * @return bool |
|
41 | + */ |
|
42 | + public function cas($key, $old, $new) { |
|
43 | + //no native cas, emulate with locking |
|
44 | + if ($this->add($key . '_lock', true)) { |
|
45 | + if ($this->get($key) === $old) { |
|
46 | + $this->set($key, $new); |
|
47 | + $this->remove($key . '_lock'); |
|
48 | + return true; |
|
49 | + } else { |
|
50 | + $this->remove($key . '_lock'); |
|
51 | + return false; |
|
52 | + } |
|
53 | + } else { |
|
54 | + return false; |
|
55 | + } |
|
56 | + } |
|
57 | 57 | } |
@@ -26,72 +26,72 @@ |
||
26 | 26 | namespace OC\Memcache; |
27 | 27 | |
28 | 28 | abstract class Cache implements \ArrayAccess, \OCP\ICache { |
29 | - /** |
|
30 | - * @var string $prefix |
|
31 | - */ |
|
32 | - protected $prefix; |
|
29 | + /** |
|
30 | + * @var string $prefix |
|
31 | + */ |
|
32 | + protected $prefix; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param string $prefix |
|
36 | - */ |
|
37 | - public function __construct($prefix = '') { |
|
38 | - $this->prefix = $prefix; |
|
39 | - } |
|
34 | + /** |
|
35 | + * @param string $prefix |
|
36 | + */ |
|
37 | + public function __construct($prefix = '') { |
|
38 | + $this->prefix = $prefix; |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * @return string Prefix used for caching purposes |
|
43 | - */ |
|
44 | - public function getPrefix() { |
|
45 | - return $this->prefix; |
|
46 | - } |
|
41 | + /** |
|
42 | + * @return string Prefix used for caching purposes |
|
43 | + */ |
|
44 | + public function getPrefix() { |
|
45 | + return $this->prefix; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @param string $key |
|
50 | - * @return mixed |
|
51 | - */ |
|
52 | - abstract public function get($key); |
|
48 | + /** |
|
49 | + * @param string $key |
|
50 | + * @return mixed |
|
51 | + */ |
|
52 | + abstract public function get($key); |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param string $key |
|
56 | - * @param mixed $value |
|
57 | - * @param int $ttl |
|
58 | - * @return mixed |
|
59 | - */ |
|
60 | - abstract public function set($key, $value, $ttl = 0); |
|
54 | + /** |
|
55 | + * @param string $key |
|
56 | + * @param mixed $value |
|
57 | + * @param int $ttl |
|
58 | + * @return mixed |
|
59 | + */ |
|
60 | + abstract public function set($key, $value, $ttl = 0); |
|
61 | 61 | |
62 | - /** |
|
63 | - * @param string $key |
|
64 | - * @return mixed |
|
65 | - */ |
|
66 | - abstract public function hasKey($key); |
|
62 | + /** |
|
63 | + * @param string $key |
|
64 | + * @return mixed |
|
65 | + */ |
|
66 | + abstract public function hasKey($key); |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param string $key |
|
70 | - * @return mixed |
|
71 | - */ |
|
72 | - abstract public function remove($key); |
|
68 | + /** |
|
69 | + * @param string $key |
|
70 | + * @return mixed |
|
71 | + */ |
|
72 | + abstract public function remove($key); |
|
73 | 73 | |
74 | - /** |
|
75 | - * @param string $prefix |
|
76 | - * @return mixed |
|
77 | - */ |
|
78 | - abstract public function clear($prefix = ''); |
|
74 | + /** |
|
75 | + * @param string $prefix |
|
76 | + * @return mixed |
|
77 | + */ |
|
78 | + abstract public function clear($prefix = ''); |
|
79 | 79 | |
80 | - //implement the ArrayAccess interface |
|
80 | + //implement the ArrayAccess interface |
|
81 | 81 | |
82 | - public function offsetExists($offset) { |
|
83 | - return $this->hasKey($offset); |
|
84 | - } |
|
82 | + public function offsetExists($offset) { |
|
83 | + return $this->hasKey($offset); |
|
84 | + } |
|
85 | 85 | |
86 | - public function offsetSet($offset, $value) { |
|
87 | - $this->set($offset, $value); |
|
88 | - } |
|
86 | + public function offsetSet($offset, $value) { |
|
87 | + $this->set($offset, $value); |
|
88 | + } |
|
89 | 89 | |
90 | - public function offsetGet($offset) { |
|
91 | - return $this->get($offset); |
|
92 | - } |
|
90 | + public function offsetGet($offset) { |
|
91 | + return $this->get($offset); |
|
92 | + } |
|
93 | 93 | |
94 | - public function offsetUnset($offset) { |
|
95 | - $this->remove($offset); |
|
96 | - } |
|
94 | + public function offsetUnset($offset) { |
|
95 | + $this->remove($offset); |
|
96 | + } |
|
97 | 97 | } |
@@ -23,32 +23,32 @@ |
||
23 | 23 | namespace OC\Memcache; |
24 | 24 | |
25 | 25 | trait CADTrait { |
26 | - abstract public function get($key); |
|
26 | + abstract public function get($key); |
|
27 | 27 | |
28 | - abstract public function remove($key); |
|
28 | + abstract public function remove($key); |
|
29 | 29 | |
30 | - abstract public function add($key, $value, $ttl = 0); |
|
30 | + abstract public function add($key, $value, $ttl = 0); |
|
31 | 31 | |
32 | - /** |
|
33 | - * Compare and delete |
|
34 | - * |
|
35 | - * @param string $key |
|
36 | - * @param mixed $old |
|
37 | - * @return bool |
|
38 | - */ |
|
39 | - public function cad($key, $old) { |
|
40 | - //no native cas, emulate with locking |
|
41 | - if ($this->add($key . '_lock', true)) { |
|
42 | - if ($this->get($key) === $old) { |
|
43 | - $this->remove($key); |
|
44 | - $this->remove($key . '_lock'); |
|
45 | - return true; |
|
46 | - } else { |
|
47 | - $this->remove($key . '_lock'); |
|
48 | - return false; |
|
49 | - } |
|
50 | - } else { |
|
51 | - return false; |
|
52 | - } |
|
53 | - } |
|
32 | + /** |
|
33 | + * Compare and delete |
|
34 | + * |
|
35 | + * @param string $key |
|
36 | + * @param mixed $old |
|
37 | + * @return bool |
|
38 | + */ |
|
39 | + public function cad($key, $old) { |
|
40 | + //no native cas, emulate with locking |
|
41 | + if ($this->add($key . '_lock', true)) { |
|
42 | + if ($this->get($key) === $old) { |
|
43 | + $this->remove($key); |
|
44 | + $this->remove($key . '_lock'); |
|
45 | + return true; |
|
46 | + } else { |
|
47 | + $this->remove($key . '_lock'); |
|
48 | + return false; |
|
49 | + } |
|
50 | + } else { |
|
51 | + return false; |
|
52 | + } |
|
53 | + } |
|
54 | 54 | } |
@@ -27,47 +27,47 @@ |
||
27 | 27 | namespace OC\Memcache; |
28 | 28 | |
29 | 29 | class NullCache extends Cache implements \OCP\IMemcache { |
30 | - public function get($key) { |
|
31 | - return null; |
|
32 | - } |
|
30 | + public function get($key) { |
|
31 | + return null; |
|
32 | + } |
|
33 | 33 | |
34 | - public function set($key, $value, $ttl = 0) { |
|
35 | - return true; |
|
36 | - } |
|
34 | + public function set($key, $value, $ttl = 0) { |
|
35 | + return true; |
|
36 | + } |
|
37 | 37 | |
38 | - public function hasKey($key) { |
|
39 | - return false; |
|
40 | - } |
|
38 | + public function hasKey($key) { |
|
39 | + return false; |
|
40 | + } |
|
41 | 41 | |
42 | - public function remove($key) { |
|
43 | - return true; |
|
44 | - } |
|
42 | + public function remove($key) { |
|
43 | + return true; |
|
44 | + } |
|
45 | 45 | |
46 | - public function add($key, $value, $ttl = 0) { |
|
47 | - return true; |
|
48 | - } |
|
46 | + public function add($key, $value, $ttl = 0) { |
|
47 | + return true; |
|
48 | + } |
|
49 | 49 | |
50 | - public function inc($key, $step = 1) { |
|
51 | - return true; |
|
52 | - } |
|
50 | + public function inc($key, $step = 1) { |
|
51 | + return true; |
|
52 | + } |
|
53 | 53 | |
54 | - public function dec($key, $step = 1) { |
|
55 | - return true; |
|
56 | - } |
|
54 | + public function dec($key, $step = 1) { |
|
55 | + return true; |
|
56 | + } |
|
57 | 57 | |
58 | - public function cas($key, $old, $new) { |
|
59 | - return true; |
|
60 | - } |
|
58 | + public function cas($key, $old, $new) { |
|
59 | + return true; |
|
60 | + } |
|
61 | 61 | |
62 | - public function cad($key, $old) { |
|
63 | - return true; |
|
64 | - } |
|
62 | + public function cad($key, $old) { |
|
63 | + return true; |
|
64 | + } |
|
65 | 65 | |
66 | - public function clear($prefix = '') { |
|
67 | - return true; |
|
68 | - } |
|
66 | + public function clear($prefix = '') { |
|
67 | + return true; |
|
68 | + } |
|
69 | 69 | |
70 | - static public function isAvailable() { |
|
71 | - return true; |
|
72 | - } |
|
70 | + static public function isAvailable() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | } |