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

Ignore favorites that are not available when creating the favorites list 

Also correctly return the exception for all cases when adding/removing favos
This commit is contained in:
Joas Schilling 2015-01-19 17:05:43 +01:00
parent bc93a8f140
commit 7e6d2c73d2
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/controller/apicontroller.php
View File

@ -67,6 +67,7 @@ class ApiController extends Controller {
* *
* @param string $path path * @param string $path path
* @param array $tags array of tags * @param array $tags array of tags
* @return DataResponse
*/ */
public function updateFileTags($path, $tags = null) { public function updateFileTags($path, $tags = null) {
$result = array(); $result = array();
@ -76,6 +77,10 @@ class ApiController extends Controller {
$this->tagService->updateFileTags($path, $tags); $this->tagService->updateFileTags($path, $tags);
} catch (\OCP\Files\NotFoundException $e) { } catch (\OCP\Files\NotFoundException $e) {
return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND); return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND);
} catch (\OCP\Files\StorageNotAvailableException $e) {
return new DataResponse($e->getMessage(), Http::STATUS_SERVICE_UNAVAILABLE);
} catch (\Exception $e) {
return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND);
} }
$result['tags'] = $tags; $result['tags'] = $tags;
} }
@ -89,6 +94,7 @@ class ApiController extends Controller {
* @CORS * @CORS
* *
* @param array $tagName tag name to filter by * @param array $tagName tag name to filter by
* @return DataResponse
*/ */
public function getFilesByTag($tagName) { public function getFilesByTag($tagName) {
$files = array(); $files = array();

16
apps/files/service/tagservice.php
View File

@ -8,6 +8,8 @@
namespace OCA\Files\Service; namespace OCA\Files\Service;
use OC\Files\FileInfo;
/** /**
* Service class to manage tags on files. * Service class to manage tags on files.
*/ */
@ -84,11 +86,19 @@ class TagService {
$nodes = $this->homeFolder->searchByTag( $nodes = $this->homeFolder->searchByTag(
$tagName, $this->userSession->getUser()->getUId() $tagName, $this->userSession->getUser()->getUId()
); );
foreach ($nodes as &$node) { $fileInfos = [];
$node = $node->getFileInfo(); foreach ($nodes as $node) {
try {
/** @var \OC\Files\Node\Node $node */
$fileInfos[] = $node->getFileInfo();
} catch (\Exception $e) {
// FIXME Should notify the user, when this happens
// Can not get FileInfo, maybe the connection to the external
// storage is interrupted.
}
} }
return $nodes; return $fileInfos;
} }
} }