SymlinkManager: Reduce code duplication for numeric_id and use internalPath

The user can already be identified using the storage id.

Signed-off-by: Tamino Bauknecht <dev@tb6.eu>

Author: taminob

lib/private/Files/SymlinkManager.php

@@ -200,27 +200,17 @@ private function getNameFromNode($node) {
 	 */
 	private function getStorageIdFromNode($node) {
 		$storageId = $node->getStorage()->getId();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('numeric_id')
-			->from('storages')
-			->where($query->expr()->eq('id', $query->createNamedParameter($storageId)));
-		$result = $query->executeQuery();
-
-		if ($result->rowCount() > 1) {
-			throw new \OCP\DB\Exception("Storage ('$storageId') is not unique in database!");
-		}
-
-		$numericId = $result->fetchOne();
-		if ($numericId === false) {
-			throw new \OCP\DB\Exception("Unable to find storage '$storageId' in database!");
+		if ($numericStorageId = \OC\Files\Cache\Storage::getNumericStorageId($storageId)) {
+			return $numericStorageId;
+		} else {
+			throw new \OCP\Files\StorageNotAvailableException("Unable to find storage '$storageId'!");
 		}
-		return $numericId;
 	}
 
 	/**
 	 * @param \OCP\Files\FileInfo $node
 	 */
 	private function getPathFromNode($node) {
-		return $node->getPath();
+		return $node->getInternalPath();
 	}
 }