From 932684b7829eec1276202231e6ebe4bc04458468 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 11 Nov 2014 03:22:31 +0300
Subject: [PATCH] Remove View model. Get permissions from FileInfo

---
 controller/documentcontroller.php |  4 ++--
 controller/sessioncontroller.php  |  3 ++-
 lib/db/session.php                |  3 ++-
 lib/downloadresponse.php          |  1 +
 lib/file.php                      |  2 ++
 lib/genesis.php                   |  6 ++++--
 lib/view.php                      | 27 ---------------------------
 7 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 lib/view.php

diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php
index a0377614..62dd9f39 100644
--- a/controller/documentcontroller.php
+++ b/controller/documentcontroller.php
@@ -24,7 +24,7 @@ use \OCA\Documents\Download;
 use \OCA\Documents\DownloadResponse;
 use \OCA\Documents\File;
 use OCA\Documents\Genesis;
-use \OCA\Documents\View;
+use \OC\Files\View;
 
 class DocumentController extends Controller{
 	
@@ -45,7 +45,7 @@ class DocumentController extends Controller{
 	 * @NoAdminRequired
 	 */
 	public function create(){
-		$view = new \OC\Files\View('/' . $this->uid . '/files');
+		$view = new View('/' . $this->uid . '/files');
 		$dir = $this->settings->getUserValue($this->uid, $this->appName, 'save_path', '/');
 		if (!$view->is_dir($dir)){
 			$dir = '/';
diff --git a/controller/sessioncontroller.php b/controller/sessioncontroller.php
index 0c763b95..3d2760c7 100644
--- a/controller/sessioncontroller.php
+++ b/controller/sessioncontroller.php
@@ -21,6 +21,7 @@ use \OCA\Documents\Db;
 use \OCA\Documents\File;
 use \OCA\Documents\Helper;
 use OCA\Documents\Filter;
+use \OC\Files\View;
 
 class BadRequestException extends \Exception {
 
@@ -264,7 +265,7 @@ class SessionController extends Controller{
 				//File was deleted or unshared. We need to save content as new file anyway
 				//Sorry, but for guests it would be lost :(
 				if ($this->uid){
-					$view = new \OC\Files\View('/' . $this->uid . '/files');
+					$view = new View('/' . $this->uid . '/files');
 		
 					$dir = \OCP\Config::getUserValue($this->uid, 'documents', 'save_path', '');
 					$path = Helper::getNewFileName($view, $dir . 'New Document.odt');
diff --git a/lib/db/session.php b/lib/db/session.php
index e28c5e9b..f0eac207 100644
--- a/lib/db/session.php
+++ b/lib/db/session.php
@@ -103,7 +103,8 @@ class Session extends \OCA\Documents\Db {
 		}
 		
 		$sessionData['title'] = basename($path);
-		$sessionData['permissions'] = $ownerView->getFilePermissions($path);
+		$fileInfo = $ownerView->getFileInfo($path);
+		$sessionData['permissions'] = $fileInfo->getPermissions();
 		
 		return $sessionData;
 	}
diff --git a/lib/downloadresponse.php b/lib/downloadresponse.php
index 8c21d674..a37ee32b 100644
--- a/lib/downloadresponse.php
+++ b/lib/downloadresponse.php
@@ -13,6 +13,7 @@ namespace OCA\Documents;
 
 use \OCP\AppFramework\Http;
 use \OCP\IRequest;
+use \OC\Files\View;
 
 class DownloadResponse extends \OCP\AppFramework\Http\Response {
 	private $request;
diff --git a/lib/file.php b/lib/file.php
index 348e4cb9..c3f4b42f 100644
--- a/lib/file.php
+++ b/lib/file.php
@@ -22,6 +22,8 @@
 
 namespace OCA\Documents;
 
+use \OC\Files\View;
+
 class File {
 	protected $fileId;
 	protected $owner;
diff --git a/lib/genesis.php b/lib/genesis.php
index 65a92942..f030f374 100644
--- a/lib/genesis.php
+++ b/lib/genesis.php
@@ -22,6 +22,8 @@
 
 namespace OCA\Documents;
 
+use \OC\Files\View;
+
 class Genesis {
 	
 	const DOCUMENTS_DIRNAME='/documents';
@@ -37,7 +39,7 @@ class Genesis {
 	 * Create new genesis document
 	 * @param File $file 
 	 * */	
-	public function __construct(\OCA\Documents\File $file){
+	public function __construct(File $file){
 		list($view, $path) = $file->getOwnerViewAndPath();
 		$owner = $file->getOwner();
 		
@@ -96,7 +98,7 @@ class Genesis {
 	
 	/**
 	 * Check if genesis is valid
-	 * @param OCA\Documents\View $view 
+	 * @param \OC\Files\View $view 
 	 * @param string $path relative to the view
 	 * @throws \Exception
 	 */
diff --git a/lib/view.php b/lib/view.php
deleted file mode 100644
index 3250b19e..00000000
--- a/lib/view.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * ownCloud - Documents App
- *
- * @author Victor Dubiniuk
- * @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- */
-
-namespace OCA\Documents;
-
-class View extends \OC\Files\View{
-	
-	public function getFilePermissions($path){
-		$permissions = 0;
-		if ($this->isReadable($path)) {
-			$permissions |= \OCP\PERMISSION_READ;
-		}
-		if ($this->isSharable($path)) {
-			$permissions |= \OCP\PERMISSION_SHARE;
-		}
-		return $permissions;
-	}
-	
-}