Passed
Push — master ( 9a6d60...09efdf )
by Morris
12:40 queued 01:53
created
lib/private/Files/Mount/MoveableMount.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@
 block discarded – undo
27 27
  * Defines the mount point to be (re)moved by the user
28 28
  */
29 29
 interface MoveableMount {
30
-	/**
31
-	 * Move the mount point to $target
32
-	 *
33
-	 * @param string $target the target mount point
34
-	 * @return bool
35
-	 */
36
-	public function moveMount($target);
30
+    /**
31
+     * Move the mount point to $target
32
+     *
33
+     * @param string $target the target mount point
34
+     * @return bool
35
+     */
36
+    public function moveMount($target);
37 37
 
38
-	/**
39
-	 * Remove the mount points
40
-	 *
41
-	 * @return mixed
42
-	 * @return bool
43
-	 */
44
-	public function removeMount();
38
+    /**
39
+     * Remove the mount points
40
+     *
41
+     * @return mixed
42
+     * @return bool
43
+     */
44
+    public function removeMount();
45 45
 }
Please login to merge, or discard this patch.
lib/private/Files/AppData/AppData.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 				throw new \RuntimeException('no instance id!');
74 74
 			}
75 75
 
76
-			$name = 'appdata_' . $instanceId;
76
+			$name = 'appdata_'.$instanceId;
77 77
 
78 78
 			try {
79 79
 				$appDataFolder = $this->rootFolder->get($name);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 				try {
92 92
 					$appDataFolder = $appDataFolder->newFolder($this->appId);
93 93
 				} catch (NotPermittedException $e) {
94
-					throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
94
+					throw new \RuntimeException('Could not get appdata folder for '.$this->appId);
95 95
 				}
96 96
 			}
97 97
 
Please login to merge, or discard this patch.
Indentation   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -36,102 +36,102 @@
 block discarded – undo
36 36
 
37 37
 class AppData implements IAppData {
38 38
 
39
-	/** @var IRootFolder */
40
-	private $rootFolder;
41
-
42
-	/** @var SystemConfig */
43
-	private $config;
44
-
45
-	/** @var string */
46
-	private $appId;
47
-
48
-	/** @var Folder */
49
-	private $folder;
50
-
51
-	/**
52
-	 * AppData constructor.
53
-	 *
54
-	 * @param IRootFolder $rootFolder
55
-	 * @param SystemConfig $systemConfig
56
-	 * @param string $appId
57
-	 */
58
-	public function __construct(IRootFolder $rootFolder,
59
-								SystemConfig $systemConfig,
60
-								string $appId) {
61
-
62
-		$this->rootFolder = $rootFolder;
63
-		$this->config = $systemConfig;
64
-		$this->appId = $appId;
65
-	}
66
-
67
-	/**
68
-	 * @return Folder
69
-	 * @throws \RuntimeException
70
-	 */
71
-	private function getAppDataFolder(): Folder {
72
-		if ($this->folder === null) {
73
-			$instanceId = $this->config->getValue('instanceid', null);
74
-			if ($instanceId === null) {
75
-				throw new \RuntimeException('no instance id!');
76
-			}
77
-
78
-			$name = 'appdata_' . $instanceId;
79
-
80
-			try {
81
-				$appDataFolder = $this->rootFolder->get($name);
82
-			} catch (NotFoundException $e) {
83
-				try {
84
-					$appDataFolder = $this->rootFolder->newFolder($name);
85
-				} catch (NotPermittedException $e) {
86
-					throw new \RuntimeException('Could not get appdata folder');
87
-				}
88
-			}
89
-
90
-			try {
91
-				$appDataFolder = $appDataFolder->get($this->appId);
92
-			} catch (NotFoundException $e) {
93
-				try {
94
-					$appDataFolder = $appDataFolder->newFolder($this->appId);
95
-				} catch (NotPermittedException $e) {
96
-					throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
97
-				}
98
-			}
99
-
100
-			$this->folder = $appDataFolder;
101
-		}
102
-
103
-		return $this->folder;
104
-	}
105
-
106
-	public function getFolder(string $name): ISimpleFolder {
107
-		$node = $this->getAppDataFolder()->get($name);
108
-
109
-		/** @var Folder $node */
110
-		return new SimpleFolder($node);
111
-	}
112
-
113
-	public function newFolder(string $name): ISimpleFolder {
114
-		$folder = $this->getAppDataFolder()->newFolder($name);
115
-
116
-		return new SimpleFolder($folder);
117
-	}
118
-
119
-	public function getDirectoryListing(): array {
120
-		$listing = $this->getAppDataFolder()->getDirectoryListing();
121
-
122
-		$fileListing = array_map(function(Node $folder) {
123
-			if ($folder instanceof Folder) {
124
-				return new SimpleFolder($folder);
125
-			}
126
-			return null;
127
-		}, $listing);
128
-
129
-		$fileListing = array_filter($fileListing);
130
-
131
-		return array_values($fileListing);
132
-	}
133
-
134
-	public function getId(): int {
135
-		return $this->getAppDataFolder()->getId();
136
-	}
39
+    /** @var IRootFolder */
40
+    private $rootFolder;
41
+
42
+    /** @var SystemConfig */
43
+    private $config;
44
+
45
+    /** @var string */
46
+    private $appId;
47
+
48
+    /** @var Folder */
49
+    private $folder;
50
+
51
+    /**
52
+     * AppData constructor.
53
+     *
54
+     * @param IRootFolder $rootFolder
55
+     * @param SystemConfig $systemConfig
56
+     * @param string $appId
57
+     */
58
+    public function __construct(IRootFolder $rootFolder,
59
+                                SystemConfig $systemConfig,
60
+                                string $appId) {
61
+
62
+        $this->rootFolder = $rootFolder;
63
+        $this->config = $systemConfig;
64
+        $this->appId = $appId;
65
+    }
66
+
67
+    /**
68
+     * @return Folder
69
+     * @throws \RuntimeException
70
+     */
71
+    private function getAppDataFolder(): Folder {
72
+        if ($this->folder === null) {
73
+            $instanceId = $this->config->getValue('instanceid', null);
74
+            if ($instanceId === null) {
75
+                throw new \RuntimeException('no instance id!');
76
+            }
77
+
78
+            $name = 'appdata_' . $instanceId;
79
+
80
+            try {
81
+                $appDataFolder = $this->rootFolder->get($name);
82
+            } catch (NotFoundException $e) {
83
+                try {
84
+                    $appDataFolder = $this->rootFolder->newFolder($name);
85
+                } catch (NotPermittedException $e) {
86
+                    throw new \RuntimeException('Could not get appdata folder');
87
+                }
88
+            }
89
+
90
+            try {
91
+                $appDataFolder = $appDataFolder->get($this->appId);
92
+            } catch (NotFoundException $e) {
93
+                try {
94
+                    $appDataFolder = $appDataFolder->newFolder($this->appId);
95
+                } catch (NotPermittedException $e) {
96
+                    throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
97
+                }
98
+            }
99
+
100
+            $this->folder = $appDataFolder;
101
+        }
102
+
103
+        return $this->folder;
104
+    }
105
+
106
+    public function getFolder(string $name): ISimpleFolder {
107
+        $node = $this->getAppDataFolder()->get($name);
108
+
109
+        /** @var Folder $node */
110
+        return new SimpleFolder($node);
111
+    }
112
+
113
+    public function newFolder(string $name): ISimpleFolder {
114
+        $folder = $this->getAppDataFolder()->newFolder($name);
115
+
116
+        return new SimpleFolder($folder);
117
+    }
118
+
119
+    public function getDirectoryListing(): array {
120
+        $listing = $this->getAppDataFolder()->getDirectoryListing();
121
+
122
+        $fileListing = array_map(function(Node $folder) {
123
+            if ($folder instanceof Folder) {
124
+                return new SimpleFolder($folder);
125
+            }
126
+            return null;
127
+        }, $listing);
128
+
129
+        $fileListing = array_filter($fileListing);
130
+
131
+        return array_values($fileListing);
132
+    }
133
+
134
+    public function getId(): int {
135
+        return $this->getAppDataFolder()->getId();
136
+    }
137 137
 }
Please login to merge, or discard this patch.
lib/private/Files/Stream/Quota.php 3 patches
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -33,71 +33,71 @@
 block discarded – undo
33 33
  * usage: resource \OC\Files\Stream\Quota::wrap($stream, $limit)
34 34
  */
35 35
 class Quota extends Wrapper {
36
-	/**
37
-	 * @var int $limit
38
-	 */
39
-	private $limit;
36
+    /**
37
+     * @var int $limit
38
+     */
39
+    private $limit;
40 40
 
41
-	/**
42
-	 * @param resource $stream
43
-	 * @param int $limit
44
-	 * @return resource
45
-	 */
46
-	static public function wrap($stream, $limit) {
47
-		$context = stream_context_create(array(
48
-			'quota' => array(
49
-				'source' => $stream,
50
-				'limit' => $limit
51
-			)
52
-		));
53
-		return Wrapper::wrapSource($stream, $context, 'quota', self::class);
54
-	}
41
+    /**
42
+     * @param resource $stream
43
+     * @param int $limit
44
+     * @return resource
45
+     */
46
+    static public function wrap($stream, $limit) {
47
+        $context = stream_context_create(array(
48
+            'quota' => array(
49
+                'source' => $stream,
50
+                'limit' => $limit
51
+            )
52
+        ));
53
+        return Wrapper::wrapSource($stream, $context, 'quota', self::class);
54
+    }
55 55
 
56
-	public function stream_open($path, $mode, $options, &$opened_path) {
57
-		$context = $this->loadContext('quota');
58
-		$this->source = $context['source'];
59
-		$this->limit = $context['limit'];
56
+    public function stream_open($path, $mode, $options, &$opened_path) {
57
+        $context = $this->loadContext('quota');
58
+        $this->source = $context['source'];
59
+        $this->limit = $context['limit'];
60 60
 
61
-		return true;
62
-	}
61
+        return true;
62
+    }
63 63
 
64
-	public function dir_opendir($path, $options) {
65
-		return false;
66
-	}
64
+    public function dir_opendir($path, $options) {
65
+        return false;
66
+    }
67 67
 
68
-	public function stream_seek($offset, $whence = SEEK_SET) {
69
-		if ($whence === SEEK_END){
70
-			// go to the end to find out last position's offset
71
-			$oldOffset = $this->stream_tell();
72
-			if (fseek($this->source, 0, $whence) !== 0){
73
-				return false;
74
-			}
75
-			$whence = SEEK_SET;
76
-			$offset = $this->stream_tell() + $offset;
77
-			$this->limit += $oldOffset - $offset;
78
-		}
79
-		else if ($whence === SEEK_SET) {
80
-			$this->limit += $this->stream_tell() - $offset;
81
-		} else {
82
-			$this->limit -= $offset;
83
-		}
84
-		// this wrapper needs to return "true" for success.
85
-		// the fseek call itself returns 0 on succeess
86
-		return fseek($this->source, $offset, $whence) === 0;
87
-	}
68
+    public function stream_seek($offset, $whence = SEEK_SET) {
69
+        if ($whence === SEEK_END){
70
+            // go to the end to find out last position's offset
71
+            $oldOffset = $this->stream_tell();
72
+            if (fseek($this->source, 0, $whence) !== 0){
73
+                return false;
74
+            }
75
+            $whence = SEEK_SET;
76
+            $offset = $this->stream_tell() + $offset;
77
+            $this->limit += $oldOffset - $offset;
78
+        }
79
+        else if ($whence === SEEK_SET) {
80
+            $this->limit += $this->stream_tell() - $offset;
81
+        } else {
82
+            $this->limit -= $offset;
83
+        }
84
+        // this wrapper needs to return "true" for success.
85
+        // the fseek call itself returns 0 on succeess
86
+        return fseek($this->source, $offset, $whence) === 0;
87
+    }
88 88
 
89
-	public function stream_read($count) {
90
-		$this->limit -= $count;
91
-		return fread($this->source, $count);
92
-	}
89
+    public function stream_read($count) {
90
+        $this->limit -= $count;
91
+        return fread($this->source, $count);
92
+    }
93 93
 
94
-	public function stream_write($data) {
95
-		$size = strlen($data);
96
-		if ($size > $this->limit) {
97
-			$data = substr($data, 0, $this->limit);
98
-			$size = $this->limit;
99
-		}
100
-		$this->limit -= $size;
101
-		return fwrite($this->source, $data);
102
-	}
94
+    public function stream_write($data) {
95
+        $size = strlen($data);
96
+        if ($size > $this->limit) {
97
+            $data = substr($data, 0, $this->limit);
98
+            $size = $this->limit;
99
+        }
100
+        $this->limit -= $size;
101
+        return fwrite($this->source, $data);
102
+    }
103 103
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,10 +66,10 @@
 block discarded – undo
66 66
 	}
67 67
 
68 68
 	public function stream_seek($offset, $whence = SEEK_SET) {
69
-		if ($whence === SEEK_END){
69
+		if ($whence === SEEK_END) {
70 70
 			// go to the end to find out last position's offset
71 71
 			$oldOffset = $this->stream_tell();
72
-			if (fseek($this->source, 0, $whence) !== 0){
72
+			if (fseek($this->source, 0, $whence) !== 0) {
73 73
 				return false;
74 74
 			}
75 75
 			$whence = SEEK_SET;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,8 +75,7 @@
 block discarded – undo
75 75
 			$whence = SEEK_SET;
76 76
 			$offset = $this->stream_tell() + $offset;
77 77
 			$this->limit += $oldOffset - $offset;
78
-		}
79
-		else if ($whence === SEEK_SET) {
78
+		} else if ($whence === SEEK_SET) {
80 79
 			$this->limit += $this->stream_tell() - $offset;
81 80
 		} else {
82 81
 			$this->limit -= $offset;
Please login to merge, or discard this patch.
lib/private/Files/Config/LazyStorageMountInfo.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -29,60 +29,60 @@
 block discarded – undo
29 29
 use OCP\IUser;
30 30
 
31 31
 class LazyStorageMountInfo extends CachedMountInfo {
32
-	/** @var IMountPoint */
33
-	private $mount;
32
+    /** @var IMountPoint */
33
+    private $mount;
34 34
 
35
-	/**
36
-	 * CachedMountInfo constructor.
37
-	 *
38
-	 * @param IUser $user
39
-	 * @param IMountPoint $mount
40
-	 */
41
-	public function __construct(IUser $user, IMountPoint $mount) {
42
-		$this->user = $user;
43
-		$this->mount = $mount;
44
-	}
35
+    /**
36
+     * CachedMountInfo constructor.
37
+     *
38
+     * @param IUser $user
39
+     * @param IMountPoint $mount
40
+     */
41
+    public function __construct(IUser $user, IMountPoint $mount) {
42
+        $this->user = $user;
43
+        $this->mount = $mount;
44
+    }
45 45
 
46
-	/**
47
-	 * @return int the numeric storage id of the mount
48
-	 */
49
-	public function getStorageId() {
50
-		if (!$this->storageId) {
51
-			$this->storageId = $this->mount->getNumericStorageId();
52
-		}
53
-		return parent::getStorageId();
54
-	}
46
+    /**
47
+     * @return int the numeric storage id of the mount
48
+     */
49
+    public function getStorageId() {
50
+        if (!$this->storageId) {
51
+            $this->storageId = $this->mount->getNumericStorageId();
52
+        }
53
+        return parent::getStorageId();
54
+    }
55 55
 
56
-	/**
57
-	 * @return int the fileid of the root of the mount
58
-	 */
59
-	public function getRootId() {
60
-		if (!$this->rootId) {
61
-			$this->rootId = $this->mount->getStorageRootId();
62
-		}
63
-		return parent::getRootId();
64
-	}
56
+    /**
57
+     * @return int the fileid of the root of the mount
58
+     */
59
+    public function getRootId() {
60
+        if (!$this->rootId) {
61
+            $this->rootId = $this->mount->getStorageRootId();
62
+        }
63
+        return parent::getRootId();
64
+    }
65 65
 
66
-	/**
67
-	 * @return string the mount point of the mount for the user
68
-	 */
69
-	public function getMountPoint() {
70
-		if (!$this->mountPoint) {
71
-			$this->mountPoint = $this->mount->getMountPoint();
72
-		}
73
-		return parent::getMountPoint();
74
-	}
66
+    /**
67
+     * @return string the mount point of the mount for the user
68
+     */
69
+    public function getMountPoint() {
70
+        if (!$this->mountPoint) {
71
+            $this->mountPoint = $this->mount->getMountPoint();
72
+        }
73
+        return parent::getMountPoint();
74
+    }
75 75
 
76
-	public function getMountId() {
77
-		return $this->mount->getMountId();
78
-	}
76
+    public function getMountId() {
77
+        return $this->mount->getMountId();
78
+    }
79 79
 
80
-	/**
81
-	 * Get the internal path (within the storage) of the root of the mount
82
-	 *
83
-	 * @return string
84
-	 */
85
-	public function getRootInternalPath() {
86
-		return $this->mount->getInternalPath($this->mount->getMountPoint());
87
-	}
80
+    /**
81
+     * Get the internal path (within the storage) of the root of the mount
82
+     *
83
+     * @return string
84
+     */
85
+    public function getRootInternalPath() {
86
+        return $this->mount->getInternalPath($this->mount->getMountPoint());
87
+    }
88 88
 }
Please login to merge, or discard this patch.
lib/private/Files/Config/UserMountCacheListener.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -29,21 +29,21 @@
 block discarded – undo
29 29
  * Listen to hooks and update the mount cache as needed
30 30
  */
31 31
 class UserMountCacheListener {
32
-	/**
33
-	 * @var IUserMountCache
34
-	 */
35
-	private $userMountCache;
32
+    /**
33
+     * @var IUserMountCache
34
+     */
35
+    private $userMountCache;
36 36
 
37
-	/**
38
-	 * UserMountCacheListener constructor.
39
-	 *
40
-	 * @param IUserMountCache $userMountCache
41
-	 */
42
-	public function __construct(IUserMountCache $userMountCache) {
43
-		$this->userMountCache = $userMountCache;
44
-	}
37
+    /**
38
+     * UserMountCacheListener constructor.
39
+     *
40
+     * @param IUserMountCache $userMountCache
41
+     */
42
+    public function __construct(IUserMountCache $userMountCache) {
43
+        $this->userMountCache = $userMountCache;
44
+    }
45 45
 
46
-	public function listen(Manager $manager) {
47
-		$manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']);
48
-	}
46
+    public function listen(Manager $manager) {
47
+        $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']);
48
+    }
49 49
 }
Please login to merge, or discard this patch.
lib/private/Files/Config/CachedMountInfo.php 1 patch
Indentation   +110 added lines, -110 removed lines patch added patch discarded remove patch
@@ -28,114 +28,114 @@
 block discarded – undo
28 28
 use OCP\IUser;
29 29
 
30 30
 class CachedMountInfo implements ICachedMountInfo {
31
-	/**
32
-	 * @var IUser
33
-	 */
34
-	protected $user;
35
-
36
-	/**
37
-	 * @var int
38
-	 */
39
-	protected $storageId;
40
-
41
-	/**
42
-	 * @var int
43
-	 */
44
-	protected $rootId;
45
-
46
-	/**
47
-	 * @var string
48
-	 */
49
-	protected $mountPoint;
50
-
51
-	/**
52
-	 * @var int|null
53
-	 */
54
-	protected $mountId;
55
-
56
-	/**
57
-	 * @var string
58
-	 */
59
-	protected $rootInternalPath;
60
-
61
-	/**
62
-	 * CachedMountInfo constructor.
63
-	 *
64
-	 * @param IUser $user
65
-	 * @param int $storageId
66
-	 * @param int $rootId
67
-	 * @param string $mountPoint
68
-	 * @param int|null $mountId
69
-	 * @param string $rootInternalPath
70
-	 */
71
-	public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '') {
72
-		$this->user = $user;
73
-		$this->storageId = $storageId;
74
-		$this->rootId = $rootId;
75
-		$this->mountPoint = $mountPoint;
76
-		$this->mountId = $mountId;
77
-		$this->rootInternalPath = $rootInternalPath;
78
-	}
79
-
80
-	/**
81
-	 * @return IUser
82
-	 */
83
-	public function getUser() {
84
-		return $this->user;
85
-	}
86
-
87
-	/**
88
-	 * @return int the numeric storage id of the mount
89
-	 */
90
-	public function getStorageId() {
91
-		return $this->storageId;
92
-	}
93
-
94
-	/**
95
-	 * @return int the fileid of the root of the mount
96
-	 */
97
-	public function getRootId() {
98
-		return $this->rootId;
99
-	}
100
-
101
-	/**
102
-	 * @return Node the root node of the mount
103
-	 */
104
-	public function getMountPointNode() {
105
-		// TODO injection etc
106
-		Filesystem::initMountPoints($this->getUser()->getUID());
107
-		$userNode = \OC::$server->getUserFolder($this->getUser()->getUID());
108
-		$nodes = $userNode->getParent()->getById($this->getRootId());
109
-		if (count($nodes) > 0) {
110
-			return $nodes[0];
111
-		} else {
112
-			return null;
113
-		}
114
-	}
115
-
116
-	/**
117
-	 * @return string the mount point of the mount for the user
118
-	 */
119
-	public function getMountPoint() {
120
-		return $this->mountPoint;
121
-	}
122
-
123
-	/**
124
-	 * Get the id of the configured mount
125
-	 *
126
-	 * @return int|null mount id or null if not applicable
127
-	 * @since 9.1.0
128
-	 */
129
-	public function getMountId() {
130
-		return $this->mountId;
131
-	}
132
-
133
-	/**
134
-	 * Get the internal path (within the storage) of the root of the mount
135
-	 *
136
-	 * @return string
137
-	 */
138
-	public function getRootInternalPath() {
139
-		return $this->rootInternalPath;
140
-	}
31
+    /**
32
+     * @var IUser
33
+     */
34
+    protected $user;
35
+
36
+    /**
37
+     * @var int
38
+     */
39
+    protected $storageId;
40
+
41
+    /**
42
+     * @var int
43
+     */
44
+    protected $rootId;
45
+
46
+    /**
47
+     * @var string
48
+     */
49
+    protected $mountPoint;
50
+
51
+    /**
52
+     * @var int|null
53
+     */
54
+    protected $mountId;
55
+
56
+    /**
57
+     * @var string
58
+     */
59
+    protected $rootInternalPath;
60
+
61
+    /**
62
+     * CachedMountInfo constructor.
63
+     *
64
+     * @param IUser $user
65
+     * @param int $storageId
66
+     * @param int $rootId
67
+     * @param string $mountPoint
68
+     * @param int|null $mountId
69
+     * @param string $rootInternalPath
70
+     */
71
+    public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '') {
72
+        $this->user = $user;
73
+        $this->storageId = $storageId;
74
+        $this->rootId = $rootId;
75
+        $this->mountPoint = $mountPoint;
76
+        $this->mountId = $mountId;
77
+        $this->rootInternalPath = $rootInternalPath;
78
+    }
79
+
80
+    /**
81
+     * @return IUser
82
+     */
83
+    public function getUser() {
84
+        return $this->user;
85
+    }
86
+
87
+    /**
88
+     * @return int the numeric storage id of the mount
89
+     */
90
+    public function getStorageId() {
91
+        return $this->storageId;
92
+    }
93
+
94
+    /**
95
+     * @return int the fileid of the root of the mount
96
+     */
97
+    public function getRootId() {
98
+        return $this->rootId;
99
+    }
100
+
101
+    /**
102
+     * @return Node the root node of the mount
103
+     */
104
+    public function getMountPointNode() {
105
+        // TODO injection etc
106
+        Filesystem::initMountPoints($this->getUser()->getUID());
107
+        $userNode = \OC::$server->getUserFolder($this->getUser()->getUID());
108
+        $nodes = $userNode->getParent()->getById($this->getRootId());
109
+        if (count($nodes) > 0) {
110
+            return $nodes[0];
111
+        } else {
112
+            return null;
113
+        }
114
+    }
115
+
116
+    /**
117
+     * @return string the mount point of the mount for the user
118
+     */
119
+    public function getMountPoint() {
120
+        return $this->mountPoint;
121
+    }
122
+
123
+    /**
124
+     * Get the id of the configured mount
125
+     *
126
+     * @return int|null mount id or null if not applicable
127
+     * @since 9.1.0
128
+     */
129
+    public function getMountId() {
130
+        return $this->mountId;
131
+    }
132
+
133
+    /**
134
+     * Get the internal path (within the storage) of the root of the mount
135
+     *
136
+     * @return string
137
+     */
138
+    public function getRootInternalPath() {
139
+        return $this->rootInternalPath;
140
+    }
141 141
 }
Please login to merge, or discard this patch.
lib/private/Files/ObjectStore/StorageObjectStore.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -28,63 +28,63 @@
 block discarded – undo
28 28
  * Object store that wraps a storage backend, mostly for testing purposes
29 29
  */
30 30
 class StorageObjectStore implements IObjectStore {
31
-	/** @var IStorage */
32
-	private $storage;
31
+    /** @var IStorage */
32
+    private $storage;
33 33
 
34
-	/**
35
-	 * @param IStorage $storage
36
-	 */
37
-	public function __construct(IStorage $storage) {
38
-		$this->storage = $storage;
39
-	}
34
+    /**
35
+     * @param IStorage $storage
36
+     */
37
+    public function __construct(IStorage $storage) {
38
+        $this->storage = $storage;
39
+    }
40 40
 
41
-	/**
42
-	 * @return string the container or bucket name where objects are stored
43
-	 * @since 7.0.0
44
-	 */
45
-	function getStorageId() {
46
-		$this->storage->getId();
47
-	}
41
+    /**
42
+     * @return string the container or bucket name where objects are stored
43
+     * @since 7.0.0
44
+     */
45
+    function getStorageId() {
46
+        $this->storage->getId();
47
+    }
48 48
 
49
-	/**
50
-	 * @param string $urn the unified resource name used to identify the object
51
-	 * @return resource stream with the read data
52
-	 * @throws \Exception when something goes wrong, message will be logged
53
-	 * @since 7.0.0
54
-	 */
55
-	function readObject($urn) {
56
-		$handle = $this->storage->fopen($urn, 'r');
57
-		if ($handle) {
58
-			return $handle;
59
-		} else {
60
-			throw new \Exception();
61
-		}
62
-	}
49
+    /**
50
+     * @param string $urn the unified resource name used to identify the object
51
+     * @return resource stream with the read data
52
+     * @throws \Exception when something goes wrong, message will be logged
53
+     * @since 7.0.0
54
+     */
55
+    function readObject($urn) {
56
+        $handle = $this->storage->fopen($urn, 'r');
57
+        if ($handle) {
58
+            return $handle;
59
+        } else {
60
+            throw new \Exception();
61
+        }
62
+    }
63 63
 
64
-	/**
65
-	 * @param string $urn the unified resource name used to identify the object
66
-	 * @param resource $stream stream with the data to write
67
-	 * @throws \Exception when something goes wrong, message will be logged
68
-	 * @since 7.0.0
69
-	 */
70
-	function writeObject($urn, $stream) {
71
-		$handle = $this->storage->fopen($urn, 'w');
72
-		if ($handle) {
73
-			stream_copy_to_stream($stream, $handle);
74
-			fclose($handle);
75
-		} else {
76
-			throw new \Exception();
77
-		}
78
-	}
64
+    /**
65
+     * @param string $urn the unified resource name used to identify the object
66
+     * @param resource $stream stream with the data to write
67
+     * @throws \Exception when something goes wrong, message will be logged
68
+     * @since 7.0.0
69
+     */
70
+    function writeObject($urn, $stream) {
71
+        $handle = $this->storage->fopen($urn, 'w');
72
+        if ($handle) {
73
+            stream_copy_to_stream($stream, $handle);
74
+            fclose($handle);
75
+        } else {
76
+            throw new \Exception();
77
+        }
78
+    }
79 79
 
80
-	/**
81
-	 * @param string $urn the unified resource name used to identify the object
82
-	 * @return void
83
-	 * @throws \Exception when something goes wrong, message will be logged
84
-	 * @since 7.0.0
85
-	 */
86
-	function deleteObject($urn) {
87
-		$this->storage->unlink($urn);
88
-	}
80
+    /**
81
+     * @param string $urn the unified resource name used to identify the object
82
+     * @return void
83
+     * @throws \Exception when something goes wrong, message will be logged
84
+     * @since 7.0.0
85
+     */
86
+    function deleteObject($urn) {
87
+        $this->storage->unlink($urn);
88
+    }
89 89
 
90 90
 }
Please login to merge, or discard this patch.
lib/private/Files/ObjectStore/HomeObjectStoreStorage.php 2 patches
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -28,42 +28,42 @@
 block discarded – undo
28 28
 
29 29
 class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IHomeStorage {
30 30
 
31
-	/**
32
-	 * The home user storage requires a user object to create a unique storage id
33
-	 * @param array $params
34
-	 */
35
-	public function __construct($params) {
36
-		if ( ! isset($params['user']) || ! $params['user'] instanceof User) {
37
-			throw new \Exception('missing user object in parameters');
38
-		}
39
-		$this->user = $params['user'];
40
-		parent::__construct($params);
41
-	}
31
+    /**
32
+     * The home user storage requires a user object to create a unique storage id
33
+     * @param array $params
34
+     */
35
+    public function __construct($params) {
36
+        if ( ! isset($params['user']) || ! $params['user'] instanceof User) {
37
+            throw new \Exception('missing user object in parameters');
38
+        }
39
+        $this->user = $params['user'];
40
+        parent::__construct($params);
41
+    }
42 42
 
43
-	public function getId () {
44
-		return 'object::user:' . $this->user->getUID();
45
-	}
43
+    public function getId () {
44
+        return 'object::user:' . $this->user->getUID();
45
+    }
46 46
 
47
-	/**
48
-	 * get the owner of a path
49
-	 *
50
-	 * @param string $path The path to get the owner
51
-	 * @return false|string uid
52
-	 */
53
-	public function getOwner($path) {
54
-		if (is_object($this->user)) {
55
-			return $this->user->getUID();
56
-		}
57
-		return false;
58
-	}
47
+    /**
48
+     * get the owner of a path
49
+     *
50
+     * @param string $path The path to get the owner
51
+     * @return false|string uid
52
+     */
53
+    public function getOwner($path) {
54
+        if (is_object($this->user)) {
55
+            return $this->user->getUID();
56
+        }
57
+        return false;
58
+    }
59 59
 
60
-	/**
61
-	 * @param string $path, optional
62
-	 * @return \OC\User\User
63
-	 */
64
-	public function getUser($path = null) {
65
-		return $this->user;
66
-	}
60
+    /**
61
+     * @param string $path, optional
62
+     * @return \OC\User\User
63
+     */
64
+    public function getUser($path = null) {
65
+        return $this->user;
66
+    }
67 67
 
68 68
 
69 69
 }
70 70
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,15 +33,15 @@
 block discarded – undo
33 33
 	 * @param array $params
34 34
 	 */
35 35
 	public function __construct($params) {
36
-		if ( ! isset($params['user']) || ! $params['user'] instanceof User) {
36
+		if (!isset($params['user']) || !$params['user'] instanceof User) {
37 37
 			throw new \Exception('missing user object in parameters');
38 38
 		}
39 39
 		$this->user = $params['user'];
40 40
 		parent::__construct($params);
41 41
 	}
42 42
 
43
-	public function getId () {
44
-		return 'object::user:' . $this->user->getUID();
43
+	public function getId() {
44
+		return 'object::user:'.$this->user->getUID();
45 45
 	}
46 46
 
47 47
 	/**
Please login to merge, or discard this patch.
lib/private/Files/ObjectStore/NoopScanner.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -29,52 +29,52 @@
 block discarded – undo
29 29
 
30 30
 class NoopScanner extends Scanner {
31 31
 
32
-	public function __construct(Storage $storage) {
33
-		//we don't need the storage, so do nothing here
34
-	}
32
+    public function __construct(Storage $storage) {
33
+        //we don't need the storage, so do nothing here
34
+    }
35 35
 
36
-	/**
37
-	 * scan a single file and store it in the cache
38
-	 *
39
-	 * @param string $file
40
-	 * @param int $reuseExisting
41
-	 * @param int $parentId
42
-	 * @param array|null $cacheData existing data in the cache for the file to be scanned
43
-	 * @return array an array of metadata of the scanned file
44
-	 */
45
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
46
-		return array();
47
-	}
36
+    /**
37
+     * scan a single file and store it in the cache
38
+     *
39
+     * @param string $file
40
+     * @param int $reuseExisting
41
+     * @param int $parentId
42
+     * @param array|null $cacheData existing data in the cache for the file to be scanned
43
+     * @return array an array of metadata of the scanned file
44
+     */
45
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
46
+        return array();
47
+    }
48 48
 
49
-	/**
50
-	 * scan a folder and all it's children
51
-	 *
52
-	 * @param string $path
53
-	 * @param bool $recursive
54
-	 * @param int $reuse
55
-	 * @return array with the meta data of the scanned file or folder
56
-	 */
57
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
58
-		return array();
59
-	}
49
+    /**
50
+     * scan a folder and all it's children
51
+     *
52
+     * @param string $path
53
+     * @param bool $recursive
54
+     * @param int $reuse
55
+     * @return array with the meta data of the scanned file or folder
56
+     */
57
+    public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
58
+        return array();
59
+    }
60 60
 
61
-	/**
62
-	 * scan all the files and folders in a folder
63
-	 *
64
-	 * @param string $path
65
-	 * @param bool $recursive
66
-	 * @param int $reuse
67
-	 * @param array $folderData existing cache data for the folder to be scanned
68
-	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
69
-	 */
70
-	protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderData = null, $lock = true) {
71
-		return 0;
72
-	}
61
+    /**
62
+     * scan all the files and folders in a folder
63
+     *
64
+     * @param string $path
65
+     * @param bool $recursive
66
+     * @param int $reuse
67
+     * @param array $folderData existing cache data for the folder to be scanned
68
+     * @return int the size of the scanned folder or -1 if the size is unknown at this stage
69
+     */
70
+    protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderData = null, $lock = true) {
71
+        return 0;
72
+    }
73 73
 
74
-	/**
75
-	 * walk over any folders that are not fully scanned yet and scan them
76
-	 */
77
-	public function backgroundScan() {
78
-		//noop
79
-	}
74
+    /**
75
+     * walk over any folders that are not fully scanned yet and scan them
76
+     */
77
+    public function backgroundScan() {
78
+        //noop
79
+    }
80 80
 }
Please login to merge, or discard this patch.