Browse Source

Fallback to default mimetype detection mechanism

remotes/origin/dav-zip-folder
Vincent Petry 10 years ago
parent
commit
915d37f226
  1. 21
      apps/files_external/lib/amazons3.php
  2. 12
      apps/files_external/lib/dropbox.php
  3. 12
      apps/files_external/lib/swift.php

21
apps/files_external/lib/amazons3.php

@ -418,27 +418,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return false;
}
public function getMimeType($path) {
$path = $this->normalizePath($path);
if ($this->is_dir($path)) {
return 'httpd/unix-directory';
} else if ($this->file_exists($path)) {
try {
$result = $this->getConnection()->headObject(array(
'Bucket' => $this->bucket,
'Key' => $path
));
} catch (S3Exception $e) {
\OCP\Util::logException('files_external', $e);
return false;
}
return $result['ContentType'];
}
return false;
}
public function touch($path, $mtime = null) {
$path = $this->normalizePath($path);

12
apps/files_external/lib/dropbox.php

@ -294,18 +294,6 @@ class Dropbox extends \OC\Files\Storage\Common {
}
}
public function getMimeType($path) {
if ($this->filetype($path) == 'dir') {
return 'httpd/unix-directory';
} else {
$metaData = $this->getDropBoxMetaData($path);
if ($metaData) {
return $metaData['mime_type'];
}
}
return false;
}
public function free_space($path) {
try {
$info = $this->dropbox->getAccountInfo();

12
apps/files_external/lib/swift.php

@ -361,18 +361,6 @@ class Swift extends \OC\Files\Storage\Common {
}
}
public function getMimeType($path) {
$path = $this->normalizePath($path);
if ($this->is_dir($path)) {
return 'httpd/unix-directory';
} else if ($this->file_exists($path)) {
$object = $this->getContainer()->getPartialObject($path);
return $object->getContentType();
}
return false;
}
public function touch($path, $mtime = null) {
$path = $this->normalizePath($path);
if (is_null($mtime)) {

Loading…
Cancel
Save