Lots of refactoring to share API

3 files changed, 19 insertions, 10 deletions

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index dd63539cdfe..927e9462f23 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -20,23 +20,27 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class OC_Share_Backend_File extends OCP\Share_Backend {
+class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 
 	const FORMAT_SHARED_STORAGE = 0;
 	const FORMAT_FILE_APP = 1;
 	const FORMAT_FILE_APP_ROOT = 2;
 	const FORMAT_OPENDIR = 3;
 
-	public function getSource($item, $uid) {
-		if (OC_Filesystem::file_exists($item)) {
-			return array('item' => null, 'file' => $item);
-		}
-		return false;
+	public function isValidSource($item, $uid) {
+// 		if (OC_Filesystem::file_exists($item)) {
+			return true;
+// 		}
+// 		return false;
+	}
+
+	public function getFilePath($item, $uid) {
+		return $item;
 	}
 
 	public function generateTarget($item, $uid, $exclude = null) {
 		// TODO Make sure target path doesn't exist already
-		return '/Shared'.$item;
+		return $item;
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index a43ce2b2caf..2f101d33c8a 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -25,8 +25,13 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 		// TODO
 	}
 
-	public function getChildrenSources($item) {
-		return OC_FileCache::getFolderContent($item);
+	public function getChildren($itemSource) {
+		$files = OC_FileCache::getFolderContent($itemSource);
+		$sources = array();
+		foreach ($files as $file) {
+			$sources[] = $file['path'];
+		}
+		return $sources;
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 2071942b062..6e37837aac9 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -38,7 +38,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	* @return Returns array with the keys path and permissions or false if not found
 	*/
 	private function getFile($target) {
-		$target = $this->sharedFolder.'/'.$target;
+		$target = '/'.$target;
 		$target = rtrim($target, '/');
 		if (isset($this->files[$target])) {
 			return $this->files[$target];