AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change interface for objectStorage

Browse Source
This commit is contained in:
Frederic Guillot
2015-09-23 21:22:03 -04:00
parent 25b9e90ef3
commit 5be5205629
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controller/File.php
View File

@@ -86,7 +86,7 @@ class File extends Base
} }
$this->response->forceDownload($file['name']); $this->response->forceDownload($file['name']);
$this->objectStorage->passthru($file['path']); $this->objectStorage->output($file['path']);
} }
catch (ObjectStorageException $e) { catch (ObjectStorageException $e) {
$this->logger->error($e->getMessage()); $this->logger->error($e->getMessage());
@@ -128,7 +128,7 @@ class File extends Base
} }
$this->response->contentType($this->file->getImageMimeType($file['name'])); $this->response->contentType($this->file->getImageMimeType($file['name']));
$this->objectStorage->passthru($file['path']); $this->objectStorage->output($file['path']);
} }
catch (ObjectStorageException $e) { catch (ObjectStorageException $e) {
$this->logger->error($e->getMessage()); $this->logger->error($e->getMessage());
@@ -152,7 +152,7 @@ class File extends Base
} }
$this->response->contentType('image/jpeg'); $this->response->contentType('image/jpeg');
$this->objectStorage->passthru($this->file->getThumbnailPath($file['path'])); $this->objectStorage->output($this->file->getThumbnailPath($file['path']));
} }
catch (ObjectStorageException $e) { catch (ObjectStorageException $e) {
$this->logger->error($e->getMessage()); $this->logger->error($e->getMessage());

2
app/Core/ObjectStorage/FileStorage.php
View File

@@ -70,7 +70,7 @@ class FileStorage implements ObjectStorageInterface
* @access public * @access public
* @param string $key * @param string $key
*/ */
public function passthru($key) public function output($key)
{ {
$filename = $this->path.DIRECTORY_SEPARATOR.$key; $filename = $this->path.DIRECTORY_SEPARATOR.$key;

2
app/Core/ObjectStorage/ObjectStorageInterface.php
View File

@@ -35,7 +35,7 @@ interface ObjectStorageInterface
* @access public * @access public
* @param string $key * @param string $key
*/ */
public function passthru($key); public function output($key);
/** /**
* Move local file to object storage * Move local file to object storage

10
tests/units/Model/FileTest.php
View File

@@ -227,13 +227,21 @@ class FileTest extends Base
->expects($this->at(1)) ->expects($this->at(1))
->method('remove') ->method('remove')
->with( ->with(
$this->equalTo('/tmp/foo1') $this->equalTo('thumbnails//tmp/foo2')
) )
->will($this->returnValue(true)); ->will($this->returnValue(true));
$this->container['objectStorage'] $this->container['objectStorage']
->expects($this->at(2)) ->expects($this->at(2))
->method('remove') ->method('remove')
->with(
$this->equalTo('/tmp/foo1')
)
->will($this->returnValue(true));
$this->container['objectStorage']
->expects($this->at(3))
->method('remove')
->with( ->with(
$this->equalTo('/tmp/foo3') $this->equalTo('/tmp/foo3')
) )