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

Merge pull request #5965 from owncloud/mimetype-only-path 

Change default mimetype detection for storage backends to only use filename
This commit is contained in:
Vincent Petry 2013-11-20 08:11:41 -08:00
parent 8f33286b19 a0d570b4cc
commit a88aec8a5c
4 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/private/files/storage/common.php
View File

@ -142,7 +142,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
return false; return false;
} else { } else {
$directoryHandle = $this->opendir($directory); $directoryHandle = $this->opendir($directory);
if(is_resource($directoryHandle)) { if (is_resource($directoryHandle)) {
while (($contents = readdir($directoryHandle)) !== false) { while (($contents = readdir($directoryHandle)) !== false) {
if (!\OC\Files\Filesystem::isIgnoredDir($contents)) { if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
$path = $directory . '/' . $contents; $path = $directory . '/' . $contents;
@ -165,27 +165,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
} }
public function getMimeType($path) { public function getMimeType($path) {
if (!$this->file_exists($path)) {
return false;
}
if ($this->is_dir($path)) { if ($this->is_dir($path)) {
return 'httpd/unix-directory'; return 'httpd/unix-directory';
} } elseif ($this->file_exists($path)) {
$source = $this->fopen($path, 'r'); return \OC_Helper::getFileNameMimeType($path);
if (!$source) { } else {
return false; return false;
} }
$head = fread($source, 8192); //8kb should suffice to determine a mimetype
if ($pos = strrpos($path, '.')) {
$extension = substr($path, $pos);
} else {
$extension = '';
}
$tmpFile = \OC_Helper::tmpFile($extension);
file_put_contents($tmpFile, $head);
$mime = \OC_Helper::getMimeType($tmpFile);
unlink($tmpFile);
return $mime;
} }
public function hash($type, $path, $raw = false) { public function hash($type, $path, $raw = false) {
@ -227,7 +213,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
private function addLocalFolder($path, $target) { private function addLocalFolder($path, $target) {
$dh = $this->opendir($path); $dh = $this->opendir($path);
if(is_resource($dh)) { if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) { while (($file = readdir($dh)) !== false) {
if ($file !== '.' and $file !== '..') { if ($file !== '.' and $file !== '..') {
if ($this->is_dir($path . '/' . $file)) { if ($this->is_dir($path . '/' . $file)) {
@ -298,7 +284,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
return $this->watcher; return $this->watcher;
} }
public function getStorageCache(){ public function getStorageCache() {
if (!isset($this->storageCache)) { if (!isset($this->storageCache)) {
$this->storageCache = new \OC\Files\Cache\Storage($this); $this->storageCache = new \OC\Files\Cache\Storage($this);
} }

2
lib/private/files/storage/commontest.php
View File

@ -54,7 +54,7 @@ class CommonTest extends \OC\Files\Storage\Common{
return $this->storage->stat($path); return $this->storage->stat($path);
} }
public function filetype($path) { public function filetype($path) {
return $this->storage->filetype($path); return @$this->storage->filetype($path);
} }
public function isReadable($path) { public function isReadable($path) {
return $this->storage->isReadable($path); return $this->storage->isReadable($path);

8
lib/private/files/storage/local.php
View File

@ -203,14 +203,6 @@ if (\OC_Util::runningOnWindows()) {
return $return; return $return;
} }
public function getMimeType($path) {
if ($this->isReadable($path)) {
return \OC_Helper::getMimeType($this->datadir . $path);
} else {
return false;
}
}
private function delTree($dir) { private function delTree($dir) {
$dirRelative = $dir; $dirRelative = $dir;
$dir = $this->datadir . $dir; $dir = $this->datadir . $dir;

8
lib/private/files/storage/mappedlocal.php
View File

@ -210,14 +210,6 @@ class MappedLocal extends \OC\Files\Storage\Common{
return $return; return $return;
} }
public function getMimeType($path) {
if($this->isReadable($path)) {
return \OC_Helper::getMimeType($this->buildPath($path));
}else{
return false;
}
}
private function delTree($dir, $isLogicPath=true) { private function delTree($dir, $isLogicPath=true) {
$dirRelative=$dir; $dirRelative=$dir;
if ($isLogicPath) { if ($isLogicPath) {