@@ -31,67 +31,67 @@ |
||
31 | 31 | use OCA\Files\Controller\ViewController; |
32 | 32 | |
33 | 33 | class Application extends App { |
34 | - public function __construct(array $urlParams=array()) { |
|
35 | - parent::__construct('files', $urlParams); |
|
36 | - $container = $this->getContainer(); |
|
37 | - $server = $container->getServer(); |
|
34 | + public function __construct(array $urlParams=array()) { |
|
35 | + parent::__construct('files', $urlParams); |
|
36 | + $container = $this->getContainer(); |
|
37 | + $server = $container->getServer(); |
|
38 | 38 | |
39 | - /** |
|
40 | - * Controllers |
|
41 | - */ |
|
42 | - $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
43 | - return new ApiController( |
|
44 | - $c->query('AppName'), |
|
45 | - $c->query('Request'), |
|
46 | - $server->getUserSession(), |
|
47 | - $c->query('TagService'), |
|
48 | - $server->getPreviewManager(), |
|
49 | - $server->getShareManager(), |
|
50 | - $server->getConfig(), |
|
51 | - $server->getUserFolder() |
|
52 | - ); |
|
53 | - }); |
|
39 | + /** |
|
40 | + * Controllers |
|
41 | + */ |
|
42 | + $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
43 | + return new ApiController( |
|
44 | + $c->query('AppName'), |
|
45 | + $c->query('Request'), |
|
46 | + $server->getUserSession(), |
|
47 | + $c->query('TagService'), |
|
48 | + $server->getPreviewManager(), |
|
49 | + $server->getShareManager(), |
|
50 | + $server->getConfig(), |
|
51 | + $server->getUserFolder() |
|
52 | + ); |
|
53 | + }); |
|
54 | 54 | |
55 | - $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
56 | - return new ViewController( |
|
57 | - $c->query('AppName'), |
|
58 | - $c->query('Request'), |
|
59 | - $server->getURLGenerator(), |
|
60 | - $c->query('L10N'), |
|
61 | - $server->getConfig(), |
|
62 | - $server->getEventDispatcher(), |
|
63 | - $server->getUserSession(), |
|
64 | - $server->getAppManager(), |
|
65 | - $server->getRootFolder() |
|
66 | - ); |
|
67 | - }); |
|
55 | + $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
56 | + return new ViewController( |
|
57 | + $c->query('AppName'), |
|
58 | + $c->query('Request'), |
|
59 | + $server->getURLGenerator(), |
|
60 | + $c->query('L10N'), |
|
61 | + $server->getConfig(), |
|
62 | + $server->getEventDispatcher(), |
|
63 | + $server->getUserSession(), |
|
64 | + $server->getAppManager(), |
|
65 | + $server->getRootFolder() |
|
66 | + ); |
|
67 | + }); |
|
68 | 68 | |
69 | - /** |
|
70 | - * Core |
|
71 | - */ |
|
72 | - $container->registerService('L10N', function(IContainer $c) { |
|
73 | - return $c->query('ServerContainer')->getL10N($c->query('AppName')); |
|
74 | - }); |
|
69 | + /** |
|
70 | + * Core |
|
71 | + */ |
|
72 | + $container->registerService('L10N', function(IContainer $c) { |
|
73 | + return $c->query('ServerContainer')->getL10N($c->query('AppName')); |
|
74 | + }); |
|
75 | 75 | |
76 | - /** |
|
77 | - * Services |
|
78 | - */ |
|
79 | - $container->registerService('Tagger', function(IContainer $c) { |
|
80 | - return $c->query('ServerContainer')->getTagManager()->load('files'); |
|
81 | - }); |
|
82 | - $container->registerService('TagService', function(IContainer $c) { |
|
83 | - $homeFolder = $c->query('ServerContainer')->getUserFolder(); |
|
84 | - return new TagService( |
|
85 | - $c->query('ServerContainer')->getUserSession(), |
|
86 | - $c->query('ServerContainer')->getActivityManager(), |
|
87 | - $c->query('Tagger'), |
|
88 | - $homeFolder |
|
89 | - ); |
|
90 | - }); |
|
76 | + /** |
|
77 | + * Services |
|
78 | + */ |
|
79 | + $container->registerService('Tagger', function(IContainer $c) { |
|
80 | + return $c->query('ServerContainer')->getTagManager()->load('files'); |
|
81 | + }); |
|
82 | + $container->registerService('TagService', function(IContainer $c) { |
|
83 | + $homeFolder = $c->query('ServerContainer')->getUserFolder(); |
|
84 | + return new TagService( |
|
85 | + $c->query('ServerContainer')->getUserSession(), |
|
86 | + $c->query('ServerContainer')->getActivityManager(), |
|
87 | + $c->query('Tagger'), |
|
88 | + $homeFolder |
|
89 | + ); |
|
90 | + }); |
|
91 | 91 | |
92 | - /* |
|
92 | + /* |
|
93 | 93 | * Register capabilities |
94 | 94 | */ |
95 | - $container->registerCapability('OCA\Files\Capabilities'); |
|
96 | - } |
|
95 | + $container->registerCapability('OCA\Files\Capabilities'); |
|
96 | + } |
|
97 | 97 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | use OCA\Files\Controller\ViewController; |
32 | 32 | |
33 | 33 | class Application extends App { |
34 | - public function __construct(array $urlParams=array()) { |
|
34 | + public function __construct(array $urlParams = array()) { |
|
35 | 35 | parent::__construct('files', $urlParams); |
36 | 36 | $container = $this->getContainer(); |
37 | 37 | $server = $container->getServer(); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | /** |
40 | 40 | * Controllers |
41 | 41 | */ |
42 | - $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
42 | + $container->registerService('APIController', function(IContainer $c) use ($server) { |
|
43 | 43 | return new ApiController( |
44 | 44 | $c->query('AppName'), |
45 | 45 | $c->query('Request'), |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | ); |
53 | 53 | }); |
54 | 54 | |
55 | - $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
55 | + $container->registerService('ViewController', function(IContainer $c) use ($server) { |
|
56 | 56 | return new ViewController( |
57 | 57 | $c->query('AppName'), |
58 | 58 | $c->query('Request'), |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | /** |
77 | 77 | * Services |
78 | 78 | */ |
79 | - $container->registerService('Tagger', function(IContainer $c) { |
|
79 | + $container->registerService('Tagger', function(IContainer $c) { |
|
80 | 80 | return $c->query('ServerContainer')->getTagManager()->load('files'); |
81 | 81 | }); |
82 | - $container->registerService('TagService', function(IContainer $c) { |
|
82 | + $container->registerService('TagService', function(IContainer $c) { |
|
83 | 83 | $homeFolder = $c->query('ServerContainer')->getUserFolder(); |
84 | 84 | return new TagService( |
85 | 85 | $c->query('ServerContainer')->getUserSession(), |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'uploadMaxFilesize' => $maxUploadFileSize, |
55 | 55 | 'maxHumanFilesize' => $maxHumanFileSize, |
56 | 56 | 'freeSpace' => $storageInfo['free'], |
57 | - 'usedSpacePercent' => (int)$storageInfo['relative'], |
|
57 | + 'usedSpacePercent' => (int) $storageInfo['relative'], |
|
58 | 58 | 'owner' => $storageInfo['owner'], |
59 | 59 | 'ownerDisplayName' => $storageInfo['ownerDisplayName'], |
60 | 60 | ]; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | * @return string icon URL |
68 | 68 | */ |
69 | 69 | public static function determineIcon($file) { |
70 | - if($file['type'] === 'dir') { |
|
70 | + if ($file['type'] === 'dir') { |
|
71 | 71 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir'); |
72 | 72 | // TODO: move this part to the client side, using mountType |
73 | 73 | if ($file->isShared()) { |
@@ -75,11 +75,11 @@ discard block |
||
75 | 75 | } elseif ($file->isMounted()) { |
76 | 76 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); |
77 | 77 | } |
78 | - }else{ |
|
78 | + } else { |
|
79 | 79 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); |
80 | 80 | } |
81 | 81 | |
82 | - return substr($icon, 0, -3) . 'svg'; |
|
82 | + return substr($icon, 0, -3).'svg'; |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -75,7 +75,7 @@ |
||
75 | 75 | } elseif ($file->isMounted()) { |
76 | 76 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); |
77 | 77 | } |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); |
80 | 80 | } |
81 | 81 |
@@ -38,230 +38,230 @@ |
||
38 | 38 | * Helper class for manipulating file information |
39 | 39 | */ |
40 | 40 | class Helper { |
41 | - /** |
|
42 | - * @param string $dir |
|
43 | - * @return array |
|
44 | - * @throws \OCP\Files\NotFoundException |
|
45 | - */ |
|
46 | - public static function buildFileStorageStatistics($dir) { |
|
47 | - // information about storage capacities |
|
48 | - $storageInfo = \OC_Helper::getStorageInfo($dir); |
|
49 | - $l = \OC::$server->getL10N('files'); |
|
50 | - $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); |
|
51 | - $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize); |
|
52 | - $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize)); |
|
41 | + /** |
|
42 | + * @param string $dir |
|
43 | + * @return array |
|
44 | + * @throws \OCP\Files\NotFoundException |
|
45 | + */ |
|
46 | + public static function buildFileStorageStatistics($dir) { |
|
47 | + // information about storage capacities |
|
48 | + $storageInfo = \OC_Helper::getStorageInfo($dir); |
|
49 | + $l = \OC::$server->getL10N('files'); |
|
50 | + $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); |
|
51 | + $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize); |
|
52 | + $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize)); |
|
53 | 53 | |
54 | - return [ |
|
55 | - 'uploadMaxFilesize' => $maxUploadFileSize, |
|
56 | - 'maxHumanFilesize' => $maxHumanFileSize, |
|
57 | - 'freeSpace' => $storageInfo['free'], |
|
58 | - 'usedSpacePercent' => (int)$storageInfo['relative'], |
|
59 | - 'owner' => $storageInfo['owner'], |
|
60 | - 'ownerDisplayName' => $storageInfo['ownerDisplayName'], |
|
61 | - ]; |
|
62 | - } |
|
54 | + return [ |
|
55 | + 'uploadMaxFilesize' => $maxUploadFileSize, |
|
56 | + 'maxHumanFilesize' => $maxHumanFileSize, |
|
57 | + 'freeSpace' => $storageInfo['free'], |
|
58 | + 'usedSpacePercent' => (int)$storageInfo['relative'], |
|
59 | + 'owner' => $storageInfo['owner'], |
|
60 | + 'ownerDisplayName' => $storageInfo['ownerDisplayName'], |
|
61 | + ]; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Determine icon for a given file |
|
66 | - * |
|
67 | - * @param \OCP\Files\FileInfo $file file info |
|
68 | - * @return string icon URL |
|
69 | - */ |
|
70 | - public static function determineIcon($file) { |
|
71 | - if($file['type'] === 'dir') { |
|
72 | - $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir'); |
|
73 | - // TODO: move this part to the client side, using mountType |
|
74 | - if ($file->isShared()) { |
|
75 | - $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared'); |
|
76 | - } elseif ($file->isMounted()) { |
|
77 | - $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); |
|
78 | - } |
|
79 | - }else{ |
|
80 | - $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); |
|
81 | - } |
|
64 | + /** |
|
65 | + * Determine icon for a given file |
|
66 | + * |
|
67 | + * @param \OCP\Files\FileInfo $file file info |
|
68 | + * @return string icon URL |
|
69 | + */ |
|
70 | + public static function determineIcon($file) { |
|
71 | + if($file['type'] === 'dir') { |
|
72 | + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir'); |
|
73 | + // TODO: move this part to the client side, using mountType |
|
74 | + if ($file->isShared()) { |
|
75 | + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared'); |
|
76 | + } elseif ($file->isMounted()) { |
|
77 | + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); |
|
78 | + } |
|
79 | + }else{ |
|
80 | + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); |
|
81 | + } |
|
82 | 82 | |
83 | - return substr($icon, 0, -3) . 'svg'; |
|
84 | - } |
|
83 | + return substr($icon, 0, -3) . 'svg'; |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * Comparator function to sort files alphabetically and have |
|
88 | - * the directories appear first |
|
89 | - * |
|
90 | - * @param \OCP\Files\FileInfo $a file |
|
91 | - * @param \OCP\Files\FileInfo $b file |
|
92 | - * @return int -1 if $a must come before $b, 1 otherwise |
|
93 | - */ |
|
94 | - public static function compareFileNames(FileInfo $a, FileInfo $b) { |
|
95 | - $aType = $a->getType(); |
|
96 | - $bType = $b->getType(); |
|
97 | - if ($aType === 'dir' and $bType !== 'dir') { |
|
98 | - return -1; |
|
99 | - } elseif ($aType !== 'dir' and $bType === 'dir') { |
|
100 | - return 1; |
|
101 | - } else { |
|
102 | - return \OCP\Util::naturalSortCompare($a->getName(), $b->getName()); |
|
103 | - } |
|
104 | - } |
|
86 | + /** |
|
87 | + * Comparator function to sort files alphabetically and have |
|
88 | + * the directories appear first |
|
89 | + * |
|
90 | + * @param \OCP\Files\FileInfo $a file |
|
91 | + * @param \OCP\Files\FileInfo $b file |
|
92 | + * @return int -1 if $a must come before $b, 1 otherwise |
|
93 | + */ |
|
94 | + public static function compareFileNames(FileInfo $a, FileInfo $b) { |
|
95 | + $aType = $a->getType(); |
|
96 | + $bType = $b->getType(); |
|
97 | + if ($aType === 'dir' and $bType !== 'dir') { |
|
98 | + return -1; |
|
99 | + } elseif ($aType !== 'dir' and $bType === 'dir') { |
|
100 | + return 1; |
|
101 | + } else { |
|
102 | + return \OCP\Util::naturalSortCompare($a->getName(), $b->getName()); |
|
103 | + } |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * Comparator function to sort files by date |
|
108 | - * |
|
109 | - * @param \OCP\Files\FileInfo $a file |
|
110 | - * @param \OCP\Files\FileInfo $b file |
|
111 | - * @return int -1 if $a must come before $b, 1 otherwise |
|
112 | - */ |
|
113 | - public static function compareTimestamp(FileInfo $a, FileInfo $b) { |
|
114 | - $aTime = $a->getMTime(); |
|
115 | - $bTime = $b->getMTime(); |
|
116 | - return ($aTime < $bTime) ? -1 : 1; |
|
117 | - } |
|
106 | + /** |
|
107 | + * Comparator function to sort files by date |
|
108 | + * |
|
109 | + * @param \OCP\Files\FileInfo $a file |
|
110 | + * @param \OCP\Files\FileInfo $b file |
|
111 | + * @return int -1 if $a must come before $b, 1 otherwise |
|
112 | + */ |
|
113 | + public static function compareTimestamp(FileInfo $a, FileInfo $b) { |
|
114 | + $aTime = $a->getMTime(); |
|
115 | + $bTime = $b->getMTime(); |
|
116 | + return ($aTime < $bTime) ? -1 : 1; |
|
117 | + } |
|
118 | 118 | |
119 | - /** |
|
120 | - * Comparator function to sort files by size |
|
121 | - * |
|
122 | - * @param \OCP\Files\FileInfo $a file |
|
123 | - * @param \OCP\Files\FileInfo $b file |
|
124 | - * @return int -1 if $a must come before $b, 1 otherwise |
|
125 | - */ |
|
126 | - public static function compareSize(FileInfo $a, FileInfo $b) { |
|
127 | - $aSize = $a->getSize(); |
|
128 | - $bSize = $b->getSize(); |
|
129 | - return ($aSize < $bSize) ? -1 : 1; |
|
130 | - } |
|
119 | + /** |
|
120 | + * Comparator function to sort files by size |
|
121 | + * |
|
122 | + * @param \OCP\Files\FileInfo $a file |
|
123 | + * @param \OCP\Files\FileInfo $b file |
|
124 | + * @return int -1 if $a must come before $b, 1 otherwise |
|
125 | + */ |
|
126 | + public static function compareSize(FileInfo $a, FileInfo $b) { |
|
127 | + $aSize = $a->getSize(); |
|
128 | + $bSize = $b->getSize(); |
|
129 | + return ($aSize < $bSize) ? -1 : 1; |
|
130 | + } |
|
131 | 131 | |
132 | - /** |
|
133 | - * Formats the file info to be returned as JSON to the client. |
|
134 | - * |
|
135 | - * @param \OCP\Files\FileInfo $i |
|
136 | - * @return array formatted file info |
|
137 | - */ |
|
138 | - public static function formatFileInfo(FileInfo $i) { |
|
139 | - $entry = array(); |
|
132 | + /** |
|
133 | + * Formats the file info to be returned as JSON to the client. |
|
134 | + * |
|
135 | + * @param \OCP\Files\FileInfo $i |
|
136 | + * @return array formatted file info |
|
137 | + */ |
|
138 | + public static function formatFileInfo(FileInfo $i) { |
|
139 | + $entry = array(); |
|
140 | 140 | |
141 | - $entry['id'] = $i['fileid']; |
|
142 | - $entry['parentId'] = $i['parent']; |
|
143 | - $entry['mtime'] = $i['mtime'] * 1000; |
|
144 | - // only pick out the needed attributes |
|
145 | - $entry['name'] = $i->getName(); |
|
146 | - $entry['permissions'] = $i['permissions']; |
|
147 | - $entry['mimetype'] = $i['mimetype']; |
|
148 | - $entry['size'] = $i['size']; |
|
149 | - $entry['type'] = $i['type']; |
|
150 | - $entry['etag'] = $i['etag']; |
|
151 | - if (isset($i['tags'])) { |
|
152 | - $entry['tags'] = $i['tags']; |
|
153 | - } |
|
154 | - if (isset($i['displayname_owner'])) { |
|
155 | - $entry['shareOwner'] = $i['displayname_owner']; |
|
156 | - } |
|
157 | - if (isset($i['is_share_mount_point'])) { |
|
158 | - $entry['isShareMountPoint'] = $i['is_share_mount_point']; |
|
159 | - } |
|
160 | - $mountType = null; |
|
161 | - $mount = $i->getMountPoint(); |
|
162 | - $mountType = $mount->getMountType(); |
|
163 | - if ($mountType !== '') { |
|
164 | - if ($i->getInternalPath() === '') { |
|
165 | - $mountType .= '-root'; |
|
166 | - } |
|
167 | - $entry['mountType'] = $mountType; |
|
168 | - } |
|
169 | - if (isset($i['extraData'])) { |
|
170 | - $entry['extraData'] = $i['extraData']; |
|
171 | - } |
|
172 | - return $entry; |
|
173 | - } |
|
141 | + $entry['id'] = $i['fileid']; |
|
142 | + $entry['parentId'] = $i['parent']; |
|
143 | + $entry['mtime'] = $i['mtime'] * 1000; |
|
144 | + // only pick out the needed attributes |
|
145 | + $entry['name'] = $i->getName(); |
|
146 | + $entry['permissions'] = $i['permissions']; |
|
147 | + $entry['mimetype'] = $i['mimetype']; |
|
148 | + $entry['size'] = $i['size']; |
|
149 | + $entry['type'] = $i['type']; |
|
150 | + $entry['etag'] = $i['etag']; |
|
151 | + if (isset($i['tags'])) { |
|
152 | + $entry['tags'] = $i['tags']; |
|
153 | + } |
|
154 | + if (isset($i['displayname_owner'])) { |
|
155 | + $entry['shareOwner'] = $i['displayname_owner']; |
|
156 | + } |
|
157 | + if (isset($i['is_share_mount_point'])) { |
|
158 | + $entry['isShareMountPoint'] = $i['is_share_mount_point']; |
|
159 | + } |
|
160 | + $mountType = null; |
|
161 | + $mount = $i->getMountPoint(); |
|
162 | + $mountType = $mount->getMountType(); |
|
163 | + if ($mountType !== '') { |
|
164 | + if ($i->getInternalPath() === '') { |
|
165 | + $mountType .= '-root'; |
|
166 | + } |
|
167 | + $entry['mountType'] = $mountType; |
|
168 | + } |
|
169 | + if (isset($i['extraData'])) { |
|
170 | + $entry['extraData'] = $i['extraData']; |
|
171 | + } |
|
172 | + return $entry; |
|
173 | + } |
|
174 | 174 | |
175 | - /** |
|
176 | - * Format file info for JSON |
|
177 | - * @param \OCP\Files\FileInfo[] $fileInfos file infos |
|
178 | - * @return array |
|
179 | - */ |
|
180 | - public static function formatFileInfos($fileInfos) { |
|
181 | - $files = array(); |
|
182 | - foreach ($fileInfos as $i) { |
|
183 | - $files[] = self::formatFileInfo($i); |
|
184 | - } |
|
175 | + /** |
|
176 | + * Format file info for JSON |
|
177 | + * @param \OCP\Files\FileInfo[] $fileInfos file infos |
|
178 | + * @return array |
|
179 | + */ |
|
180 | + public static function formatFileInfos($fileInfos) { |
|
181 | + $files = array(); |
|
182 | + foreach ($fileInfos as $i) { |
|
183 | + $files[] = self::formatFileInfo($i); |
|
184 | + } |
|
185 | 185 | |
186 | - return $files; |
|
187 | - } |
|
186 | + return $files; |
|
187 | + } |
|
188 | 188 | |
189 | - /** |
|
190 | - * Retrieves the contents of the given directory and |
|
191 | - * returns it as a sorted array of FileInfo. |
|
192 | - * |
|
193 | - * @param string $dir path to the directory |
|
194 | - * @param string $sortAttribute attribute to sort on |
|
195 | - * @param bool $sortDescending true for descending sort, false otherwise |
|
196 | - * @param string $mimetypeFilter limit returned content to this mimetype or mimepart |
|
197 | - * @return \OCP\Files\FileInfo[] files |
|
198 | - */ |
|
199 | - public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') { |
|
200 | - $content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter); |
|
189 | + /** |
|
190 | + * Retrieves the contents of the given directory and |
|
191 | + * returns it as a sorted array of FileInfo. |
|
192 | + * |
|
193 | + * @param string $dir path to the directory |
|
194 | + * @param string $sortAttribute attribute to sort on |
|
195 | + * @param bool $sortDescending true for descending sort, false otherwise |
|
196 | + * @param string $mimetypeFilter limit returned content to this mimetype or mimepart |
|
197 | + * @return \OCP\Files\FileInfo[] files |
|
198 | + */ |
|
199 | + public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') { |
|
200 | + $content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter); |
|
201 | 201 | |
202 | - return self::sortFiles($content, $sortAttribute, $sortDescending); |
|
203 | - } |
|
202 | + return self::sortFiles($content, $sortAttribute, $sortDescending); |
|
203 | + } |
|
204 | 204 | |
205 | - /** |
|
206 | - * Populate the result set with file tags |
|
207 | - * |
|
208 | - * @param array $fileList |
|
209 | - * @param string $fileIdentifier identifier attribute name for values in $fileList |
|
210 | - * @param ITagManager $tagManager |
|
211 | - * @return array file list populated with tags |
|
212 | - */ |
|
213 | - public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) { |
|
214 | - $ids = []; |
|
215 | - foreach ($fileList as $fileData) { |
|
216 | - $ids[] = $fileData[$fileIdentifier]; |
|
217 | - } |
|
218 | - $tagger = $tagManager->load('files'); |
|
219 | - $tags = $tagger->getTagsForObjects($ids); |
|
205 | + /** |
|
206 | + * Populate the result set with file tags |
|
207 | + * |
|
208 | + * @param array $fileList |
|
209 | + * @param string $fileIdentifier identifier attribute name for values in $fileList |
|
210 | + * @param ITagManager $tagManager |
|
211 | + * @return array file list populated with tags |
|
212 | + */ |
|
213 | + public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) { |
|
214 | + $ids = []; |
|
215 | + foreach ($fileList as $fileData) { |
|
216 | + $ids[] = $fileData[$fileIdentifier]; |
|
217 | + } |
|
218 | + $tagger = $tagManager->load('files'); |
|
219 | + $tags = $tagger->getTagsForObjects($ids); |
|
220 | 220 | |
221 | - if (!is_array($tags)) { |
|
222 | - throw new \UnexpectedValueException('$tags must be an array'); |
|
223 | - } |
|
221 | + if (!is_array($tags)) { |
|
222 | + throw new \UnexpectedValueException('$tags must be an array'); |
|
223 | + } |
|
224 | 224 | |
225 | - // Set empty tag array |
|
226 | - foreach ($fileList as $key => $fileData) { |
|
227 | - $fileList[$key]['tags'] = []; |
|
228 | - } |
|
225 | + // Set empty tag array |
|
226 | + foreach ($fileList as $key => $fileData) { |
|
227 | + $fileList[$key]['tags'] = []; |
|
228 | + } |
|
229 | 229 | |
230 | - if (!empty($tags)) { |
|
231 | - foreach ($tags as $fileId => $fileTags) { |
|
230 | + if (!empty($tags)) { |
|
231 | + foreach ($tags as $fileId => $fileTags) { |
|
232 | 232 | |
233 | - foreach ($fileList as $key => $fileData) { |
|
234 | - if ($fileId !== $fileData[$fileIdentifier]) { |
|
235 | - continue; |
|
236 | - } |
|
233 | + foreach ($fileList as $key => $fileData) { |
|
234 | + if ($fileId !== $fileData[$fileIdentifier]) { |
|
235 | + continue; |
|
236 | + } |
|
237 | 237 | |
238 | - $fileList[$key]['tags'] = $fileTags; |
|
239 | - } |
|
240 | - } |
|
241 | - } |
|
238 | + $fileList[$key]['tags'] = $fileTags; |
|
239 | + } |
|
240 | + } |
|
241 | + } |
|
242 | 242 | |
243 | - return $fileList; |
|
244 | - } |
|
243 | + return $fileList; |
|
244 | + } |
|
245 | 245 | |
246 | - /** |
|
247 | - * Sort the given file info array |
|
248 | - * |
|
249 | - * @param \OCP\Files\FileInfo[] $files files to sort |
|
250 | - * @param string $sortAttribute attribute to sort on |
|
251 | - * @param bool $sortDescending true for descending sort, false otherwise |
|
252 | - * @return \OCP\Files\FileInfo[] sorted files |
|
253 | - */ |
|
254 | - public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) { |
|
255 | - $sortFunc = 'compareFileNames'; |
|
256 | - if ($sortAttribute === 'mtime') { |
|
257 | - $sortFunc = 'compareTimestamp'; |
|
258 | - } else if ($sortAttribute === 'size') { |
|
259 | - $sortFunc = 'compareSize'; |
|
260 | - } |
|
261 | - usort($files, array('\OCA\Files\Helper', $sortFunc)); |
|
262 | - if ($sortDescending) { |
|
263 | - $files = array_reverse($files); |
|
264 | - } |
|
265 | - return $files; |
|
266 | - } |
|
246 | + /** |
|
247 | + * Sort the given file info array |
|
248 | + * |
|
249 | + * @param \OCP\Files\FileInfo[] $files files to sort |
|
250 | + * @param string $sortAttribute attribute to sort on |
|
251 | + * @param bool $sortDescending true for descending sort, false otherwise |
|
252 | + * @return \OCP\Files\FileInfo[] sorted files |
|
253 | + */ |
|
254 | + public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) { |
|
255 | + $sortFunc = 'compareFileNames'; |
|
256 | + if ($sortAttribute === 'mtime') { |
|
257 | + $sortFunc = 'compareTimestamp'; |
|
258 | + } else if ($sortAttribute === 'size') { |
|
259 | + $sortFunc = 'compareSize'; |
|
260 | + } |
|
261 | + usort($files, array('\OCA\Files\Helper', $sortFunc)); |
|
262 | + if ($sortDescending) { |
|
263 | + $files = array_reverse($files); |
|
264 | + } |
|
265 | + return $files; |
|
266 | + } |
|
267 | 267 | } |
@@ -35,51 +35,51 @@ |
||
35 | 35 | */ |
36 | 36 | class DeleteOrphanedFiles extends Command { |
37 | 37 | |
38 | - const CHUNK_SIZE = 200; |
|
38 | + const CHUNK_SIZE = 200; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @var IDBConnection |
|
42 | - */ |
|
43 | - protected $connection; |
|
40 | + /** |
|
41 | + * @var IDBConnection |
|
42 | + */ |
|
43 | + protected $connection; |
|
44 | 44 | |
45 | - public function __construct(IDBConnection $connection) { |
|
46 | - $this->connection = $connection; |
|
47 | - parent::__construct(); |
|
48 | - } |
|
45 | + public function __construct(IDBConnection $connection) { |
|
46 | + $this->connection = $connection; |
|
47 | + parent::__construct(); |
|
48 | + } |
|
49 | 49 | |
50 | - protected function configure() { |
|
51 | - $this |
|
52 | - ->setName('files:cleanup') |
|
53 | - ->setDescription('cleanup filecache'); |
|
54 | - } |
|
50 | + protected function configure() { |
|
51 | + $this |
|
52 | + ->setName('files:cleanup') |
|
53 | + ->setDescription('cleanup filecache'); |
|
54 | + } |
|
55 | 55 | |
56 | - public function execute(InputInterface $input, OutputInterface $output) { |
|
57 | - $deletedEntries = 0; |
|
56 | + public function execute(InputInterface $input, OutputInterface $output) { |
|
57 | + $deletedEntries = 0; |
|
58 | 58 | |
59 | - $query = $this->connection->getQueryBuilder(); |
|
60 | - $query->select('fc.fileid') |
|
61 | - ->from('filecache', 'fc') |
|
62 | - ->where($query->expr()->isNull('s.numeric_id')) |
|
63 | - ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id')) |
|
64 | - ->setMaxResults(self::CHUNK_SIZE); |
|
59 | + $query = $this->connection->getQueryBuilder(); |
|
60 | + $query->select('fc.fileid') |
|
61 | + ->from('filecache', 'fc') |
|
62 | + ->where($query->expr()->isNull('s.numeric_id')) |
|
63 | + ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id')) |
|
64 | + ->setMaxResults(self::CHUNK_SIZE); |
|
65 | 65 | |
66 | - $deleteQuery = $this->connection->getQueryBuilder(); |
|
67 | - $deleteQuery->delete('filecache') |
|
68 | - ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid'))); |
|
66 | + $deleteQuery = $this->connection->getQueryBuilder(); |
|
67 | + $deleteQuery->delete('filecache') |
|
68 | + ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid'))); |
|
69 | 69 | |
70 | - $deletedInLastChunk = self::CHUNK_SIZE; |
|
71 | - while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
72 | - $deletedInLastChunk = 0; |
|
73 | - $result = $query->execute(); |
|
74 | - while ($row = $result->fetch()) { |
|
75 | - $deletedInLastChunk++; |
|
76 | - $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid']) |
|
77 | - ->execute(); |
|
78 | - } |
|
79 | - $result->closeCursor(); |
|
80 | - } |
|
70 | + $deletedInLastChunk = self::CHUNK_SIZE; |
|
71 | + while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
72 | + $deletedInLastChunk = 0; |
|
73 | + $result = $query->execute(); |
|
74 | + while ($row = $result->fetch()) { |
|
75 | + $deletedInLastChunk++; |
|
76 | + $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid']) |
|
77 | + ->execute(); |
|
78 | + } |
|
79 | + $result->closeCursor(); |
|
80 | + } |
|
81 | 81 | |
82 | - $output->writeln("$deletedEntries orphaned file cache entries deleted"); |
|
83 | - } |
|
82 | + $output->writeln("$deletedEntries orphaned file cache entries deleted"); |
|
83 | + } |
|
84 | 84 | |
85 | 85 | } |
@@ -34,29 +34,29 @@ |
||
34 | 34 | * @package OCA\Files |
35 | 35 | */ |
36 | 36 | class Capabilities implements ICapability { |
37 | - /** @var IConfig */ |
|
38 | - protected $config; |
|
37 | + /** @var IConfig */ |
|
38 | + protected $config; |
|
39 | 39 | |
40 | - /** |
|
41 | - * Capabilities constructor. |
|
42 | - * |
|
43 | - * @param IConfig $config |
|
44 | - */ |
|
45 | - public function __construct(IConfig $config) { |
|
46 | - $this->config = $config; |
|
47 | - } |
|
40 | + /** |
|
41 | + * Capabilities constructor. |
|
42 | + * |
|
43 | + * @param IConfig $config |
|
44 | + */ |
|
45 | + public function __construct(IConfig $config) { |
|
46 | + $this->config = $config; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Return this classes capabilities |
|
51 | - * |
|
52 | - * @return array |
|
53 | - */ |
|
54 | - public function getCapabilities() { |
|
55 | - return [ |
|
56 | - 'files' => [ |
|
57 | - 'bigfilechunking' => true, |
|
58 | - 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), |
|
59 | - ], |
|
60 | - ]; |
|
61 | - } |
|
49 | + /** |
|
50 | + * Return this classes capabilities |
|
51 | + * |
|
52 | + * @return array |
|
53 | + */ |
|
54 | + public function getCapabilities() { |
|
55 | + return [ |
|
56 | + 'files' => [ |
|
57 | + 'bigfilechunking' => true, |
|
58 | + 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), |
|
59 | + ], |
|
60 | + ]; |
|
61 | + } |
|
62 | 62 | } |
@@ -30,29 +30,29 @@ |
||
30 | 30 | */ |
31 | 31 | class CleanupFileLocks extends TimedJob { |
32 | 32 | |
33 | - /** |
|
34 | - * Default interval in minutes |
|
35 | - * |
|
36 | - * @var int $defaultIntervalMin |
|
37 | - **/ |
|
38 | - protected $defaultIntervalMin = 5; |
|
33 | + /** |
|
34 | + * Default interval in minutes |
|
35 | + * |
|
36 | + * @var int $defaultIntervalMin |
|
37 | + **/ |
|
38 | + protected $defaultIntervalMin = 5; |
|
39 | 39 | |
40 | - /** |
|
41 | - * sets the correct interval for this timed job |
|
42 | - */ |
|
43 | - public function __construct() { |
|
44 | - $this->interval = $this->defaultIntervalMin * 60; |
|
45 | - } |
|
40 | + /** |
|
41 | + * sets the correct interval for this timed job |
|
42 | + */ |
|
43 | + public function __construct() { |
|
44 | + $this->interval = $this->defaultIntervalMin * 60; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Makes the background job do its work |
|
49 | - * |
|
50 | - * @param array $argument unused argument |
|
51 | - */ |
|
52 | - public function run($argument) { |
|
53 | - $lockingProvider = \OC::$server->getLockingProvider(); |
|
54 | - if($lockingProvider instanceof DBLockingProvider) { |
|
55 | - $lockingProvider->cleanExpiredLocks(); |
|
56 | - } |
|
57 | - } |
|
47 | + /** |
|
48 | + * Makes the background job do its work |
|
49 | + * |
|
50 | + * @param array $argument unused argument |
|
51 | + */ |
|
52 | + public function run($argument) { |
|
53 | + $lockingProvider = \OC::$server->getLockingProvider(); |
|
54 | + if($lockingProvider instanceof DBLockingProvider) { |
|
55 | + $lockingProvider->cleanExpiredLocks(); |
|
56 | + } |
|
57 | + } |
|
58 | 58 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | */ |
52 | 52 | public function run($argument) { |
53 | 53 | $lockingProvider = \OC::$server->getLockingProvider(); |
54 | - if($lockingProvider instanceof DBLockingProvider) { |
|
54 | + if ($lockingProvider instanceof DBLockingProvider) { |
|
55 | 55 | $lockingProvider->cleanExpiredLocks(); |
56 | 56 | } |
57 | 57 | } |
@@ -32,123 +32,123 @@ |
||
32 | 32 | */ |
33 | 33 | class DeleteOrphanedItems extends TimedJob { |
34 | 34 | |
35 | - const CHUNK_SIZE = 200; |
|
36 | - |
|
37 | - /** @var \OCP\IDBConnection */ |
|
38 | - protected $connection; |
|
39 | - |
|
40 | - /** @var \OCP\ILogger */ |
|
41 | - protected $logger; |
|
42 | - |
|
43 | - /** |
|
44 | - * Default interval in minutes |
|
45 | - * |
|
46 | - * @var int $defaultIntervalMin |
|
47 | - **/ |
|
48 | - protected $defaultIntervalMin = 60; |
|
49 | - |
|
50 | - /** |
|
51 | - * sets the correct interval for this timed job |
|
52 | - */ |
|
53 | - public function __construct() { |
|
54 | - $this->interval = $this->defaultIntervalMin * 60; |
|
55 | - $this->connection = \OC::$server->getDatabaseConnection(); |
|
56 | - $this->logger = \OC::$server->getLogger(); |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * Makes the background job do its work |
|
61 | - * |
|
62 | - * @param array $argument unused argument |
|
63 | - */ |
|
64 | - public function run($argument) { |
|
65 | - $this->cleanSystemTags(); |
|
66 | - $this->cleanUserTags(); |
|
67 | - $this->cleanComments(); |
|
68 | - $this->cleanCommentMarkers(); |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * Deleting orphaned system tag mappings |
|
73 | - * |
|
74 | - * @param string $table |
|
75 | - * @param string $idCol |
|
76 | - * @param string $typeCol |
|
77 | - * @return int Number of deleted entries |
|
78 | - */ |
|
79 | - protected function cleanUp($table, $idCol, $typeCol) { |
|
80 | - $deletedEntries = 0; |
|
81 | - |
|
82 | - $query = $this->connection->getQueryBuilder(); |
|
83 | - $query->select('t1.' . $idCol) |
|
84 | - ->from($table, 't1') |
|
85 | - ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
|
86 | - ->andWhere($query->expr()->isNull('t2.fileid')) |
|
87 | - ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | - ->groupBy('t1.' . $idCol) |
|
89 | - ->setMaxResults(self::CHUNK_SIZE); |
|
90 | - |
|
91 | - $deleteQuery = $this->connection->getQueryBuilder(); |
|
92 | - $deleteQuery->delete($table) |
|
93 | - ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid'))); |
|
94 | - |
|
95 | - $deletedInLastChunk = self::CHUNK_SIZE; |
|
96 | - while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
97 | - $result = $query->execute(); |
|
98 | - $deletedInLastChunk = 0; |
|
99 | - while ($row = $result->fetch()) { |
|
100 | - $deletedInLastChunk++; |
|
101 | - $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol]) |
|
102 | - ->execute(); |
|
103 | - } |
|
104 | - $result->closeCursor(); |
|
105 | - } |
|
106 | - |
|
107 | - return $deletedEntries; |
|
108 | - } |
|
109 | - |
|
110 | - /** |
|
111 | - * Deleting orphaned system tag mappings |
|
112 | - * |
|
113 | - * @return int Number of deleted entries |
|
114 | - */ |
|
115 | - protected function cleanSystemTags() { |
|
116 | - $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype'); |
|
117 | - $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
118 | - return $deletedEntries; |
|
119 | - } |
|
120 | - |
|
121 | - /** |
|
122 | - * Deleting orphaned user tag mappings |
|
123 | - * |
|
124 | - * @return int Number of deleted entries |
|
125 | - */ |
|
126 | - protected function cleanUserTags() { |
|
127 | - $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type'); |
|
128 | - $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
129 | - return $deletedEntries; |
|
130 | - } |
|
131 | - |
|
132 | - /** |
|
133 | - * Deleting orphaned comments |
|
134 | - * |
|
135 | - * @return int Number of deleted entries |
|
136 | - */ |
|
137 | - protected function cleanComments() { |
|
138 | - $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type'); |
|
139 | - $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']); |
|
140 | - return $deletedEntries; |
|
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * Deleting orphaned comment read markers |
|
145 | - * |
|
146 | - * @return int Number of deleted entries |
|
147 | - */ |
|
148 | - protected function cleanCommentMarkers() { |
|
149 | - $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type'); |
|
150 | - $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']); |
|
151 | - return $deletedEntries; |
|
152 | - } |
|
35 | + const CHUNK_SIZE = 200; |
|
36 | + |
|
37 | + /** @var \OCP\IDBConnection */ |
|
38 | + protected $connection; |
|
39 | + |
|
40 | + /** @var \OCP\ILogger */ |
|
41 | + protected $logger; |
|
42 | + |
|
43 | + /** |
|
44 | + * Default interval in minutes |
|
45 | + * |
|
46 | + * @var int $defaultIntervalMin |
|
47 | + **/ |
|
48 | + protected $defaultIntervalMin = 60; |
|
49 | + |
|
50 | + /** |
|
51 | + * sets the correct interval for this timed job |
|
52 | + */ |
|
53 | + public function __construct() { |
|
54 | + $this->interval = $this->defaultIntervalMin * 60; |
|
55 | + $this->connection = \OC::$server->getDatabaseConnection(); |
|
56 | + $this->logger = \OC::$server->getLogger(); |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * Makes the background job do its work |
|
61 | + * |
|
62 | + * @param array $argument unused argument |
|
63 | + */ |
|
64 | + public function run($argument) { |
|
65 | + $this->cleanSystemTags(); |
|
66 | + $this->cleanUserTags(); |
|
67 | + $this->cleanComments(); |
|
68 | + $this->cleanCommentMarkers(); |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * Deleting orphaned system tag mappings |
|
73 | + * |
|
74 | + * @param string $table |
|
75 | + * @param string $idCol |
|
76 | + * @param string $typeCol |
|
77 | + * @return int Number of deleted entries |
|
78 | + */ |
|
79 | + protected function cleanUp($table, $idCol, $typeCol) { |
|
80 | + $deletedEntries = 0; |
|
81 | + |
|
82 | + $query = $this->connection->getQueryBuilder(); |
|
83 | + $query->select('t1.' . $idCol) |
|
84 | + ->from($table, 't1') |
|
85 | + ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
|
86 | + ->andWhere($query->expr()->isNull('t2.fileid')) |
|
87 | + ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | + ->groupBy('t1.' . $idCol) |
|
89 | + ->setMaxResults(self::CHUNK_SIZE); |
|
90 | + |
|
91 | + $deleteQuery = $this->connection->getQueryBuilder(); |
|
92 | + $deleteQuery->delete($table) |
|
93 | + ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid'))); |
|
94 | + |
|
95 | + $deletedInLastChunk = self::CHUNK_SIZE; |
|
96 | + while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
97 | + $result = $query->execute(); |
|
98 | + $deletedInLastChunk = 0; |
|
99 | + while ($row = $result->fetch()) { |
|
100 | + $deletedInLastChunk++; |
|
101 | + $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol]) |
|
102 | + ->execute(); |
|
103 | + } |
|
104 | + $result->closeCursor(); |
|
105 | + } |
|
106 | + |
|
107 | + return $deletedEntries; |
|
108 | + } |
|
109 | + |
|
110 | + /** |
|
111 | + * Deleting orphaned system tag mappings |
|
112 | + * |
|
113 | + * @return int Number of deleted entries |
|
114 | + */ |
|
115 | + protected function cleanSystemTags() { |
|
116 | + $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype'); |
|
117 | + $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
118 | + return $deletedEntries; |
|
119 | + } |
|
120 | + |
|
121 | + /** |
|
122 | + * Deleting orphaned user tag mappings |
|
123 | + * |
|
124 | + * @return int Number of deleted entries |
|
125 | + */ |
|
126 | + protected function cleanUserTags() { |
|
127 | + $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type'); |
|
128 | + $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
129 | + return $deletedEntries; |
|
130 | + } |
|
131 | + |
|
132 | + /** |
|
133 | + * Deleting orphaned comments |
|
134 | + * |
|
135 | + * @return int Number of deleted entries |
|
136 | + */ |
|
137 | + protected function cleanComments() { |
|
138 | + $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type'); |
|
139 | + $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']); |
|
140 | + return $deletedEntries; |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * Deleting orphaned comment read markers |
|
145 | + * |
|
146 | + * @return int Number of deleted entries |
|
147 | + */ |
|
148 | + protected function cleanCommentMarkers() { |
|
149 | + $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type'); |
|
150 | + $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']); |
|
151 | + return $deletedEntries; |
|
152 | + } |
|
153 | 153 | |
154 | 154 | } |
@@ -80,12 +80,12 @@ |
||
80 | 80 | $deletedEntries = 0; |
81 | 81 | |
82 | 82 | $query = $this->connection->getQueryBuilder(); |
83 | - $query->select('t1.' . $idCol) |
|
83 | + $query->select('t1.'.$idCol) |
|
84 | 84 | ->from($table, 't1') |
85 | 85 | ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
86 | 86 | ->andWhere($query->expr()->isNull('t2.fileid')) |
87 | - ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | - ->groupBy('t1.' . $idCol) |
|
87 | + ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | + ->groupBy('t1.'.$idCol) |
|
89 | 89 | ->setMaxResults(self::CHUNK_SIZE); |
90 | 90 | |
91 | 91 | $deleteQuery = $this->connection->getQueryBuilder(); |
@@ -36,80 +36,80 @@ |
||
36 | 36 | * @package OCA\Files\BackgroundJob |
37 | 37 | */ |
38 | 38 | class ScanFiles extends \OC\BackgroundJob\TimedJob { |
39 | - /** @var IConfig */ |
|
40 | - private $config; |
|
41 | - /** @var IUserManager */ |
|
42 | - private $userManager; |
|
43 | - /** @var IDBConnection */ |
|
44 | - private $dbConnection; |
|
45 | - /** @var ILogger */ |
|
46 | - private $logger; |
|
47 | - /** Amount of users that should get scanned per execution */ |
|
48 | - const USERS_PER_SESSION = 500; |
|
39 | + /** @var IConfig */ |
|
40 | + private $config; |
|
41 | + /** @var IUserManager */ |
|
42 | + private $userManager; |
|
43 | + /** @var IDBConnection */ |
|
44 | + private $dbConnection; |
|
45 | + /** @var ILogger */ |
|
46 | + private $logger; |
|
47 | + /** Amount of users that should get scanned per execution */ |
|
48 | + const USERS_PER_SESSION = 500; |
|
49 | 49 | |
50 | - /** |
|
51 | - * @param IConfig|null $config |
|
52 | - * @param IUserManager|null $userManager |
|
53 | - * @param IDBConnection|null $dbConnection |
|
54 | - * @param ILogger|null $logger |
|
55 | - */ |
|
56 | - public function __construct(IConfig $config = null, |
|
57 | - IUserManager $userManager = null, |
|
58 | - IDBConnection $dbConnection = null, |
|
59 | - ILogger $logger = null) { |
|
60 | - // Run once per 10 minutes |
|
61 | - $this->setInterval(60 * 10); |
|
50 | + /** |
|
51 | + * @param IConfig|null $config |
|
52 | + * @param IUserManager|null $userManager |
|
53 | + * @param IDBConnection|null $dbConnection |
|
54 | + * @param ILogger|null $logger |
|
55 | + */ |
|
56 | + public function __construct(IConfig $config = null, |
|
57 | + IUserManager $userManager = null, |
|
58 | + IDBConnection $dbConnection = null, |
|
59 | + ILogger $logger = null) { |
|
60 | + // Run once per 10 minutes |
|
61 | + $this->setInterval(60 * 10); |
|
62 | 62 | |
63 | - if (is_null($userManager) || is_null($config)) { |
|
64 | - $this->fixDIForJobs(); |
|
65 | - } else { |
|
66 | - $this->config = $config; |
|
67 | - $this->userManager = $userManager; |
|
68 | - $this->logger = $logger; |
|
69 | - } |
|
70 | - } |
|
63 | + if (is_null($userManager) || is_null($config)) { |
|
64 | + $this->fixDIForJobs(); |
|
65 | + } else { |
|
66 | + $this->config = $config; |
|
67 | + $this->userManager = $userManager; |
|
68 | + $this->logger = $logger; |
|
69 | + } |
|
70 | + } |
|
71 | 71 | |
72 | - protected function fixDIForJobs() { |
|
73 | - $this->config = \OC::$server->getConfig(); |
|
74 | - $this->userManager = \OC::$server->getUserManager(); |
|
75 | - $this->logger = \OC::$server->getLogger(); |
|
76 | - } |
|
72 | + protected function fixDIForJobs() { |
|
73 | + $this->config = \OC::$server->getConfig(); |
|
74 | + $this->userManager = \OC::$server->getUserManager(); |
|
75 | + $this->logger = \OC::$server->getLogger(); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @param IUser $user |
|
80 | - */ |
|
81 | - protected function runScanner(IUser $user) { |
|
82 | - try { |
|
83 | - $scanner = new Scanner( |
|
84 | - $user->getUID(), |
|
85 | - $this->dbConnection, |
|
86 | - $this->logger |
|
87 | - ); |
|
88 | - $scanner->backgroundScan(''); |
|
89 | - } catch (\Exception $e) { |
|
90 | - $this->logger->logException($e, ['app' => 'files']); |
|
91 | - } |
|
92 | - \OC_Util::tearDownFS(); |
|
93 | - } |
|
78 | + /** |
|
79 | + * @param IUser $user |
|
80 | + */ |
|
81 | + protected function runScanner(IUser $user) { |
|
82 | + try { |
|
83 | + $scanner = new Scanner( |
|
84 | + $user->getUID(), |
|
85 | + $this->dbConnection, |
|
86 | + $this->logger |
|
87 | + ); |
|
88 | + $scanner->backgroundScan(''); |
|
89 | + } catch (\Exception $e) { |
|
90 | + $this->logger->logException($e, ['app' => 'files']); |
|
91 | + } |
|
92 | + \OC_Util::tearDownFS(); |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * @param $argument |
|
97 | - * @throws \Exception |
|
98 | - */ |
|
99 | - protected function run($argument) { |
|
100 | - $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0); |
|
101 | - $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset); |
|
102 | - if (!count($users)) { |
|
103 | - // No users found, reset offset and retry |
|
104 | - $offset = 0; |
|
105 | - $users = $this->userManager->search('', self::USERS_PER_SESSION); |
|
106 | - } |
|
95 | + /** |
|
96 | + * @param $argument |
|
97 | + * @throws \Exception |
|
98 | + */ |
|
99 | + protected function run($argument) { |
|
100 | + $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0); |
|
101 | + $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset); |
|
102 | + if (!count($users)) { |
|
103 | + // No users found, reset offset and retry |
|
104 | + $offset = 0; |
|
105 | + $users = $this->userManager->search('', self::USERS_PER_SESSION); |
|
106 | + } |
|
107 | 107 | |
108 | - $offset += self::USERS_PER_SESSION; |
|
109 | - $this->config->setAppValue('files', 'cronjob_scan_files', $offset); |
|
108 | + $offset += self::USERS_PER_SESSION; |
|
109 | + $this->config->setAppValue('files', 'cronjob_scan_files', $offset); |
|
110 | 110 | |
111 | - foreach ($users as $user) { |
|
112 | - $this->runScanner($user); |
|
113 | - } |
|
114 | - } |
|
111 | + foreach ($users as $user) { |
|
112 | + $this->runScanner($user); |
|
113 | + } |
|
114 | + } |
|
115 | 115 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | $maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size)); |
56 | 56 | |
57 | 57 | $parameters = [ |
58 | - 'uploadChangable' => (($htaccessWorking and $htaccessWritable) or $userIniWritable ), |
|
58 | + 'uploadChangable' => (($htaccessWorking and $htaccessWritable) or $userIniWritable), |
|
59 | 59 | 'uploadMaxFilesize' => $maxUploadFilesize, |
60 | 60 | // max possible makes only sense on a 32 bit system |
61 | 61 | 'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4, |
@@ -31,56 +31,56 @@ |
||
31 | 31 | |
32 | 32 | class Admin implements ISettings { |
33 | 33 | |
34 | - /** @var IniGetWrapper */ |
|
35 | - private $iniWrapper; |
|
34 | + /** @var IniGetWrapper */ |
|
35 | + private $iniWrapper; |
|
36 | 36 | |
37 | - /** @var IRequest */ |
|
38 | - private $request; |
|
37 | + /** @var IRequest */ |
|
38 | + private $request; |
|
39 | 39 | |
40 | - public function __construct(IniGetWrapper $iniWrapper, IRequest $request) { |
|
41 | - $this->iniWrapper = $iniWrapper; |
|
42 | - $this->request = $request; |
|
43 | - } |
|
40 | + public function __construct(IniGetWrapper $iniWrapper, IRequest $request) { |
|
41 | + $this->iniWrapper = $iniWrapper; |
|
42 | + $this->request = $request; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @return TemplateResponse |
|
47 | - */ |
|
48 | - public function getForm() { |
|
49 | - $htaccessWorking = (getenv('htaccessWorking') === 'true'); |
|
50 | - $htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess'); |
|
51 | - $userIniWritable = is_writable(\OC::$SERVERROOT.'/.user.ini'); |
|
45 | + /** |
|
46 | + * @return TemplateResponse |
|
47 | + */ |
|
48 | + public function getForm() { |
|
49 | + $htaccessWorking = (getenv('htaccessWorking') === 'true'); |
|
50 | + $htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess'); |
|
51 | + $userIniWritable = is_writable(\OC::$SERVERROOT.'/.user.ini'); |
|
52 | 52 | |
53 | - $upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize'); |
|
54 | - $post_max_size = $this->iniWrapper->getBytes('post_max_size'); |
|
55 | - $maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size)); |
|
53 | + $upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize'); |
|
54 | + $post_max_size = $this->iniWrapper->getBytes('post_max_size'); |
|
55 | + $maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size)); |
|
56 | 56 | |
57 | - $parameters = [ |
|
58 | - 'uploadChangable' => (($htaccessWorking and $htaccessWritable) or $userIniWritable ), |
|
59 | - 'uploadMaxFilesize' => $maxUploadFilesize, |
|
60 | - // max possible makes only sense on a 32 bit system |
|
61 | - 'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4, |
|
62 | - 'maxPossibleUploadSize' => Util::humanFileSize(PHP_INT_MAX), |
|
63 | - ]; |
|
57 | + $parameters = [ |
|
58 | + 'uploadChangable' => (($htaccessWorking and $htaccessWritable) or $userIniWritable ), |
|
59 | + 'uploadMaxFilesize' => $maxUploadFilesize, |
|
60 | + // max possible makes only sense on a 32 bit system |
|
61 | + 'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4, |
|
62 | + 'maxPossibleUploadSize' => Util::humanFileSize(PHP_INT_MAX), |
|
63 | + ]; |
|
64 | 64 | |
65 | - return new TemplateResponse('files', 'admin', $parameters, ''); |
|
66 | - } |
|
65 | + return new TemplateResponse('files', 'admin', $parameters, ''); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @return string the section ID, e.g. 'sharing' |
|
70 | - */ |
|
71 | - public function getSection() { |
|
72 | - return 'additional'; |
|
73 | - } |
|
68 | + /** |
|
69 | + * @return string the section ID, e.g. 'sharing' |
|
70 | + */ |
|
71 | + public function getSection() { |
|
72 | + return 'additional'; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @return int whether the form should be rather on the top or bottom of |
|
77 | - * the admin section. The forms are arranged in ascending order of the |
|
78 | - * priority values. It is required to return a value between 0 and 100. |
|
79 | - * |
|
80 | - * E.g.: 70 |
|
81 | - */ |
|
82 | - public function getPriority() { |
|
83 | - return 5; |
|
84 | - } |
|
75 | + /** |
|
76 | + * @return int whether the form should be rather on the top or bottom of |
|
77 | + * the admin section. The forms are arranged in ascending order of the |
|
78 | + * priority values. It is required to return a value between 0 and 100. |
|
79 | + * |
|
80 | + * E.g.: 70 |
|
81 | + */ |
|
82 | + public function getPriority() { |
|
83 | + return 5; |
|
84 | + } |
|
85 | 85 | |
86 | 86 | } |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $filename = $_GET["file"]; |
31 | 31 | |
32 | 32 | if(!\OC\Files\Filesystem::file_exists($filename)) { |
33 | - header("HTTP/1.0 404 Not Found"); |
|
34 | - $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
35 | - $tmpl->assign('file', $filename); |
|
36 | - $tmpl->printPage(); |
|
37 | - exit; |
|
33 | + header("HTTP/1.0 404 Not Found"); |
|
34 | + $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
35 | + $tmpl->assign('file', $filename); |
|
36 | + $tmpl->printPage(); |
|
37 | + exit; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); |
@@ -29,15 +29,15 @@ discard block |
||
29 | 29 | |
30 | 30 | $filename = $_GET["file"]; |
31 | 31 | |
32 | -if(!\OC\Files\Filesystem::file_exists($filename)) { |
|
32 | +if (!\OC\Files\Filesystem::file_exists($filename)) { |
|
33 | 33 | header("HTTP/1.0 404 Not Found"); |
34 | - $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
34 | + $tmpl = new OCP\Template('', '404', 'guest'); |
|
35 | 35 | $tmpl->assign('file', $filename); |
36 | 36 | $tmpl->printPage(); |
37 | 37 | exit; |
38 | 38 | } |
39 | 39 | |
40 | -$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); |
|
40 | +$ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename)); |
|
41 | 41 | |
42 | 42 | header('Content-Type:'.$ftype); |
43 | 43 | OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); |
@@ -45,4 +45,4 @@ discard block |
||
45 | 45 | OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename)); |
46 | 46 | |
47 | 47 | OC_Util::obEnd(); |
48 | -\OC\Files\Filesystem::readfile( $filename ); |
|
48 | +\OC\Files\Filesystem::readfile($filename); |