revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 00:32:42 +01:00
Code Issues Releases Wiki Activity

Use Filesystem::getMimeType() instead of file

Browse source 
Summary: The `file` binary doesn't exist everywhere, use the more flexible
wrapper introduce in D1609.

Test Plan: Uploaded a file via drag-and-drop, it got MIME'd correctly.

Reviewers: btrahan, davidreuss, Koolvin

Reviewed By: btrahan

CC: aran, epriestley

Maniphest Tasks: T869

Differential Revision: https://secure.phabricator.com/D1615
This commit is contained in:
epriestley 2012-02-14 17:00:05 -08:00
parent 35c5852d3f
commit 6e48bfcb0a
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/applications/files/storage/file/PhabricatorFile.php
View file

@ -149,14 +149,9 @@ class PhabricatorFile extends PhabricatorFileDAO {
if (isset($params['mime-type'])) { if (isset($params['mime-type'])) {
$file->setMimeType($params['mime-type']); $file->setMimeType($params['mime-type']);
} else { } else {
try {
$tmp = new TempFile(); $tmp = new TempFile();
Filesystem::writeFile($tmp, $data); Filesystem::writeFile($tmp, $data);
list($stdout) = execx('file -b --mime %s', $tmp); $file->setMimeType(Filesystem::getMimeType($tmp));
$file->setMimeType($stdout);
} catch (Exception $ex) {
// Be robust here since we don't really care that much about mime types.
}
} }
$file->save(); $file->save();

1
src/applications/files/storage/file/__init__.php
View file

@ -15,7 +15,6 @@ phutil_require_module('phabricator', 'infrastructure/env');
phutil_require_module('phutil', 'error'); phutil_require_module('phutil', 'error');
phutil_require_module('phutil', 'filesystem'); phutil_require_module('phutil', 'filesystem');
phutil_require_module('phutil', 'filesystem/tempfile'); phutil_require_module('phutil', 'filesystem/tempfile');
phutil_require_module('phutil', 'future/exec');
phutil_require_module('phutil', 'markup'); phutil_require_module('phutil', 'markup');
phutil_require_module('phutil', 'parser/uri'); phutil_require_module('phutil', 'parser/uri');
phutil_require_module('phutil', 'symbols'); phutil_require_module('phutil', 'symbols');