mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypes 

Add comicbook mimetypes
This commit is contained in:
Morris Jobke 2018-07-11 09:21:29 +02:00 committed by GitHub
parent 029219a9e7 0fe115a536
commit af20f1dd4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/Repair/RepairMimeTypes.php
View File

@ -175,6 +175,19 @@ class RepairMimeTypes implements IRepairStep {
return $this->updateMimetypes($updatedMimetypes);
}
private function introduceComicbookTypes() {
$updatedMimetypes = [
'cb7' => 'application/comicbook+7z',
'cba' => 'application/comicbook+ace',
'cbr' => 'application/comicbook+rar',
'cbt' => 'application/comicbook+tar',
'cbtc' => 'application/comicbook+truecrypt',
'cbz' => 'application/comicbook+zip',
];
return $this->updateMimetypes($updatedMimetypes);
}
/**
* Fix mime types
*/
@ -208,5 +221,9 @@ class RepairMimeTypes implements IRepairStep {
if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
$out->info('Fixed visio mime types');
}
if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
$out->info('Fixed comicbook mime types');
}
}
}

12
resources/config/mimetypemapping.dist.json
View File

@ -21,12 +21,12 @@
"bmp": ["image/bmp"],
"bpg": ["image/bpg"],
"bz2": ["application/x-bzip2"],
"cb7": ["application/x-cbr"],
"cba": ["application/x-cbr"],
"cbr": ["application/x-cbr"],
"cbt": ["application/x-cbr"],
"cbtc": ["application/x-cbr"],
"cbz": ["application/x-cbr"],
"cb7": ["application/comicbook+7z"],
"cba": ["application/comicbook+ace"],
"cbr": ["application/comicbook+rar"],
"cbt": ["application/comicbook+tar"],
"cbtc": ["application/comicbook+truecrypt"],
"cbz": ["application/comicbook+zip"],
"cc": ["text/x-c"],
"cdr": ["application/coreldraw"],
"class": ["application/java"],

2
version.php
View File

@ -29,7 +29,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
$OC_Version = array(14, 0, 0, 9);
$OC_Version = array(14, 0, 0, 10);
// The human readable string
$OC_VersionString = '14.0.0 alpha';