MDL-54544 file: Use shared tmp storage for unoconv document conversions

This commit is contained in:
Damyon Wiese
2016-05-17 10:58:25 +08:00
parent e4b5a062d8
commit 5620177efd
+9 -3
View File
@@ -238,8 +238,9 @@ class file_storage {
return false;
}
// Copy the file to the local tmp dir.
$tmp = make_request_directory();
// Copy the file to the tmp dir.
$uniqdir = "core_file/conversions/" . uniqid($file->get_id() . "-", true);
$tmp = make_temp_directory($uniqdir);
$localfilename = $file->get_filename();
// Safety.
$localfilename = clean_param($localfilename, PARAM_FILE);
@@ -266,6 +267,8 @@ class file_storage {
$result = exec($cmd, $output);
chdir($currentdir);
if (!file_exists($newtmpfile)) {
remove_dir($uniqdir);
// Cleanup.
return false;
}
@@ -279,7 +282,10 @@ class file_storage {
'filename' => $file->get_contenthash(),
);
return $this->create_file_from_pathname($record, $newtmpfile);
$convertedfile = $this->create_file_from_pathname($record, $newtmpfile);
// Cleanup.
remove_dir($uniqdir);
return $convertedfile;
}
/**