hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2693 from aynsix/PHRAS-2118-rollback-tmpfiles-just-for-video

Browse Source 
PHRAS-2118 rollback use just tmp_files storage for video
This commit is contained in:
Nicolas Maillat
2018-07-27 16:12:24 +02:00
committed by GitHub
parent 1d82a01155 63828aa813
commit 86c82a78d3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Alchemy/Phrasea/Filesystem/FilesystemService.php
View File

@@ -67,18 +67,18 @@ class FilesystemService
return $pathdest . $this->generateSubdefFilename($record, $subdef); return $pathdest . $this->generateSubdefFilename($record, $subdef);
} }
public function generateTemporarySubdefPathname(\record_adapter $record, \databox_subdef $subdef, $tmpDir) public function generateTemporaryFfmpegPathname(\record_adapter $record, \databox_subdef $subdef, $tmpDir)
{ {
$tmpDir = \p4string::addEndSlash($tmpDir); $tmpDir = \p4string::addEndSlash($tmpDir);
$tmpDir = $tmpDir.$subdef->getSpecs()->getType()."/"; $ffmpegDir = $tmpDir."ffmpeg/";
if(!is_dir($tmpDir)){ if(!is_dir($ffmpegDir)){
$this->filesystem->mkdir($tmpDir); $this->filesystem->mkdir($ffmpegDir);
} }
$filenameSufix = "_".$record->getDataboxId()."_".$this->generateSubdefFilename($record, $subdef); $filenameSufix = "_".$record->getDataboxId()."_".$this->generateSubdefFilename($record, $subdef);
return $tmpDir . hash('sha256', $filenameSufix) . $filenameSufix; return $ffmpegDir . hash('sha256', $filenameSufix) . $filenameSufix;
} }
/** /**

4
lib/Alchemy/Phrasea/Media/SubdefGenerator.php
View File

@@ -178,9 +178,9 @@ class SubdefGenerator
$destFile = null; $destFile = null;
if(!empty($this->tmpDirectory)){ if($subdef_class->getSpecs() instanceof Video && !empty($this->tmpDirectory)){
$destFile = $pathdest; $destFile = $pathdest;
$pathdest = $this->filesystem->generateTemporarySubdefPathname($record, $subdef_class, $this->tmpDirectory); $pathdest = $this->filesystem->generateTemporaryFfmpegPathname($record, $subdef_class, $this->tmpDirectory);
} }
if (isset($this->tmpFilePath) && $subdef_class->getSpecs() instanceof Image) { if (isset($this->tmpFilePath) && $subdef_class->getSpecs() instanceof Image) {