@@ -34,162 +34,162 @@ |
||
| 34 | 34 | use OCP\Migration\IRepairStep; |
| 35 | 35 | |
| 36 | 36 | class RepairMimeTypes implements IRepairStep { |
| 37 | - /** |
|
| 38 | - * @var \OCP\IConfig |
|
| 39 | - */ |
|
| 40 | - protected $config; |
|
| 41 | - |
|
| 42 | - /** |
|
| 43 | - * @var int |
|
| 44 | - */ |
|
| 45 | - protected $folderMimeTypeId; |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * @param \OCP\IConfig $config |
|
| 49 | - */ |
|
| 50 | - public function __construct($config) { |
|
| 51 | - $this->config = $config; |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - public function getName() { |
|
| 55 | - return 'Repair mime types'; |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - private static function existsStmt() { |
|
| 59 | - return \OC_DB::prepare(' |
|
| 37 | + /** |
|
| 38 | + * @var \OCP\IConfig |
|
| 39 | + */ |
|
| 40 | + protected $config; |
|
| 41 | + |
|
| 42 | + /** |
|
| 43 | + * @var int |
|
| 44 | + */ |
|
| 45 | + protected $folderMimeTypeId; |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * @param \OCP\IConfig $config |
|
| 49 | + */ |
|
| 50 | + public function __construct($config) { |
|
| 51 | + $this->config = $config; |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + public function getName() { |
|
| 55 | + return 'Repair mime types'; |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + private static function existsStmt() { |
|
| 59 | + return \OC_DB::prepare(' |
|
| 60 | 60 | SELECT count(`mimetype`) |
| 61 | 61 | FROM `*PREFIX*mimetypes` |
| 62 | 62 | WHERE `mimetype` = ? |
| 63 | 63 | '); |
| 64 | - } |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - private static function getIdStmt() { |
|
| 67 | - return \OC_DB::prepare(' |
|
| 66 | + private static function getIdStmt() { |
|
| 67 | + return \OC_DB::prepare(' |
|
| 68 | 68 | SELECT `id` |
| 69 | 69 | FROM `*PREFIX*mimetypes` |
| 70 | 70 | WHERE `mimetype` = ? |
| 71 | 71 | '); |
| 72 | - } |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - private static function insertStmt() { |
|
| 75 | - return \OC_DB::prepare(' |
|
| 74 | + private static function insertStmt() { |
|
| 75 | + return \OC_DB::prepare(' |
|
| 76 | 76 | INSERT INTO `*PREFIX*mimetypes` ( `mimetype` ) |
| 77 | 77 | VALUES ( ? ) |
| 78 | 78 | '); |
| 79 | - } |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - private static function updateByNameStmt() { |
|
| 82 | - return \OC_DB::prepare(' |
|
| 81 | + private static function updateByNameStmt() { |
|
| 82 | + return \OC_DB::prepare(' |
|
| 83 | 83 | UPDATE `*PREFIX*filecache` |
| 84 | 84 | SET `mimetype` = ? |
| 85 | 85 | WHERE `mimetype` <> ? AND `mimetype` <> ? AND `name` ILIKE ? |
| 86 | 86 | '); |
| 87 | - } |
|
| 88 | - |
|
| 89 | - private function updateMimetypes($updatedMimetypes) { |
|
| 90 | - if (empty($this->folderMimeTypeId)) { |
|
| 91 | - $result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory')); |
|
| 92 | - $this->folderMimeTypeId = (int)$result->fetchOne(); |
|
| 93 | - } |
|
| 94 | - |
|
| 95 | - $count = 0; |
|
| 96 | - foreach ($updatedMimetypes as $extension => $mimetype) { |
|
| 97 | - $result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype)); |
|
| 98 | - $exists = $result->fetchOne(); |
|
| 99 | - |
|
| 100 | - if (!$exists) { |
|
| 101 | - // insert mimetype |
|
| 102 | - \OC_DB::executeAudited(self::insertStmt(), array($mimetype)); |
|
| 103 | - } |
|
| 104 | - |
|
| 105 | - // get target mimetype id |
|
| 106 | - $result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype)); |
|
| 107 | - $mimetypeId = $result->fetchOne(); |
|
| 108 | - |
|
| 109 | - // change mimetype for files with x extension |
|
| 110 | - $count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension)); |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - return $count; |
|
| 114 | - } |
|
| 115 | - |
|
| 116 | - private function introduceImageTypes() { |
|
| 117 | - $updatedMimetypes = array( |
|
| 118 | - 'jp2' => 'image/jp2', |
|
| 119 | - 'webp' => 'image/webp', |
|
| 120 | - ); |
|
| 121 | - |
|
| 122 | - return $this->updateMimetypes($updatedMimetypes); |
|
| 123 | - } |
|
| 124 | - |
|
| 125 | - private function introduceWindowsProgramTypes() { |
|
| 126 | - $updatedMimetypes = array( |
|
| 127 | - 'htaccess' => 'text/plain', |
|
| 128 | - 'bat' => 'application/x-msdos-program', |
|
| 129 | - 'cmd' => 'application/cmd', |
|
| 130 | - ); |
|
| 131 | - |
|
| 132 | - return $this->updateMimetypes($updatedMimetypes); |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - private function introduceLocationTypes() { |
|
| 136 | - $updatedMimetypes = [ |
|
| 137 | - 'gpx' => 'application/gpx+xml', |
|
| 138 | - 'kml' => 'application/vnd.google-earth.kml+xml', |
|
| 139 | - 'kmz' => 'application/vnd.google-earth.kmz', |
|
| 140 | - 'tcx' => 'application/vnd.garmin.tcx+xml', |
|
| 141 | - ]; |
|
| 142 | - |
|
| 143 | - return $this->updateMimetypes($updatedMimetypes); |
|
| 144 | - } |
|
| 145 | - |
|
| 146 | - private function introduceInternetShortcutTypes() { |
|
| 147 | - $updatedMimetypes = [ |
|
| 148 | - 'url' => 'application/internet-shortcut', |
|
| 149 | - 'webloc' => 'application/internet-shortcut' |
|
| 150 | - ]; |
|
| 151 | - |
|
| 152 | - return $this->updateMimetypes($updatedMimetypes); |
|
| 153 | - } |
|
| 154 | - |
|
| 155 | - private function introduceStreamingTypes() { |
|
| 156 | - $updatedMimetypes = [ |
|
| 157 | - 'm3u' => 'audio/mpegurl', |
|
| 158 | - 'm3u8' => 'audio/mpegurl', |
|
| 159 | - 'pls' => 'audio/x-scpls' |
|
| 160 | - ]; |
|
| 161 | - |
|
| 162 | - return $this->updateMimetypes($updatedMimetypes); |
|
| 163 | - } |
|
| 164 | - |
|
| 165 | - /** |
|
| 166 | - * Fix mime types |
|
| 167 | - */ |
|
| 168 | - public function run(IOutput $out) { |
|
| 169 | - |
|
| 170 | - $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); |
|
| 171 | - |
|
| 172 | - // NOTE TO DEVELOPERS: when adding new mime types, please make sure to |
|
| 173 | - // add a version comparison to avoid doing it every time |
|
| 174 | - |
|
| 175 | - if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) { |
|
| 176 | - $out->info('Fixed image mime types'); |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) { |
|
| 180 | - $out->info('Fixed windows program mime types'); |
|
| 181 | - } |
|
| 182 | - |
|
| 183 | - if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) { |
|
| 184 | - $out->info('Fixed geospatial mime types'); |
|
| 185 | - } |
|
| 186 | - |
|
| 187 | - if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) { |
|
| 188 | - $out->info('Fixed internet-shortcut mime types'); |
|
| 189 | - } |
|
| 190 | - |
|
| 191 | - if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) { |
|
| 192 | - $out->info('Fixed streaming mime types'); |
|
| 193 | - } |
|
| 194 | - } |
|
| 87 | + } |
|
| 88 | + |
|
| 89 | + private function updateMimetypes($updatedMimetypes) { |
|
| 90 | + if (empty($this->folderMimeTypeId)) { |
|
| 91 | + $result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory')); |
|
| 92 | + $this->folderMimeTypeId = (int)$result->fetchOne(); |
|
| 93 | + } |
|
| 94 | + |
|
| 95 | + $count = 0; |
|
| 96 | + foreach ($updatedMimetypes as $extension => $mimetype) { |
|
| 97 | + $result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype)); |
|
| 98 | + $exists = $result->fetchOne(); |
|
| 99 | + |
|
| 100 | + if (!$exists) { |
|
| 101 | + // insert mimetype |
|
| 102 | + \OC_DB::executeAudited(self::insertStmt(), array($mimetype)); |
|
| 103 | + } |
|
| 104 | + |
|
| 105 | + // get target mimetype id |
|
| 106 | + $result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype)); |
|
| 107 | + $mimetypeId = $result->fetchOne(); |
|
| 108 | + |
|
| 109 | + // change mimetype for files with x extension |
|
| 110 | + $count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension)); |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + return $count; |
|
| 114 | + } |
|
| 115 | + |
|
| 116 | + private function introduceImageTypes() { |
|
| 117 | + $updatedMimetypes = array( |
|
| 118 | + 'jp2' => 'image/jp2', |
|
| 119 | + 'webp' => 'image/webp', |
|
| 120 | + ); |
|
| 121 | + |
|
| 122 | + return $this->updateMimetypes($updatedMimetypes); |
|
| 123 | + } |
|
| 124 | + |
|
| 125 | + private function introduceWindowsProgramTypes() { |
|
| 126 | + $updatedMimetypes = array( |
|
| 127 | + 'htaccess' => 'text/plain', |
|
| 128 | + 'bat' => 'application/x-msdos-program', |
|
| 129 | + 'cmd' => 'application/cmd', |
|
| 130 | + ); |
|
| 131 | + |
|
| 132 | + return $this->updateMimetypes($updatedMimetypes); |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + private function introduceLocationTypes() { |
|
| 136 | + $updatedMimetypes = [ |
|
| 137 | + 'gpx' => 'application/gpx+xml', |
|
| 138 | + 'kml' => 'application/vnd.google-earth.kml+xml', |
|
| 139 | + 'kmz' => 'application/vnd.google-earth.kmz', |
|
| 140 | + 'tcx' => 'application/vnd.garmin.tcx+xml', |
|
| 141 | + ]; |
|
| 142 | + |
|
| 143 | + return $this->updateMimetypes($updatedMimetypes); |
|
| 144 | + } |
|
| 145 | + |
|
| 146 | + private function introduceInternetShortcutTypes() { |
|
| 147 | + $updatedMimetypes = [ |
|
| 148 | + 'url' => 'application/internet-shortcut', |
|
| 149 | + 'webloc' => 'application/internet-shortcut' |
|
| 150 | + ]; |
|
| 151 | + |
|
| 152 | + return $this->updateMimetypes($updatedMimetypes); |
|
| 153 | + } |
|
| 154 | + |
|
| 155 | + private function introduceStreamingTypes() { |
|
| 156 | + $updatedMimetypes = [ |
|
| 157 | + 'm3u' => 'audio/mpegurl', |
|
| 158 | + 'm3u8' => 'audio/mpegurl', |
|
| 159 | + 'pls' => 'audio/x-scpls' |
|
| 160 | + ]; |
|
| 161 | + |
|
| 162 | + return $this->updateMimetypes($updatedMimetypes); |
|
| 163 | + } |
|
| 164 | + |
|
| 165 | + /** |
|
| 166 | + * Fix mime types |
|
| 167 | + */ |
|
| 168 | + public function run(IOutput $out) { |
|
| 169 | + |
|
| 170 | + $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); |
|
| 171 | + |
|
| 172 | + // NOTE TO DEVELOPERS: when adding new mime types, please make sure to |
|
| 173 | + // add a version comparison to avoid doing it every time |
|
| 174 | + |
|
| 175 | + if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) { |
|
| 176 | + $out->info('Fixed image mime types'); |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) { |
|
| 180 | + $out->info('Fixed windows program mime types'); |
|
| 181 | + } |
|
| 182 | + |
|
| 183 | + if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) { |
|
| 184 | + $out->info('Fixed geospatial mime types'); |
|
| 185 | + } |
|
| 186 | + |
|
| 187 | + if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) { |
|
| 188 | + $out->info('Fixed internet-shortcut mime types'); |
|
| 189 | + } |
|
| 190 | + |
|
| 191 | + if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) { |
|
| 192 | + $out->info('Fixed streaming mime types'); |
|
| 193 | + } |
|
| 194 | + } |
|
| 195 | 195 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | private function updateMimetypes($updatedMimetypes) { |
| 90 | 90 | if (empty($this->folderMimeTypeId)) { |
| 91 | 91 | $result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory')); |
| 92 | - $this->folderMimeTypeId = (int)$result->fetchOne(); |
|
| 92 | + $this->folderMimeTypeId = (int) $result->fetchOne(); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | $count = 0; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $mimetypeId = $result->fetchOne(); |
| 108 | 108 | |
| 109 | 109 | // change mimetype for files with x extension |
| 110 | - $count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension)); |
|
| 110 | + $count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.'.$extension)); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | return $count; |