Make sure fs has subdir documents always

ajax/documentController.php

@@ -52,8 +52,7 @@ class DocumentController extends Controller{
 		}
 		
 		$filename = isset($sessionData['genesis_url']) ? $sessionData['genesis_url'] : '';
-		$documentsView = new View('/' . $sessionData['owner']);
-		$download = new Download($documentsView->initDocumentsView($sessionData['owner']), $filename);
+		$download = new Download($sessionData['owner'], $filename);
 		$download->sendResponse();
 	}
 

ajax/sessionController.php

@@ -41,7 +41,7 @@ class SessionController extends Controller{
 		}
 	}
 
-		/**
+	/**
 	 * Store the document content to its origin
 	 */
 	public static function save(){
@@ -58,7 +58,7 @@ class SessionController extends Controller{
 			if (!$content){
 				throw new \Exception('New conent missing');
 			}
-			
+
 			$session = new Db_Session();
 			$session->load($esId);
 			

appinfo/version

@@ -1 +1 @@
-0.7
+0.7.1

lib/db/session.php

@@ -39,28 +39,19 @@ class Db_Session extends \OCA\Documents\Db {
 		list($ownerView, $path) = $file->getOwnerViewAndPath();
 		
 		// Create a directory to store genesis
-		$docView = $ownerView->initDocumentsView($file->getOwner());
+		
+		$genesis = new Genesis($ownerView, $path, $file->getOwner());
 		
 		$oldSession = new Db_Session();
 		$oldSession->loadBy('file_id', $file->getFileId());
 		
 		//If there is no existing session we need to start a new one
 		if (!$oldSession->hasData()){
-
-			//TODO: check if genesis document is a valid odt
-			$genesisPath = $ownerView->storeDocument(
-							$file->getOwner(), 
-							$path
-			);
-			
-			if (!$genesisPath){
-				throw new \Exception('Unable to copy document. Check permissions and make sure you have enought free space.');
-			}
-
-			$hash = $ownerView->getHashByGenesis($file->getOwner(), $genesisPath);
-			
 			$newSession = new Db_Session(array(
-				$genesisPath, $hash, $file->getOwner(), $file->getFileId()
+				$genesis->getPath(),
+				$genesis->getHash(),
+				$file->getOwner(),
+				$file->getFileId()
 			));
 			
 			if (!$newSession->insert()){
@@ -71,7 +62,7 @@ class Db_Session extends \OCA\Documents\Db {
 		$session = $oldSession
 					->loadBy('file_id', $file->getFileId())
 					->getData()
-				;
+		;
 		
 		$member = new Db_Member(array(
 			$session['es_id'], 

lib/download.php

@@ -39,15 +39,20 @@ class Download {
 	 * @param type $view - filesystem view
 	 * @param type $filepath - path to the file relative to this view root
 	 */
-	public function __construct($view, $filepath){
+	public function __construct($owner, $filepath){
 		$this->filepath = $filepath;
-		$this->view = $view;
 		
 		if (isset($_SERVER['HTTP_RANGE'])) {
-			$this->instance = new Download_Range($view, $filepath);
+			$this->instance = new Download_Range($owner, $filepath);
 		} else {
-			$this->instance = new Download_Simple($view, $filepath);
+			$this->instance = new Download_Simple($owner, $filepath);
 		}
+		
+		$this->view = $this->getView($owner);
+	}
+	
+	protected function getView($owner){
+		return new View('/' . $owner);
 	}
 	
 	/**

lib/download/range.php

@@ -26,8 +26,8 @@ class Download_Range extends \OCA\Documents\Download {
 	 * @param type $view - filesystem view
 	 * @param type $filepath - path to the file relative to this view root
 	 */
-	public function __construct($view, $filepath){
-		$this->view = $view;
+	public function __construct($owner, $filepath){
+		$this->view = $this->getView($owner);
 		$this->filepath = $filepath;
 	}
 

lib/download/simple.php

@@ -16,8 +16,8 @@ namespace OCA\Documents;
  */
 class Download_Simple extends \OCA\Documents\Download {
 
-	public function __construct($view, $filepath){
-		$this->view = $view;
+	public function __construct($owner, $filepath){
+		$this->view = $this->getView($owner);
 		$this->filepath = $filepath;
 	}
 	

lib/view.php

@@ -12,16 +12,6 @@
 namespace OCA\Documents;
 
 class View extends \OC\Files\View{
-	const DOCUMENTS_DIRNAME='/documents';
-	protected static $documentsView;
-	
-	public function initDocumentsView($owner){
-		$ownerView = new View('/' . $owner);
-		if (!$ownerView->is_dir(self::DOCUMENTS_DIRNAME)) {
-			$ownerView->mkdir(self::DOCUMENTS_DIRNAME);
-		}
-		return  new View('/' . $owner . self::DOCUMENTS_DIRNAME);
-	}
 	
 	public function getFilePermissions($path){
 		$permissions = 0;
@@ -33,35 +23,5 @@ class View extends \OC\Files\View{
 		}
 		return $permissions;
 	}
-
-	public function storeDocument($owner, $filePath){
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-		
-		$ownerView = new View('/' . $owner);
-		$filePath = '/files' . $filePath;
-		
-		if (!$ownerView->file_exists($filePath)){
-			throw new \Exception($filePath . ' doesn\'t exist');
-		}
-		
-		if (!$ownerView->is_file($filePath)){
-			throw new \Exception('Object ' . $filePath . ' is not a file.');
-		}
-		
-		$newName = '/' . sha1($ownerView->file_get_contents($filePath)) . '.odt';
-
-		$ownerView->copy($filePath, self::DOCUMENTS_DIRNAME . $newName);
-		if (!$ownerView->file_exists(self::DOCUMENTS_DIRNAME . $newName)){
-			throw new \Exception('Failed to copy genesis');
-		}
-		
-		\OC_FileProxy::$enabled = $proxyStatus;
-		return $newName;
-	}
 	
-	public function getHashByGenesis($owner, $genesisPath){
-		$ownerView = new View('/' . $owner);
-		return sha1($ownerView->file_get_contents(self::DOCUMENTS_DIRNAME . $genesisPath));
-	}
 }