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

Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect 

add y to with-aspect naming schema
This commit is contained in:
Morris Jobke 2014-09-16 08:36:33 +02:00
parent 245a0e2ad8 cf76933b76
commit af52ffc5d5
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/preview.php
View File

@ -322,7 +322,7 @@ class Preview {
if($fileInfo !== null && $fileInfo !== false) {
$fileId = $fileInfo->getId();
$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
$previewPath = $this->getPreviewPath($fileId);
$this->userView->deleteAll($previewPath);
return $this->userView->rmdir($previewPath);
}
@ -392,7 +392,7 @@ class Preview {
return array();
}
$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
$previewPath = $this->getPreviewPath($fileId);
$wantedAspectRatio = (float) ($this->getMaxX() / $this->getMaxY());
@ -509,7 +509,7 @@ class Preview {
$this->preview = $preview;
$this->resizeAndCrop();
$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
$previewPath = $this->getPreviewPath($fileId);
$cachePath = $this->buildCachePath($fileId);
if ($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
@ -797,12 +797,22 @@ class Preview {
$maxX = $this->getMaxX();
$maxY = $this->getMaxY();
$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
$preview = $previewPath . $maxX . '-' . $maxY . '.png';
$previewPath = $this->getPreviewPath($fileId);
$preview = $previewPath . strval($maxX) . '-' . strval($maxY);
if ($this->keepAspect) {
$preview = $previewPath . $maxX . '-with-aspect.png';
$preview .= '-with-aspect';
}
$preview .= '.png';
return $preview;
}
return $preview;
/**
* @param int $fileId
* @return string
*/
private function getPreviewPath($fileId) {
return $this->getThumbnailsFolder() . '/' . $fileId . '/';
}
}