Skip to content

Removed useless method FilesService::parseMimeTypeTextByExtension #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JakubOnderka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed useless method FilesService::parseMimeTypeTextByExtension #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 7 additions & 37 deletions lib/Service/FilesService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,11 +780,11 @@ private function updateShareNames(FilesDocument $document, Node $file): array {
*
* @return string
*/
private function parseMimeType(string $mimeType, string $extension): string {
private function parseMimeType(string $mimeType): string {

$parsed = '';
try {
$this->parseMimeTypeText($mimeType, $extension, $parsed);
$this->parseMimeTypeText($mimeType, $parsed);
$this->parseMimeTypePDF($mimeType, $parsed);
$this->parseMimeTypeOffice($mimeType, $parsed);
$this->parseMimeTypeZip($mimeType, $parsed);
Expand All @@ -802,7 +802,7 @@ private function parseMimeType(string $mimeType, string $extension): string {
*
* @throws KnownFileMimeTypeException
*/
private function parseMimeTypeText(string $mimeType, string $extension, string &$parsed) {
private function parseMimeTypeText(string $mimeType, string &$parsed) {

if (substr($mimeType, 0, 5) === 'text/') {
$parsed = self::MIMETYPE_TEXT;
Expand All @@ -819,36 +819,6 @@ private function parseMimeTypeText(string $mimeType, string $extension, string &
throw new KnownFileMimeTypeException();
}
}

$this->parseMimeTypeTextByExtension($mimeType, $extension, $parsed);
}


/**
* @param string $mimeType
* @param string $extension
* @param string $parsed
*
* @throws KnownFileMimeTypeException
*/
private function parseMimeTypeTextByExtension(
string $mimeType, string $extension, string &$parsed
) {
$textMimes = [
'application/octet-stream'
];
$textExtension = [
];

foreach ($textMimes as $mime) {
if (strpos($mimeType, $mime) === 0
&& in_array(
strtolower($extension), $textExtension
)) {
$parsed = self::MIMETYPE_TEXT;
throw new KnownFileMimeTypeException();
}
}
}


Expand Down Expand Up @@ -915,7 +885,7 @@ private function parseMimeTypeOffice(string $mimeType, string &$parsed) {
* @throws NotPermittedException
*/
private function extractContentFromFileText(FilesDocument $document, File $file) {
if ($this->parseMimeType($document->getMimeType(), $file->getExtension())
if ($this->parseMimeType($document->getMimeType())
!== self::MIMETYPE_TEXT) {
return;
}
Expand All @@ -937,7 +907,7 @@ private function extractContentFromFileText(FilesDocument $document, File $file)
* @throws NotPermittedException
*/
private function extractContentFromFilePDF(FilesDocument $document, File $file) {
if ($this->parseMimeType($document->getMimeType(), $file->getExtension())
if ($this->parseMimeType($document->getMimeType())
!== self::MIMETYPE_PDF) {
return;
}
Expand Down Expand Up @@ -966,7 +936,7 @@ private function extractContentFromFilePDF(FilesDocument $document, File $file)
* @throws NotPermittedException
*/
private function extractContentFromFileZip(FilesDocument $document, File $file) {
if ($this->parseMimeType($document->getMimeType(), $file->getExtension())
if ($this->parseMimeType($document->getMimeType())
!== self::MIMETYPE_ZIP) {
return;
}
Expand Down Expand Up @@ -995,7 +965,7 @@ private function extractContentFromFileZip(FilesDocument $document, File $file)
* @throws NotPermittedException
*/
private function extractContentFromFileOffice(FilesDocument $document, File $file) {
if ($this->parseMimeType($document->getMimeType(), $file->getExtension())
if ($this->parseMimeType($document->getMimeType())
!== self::MIMETYPE_OFFICE) {
return;
}
Expand Down