|
64 | 64 | use OCP\Files\Storage\IChunkedFileWrite;
|
65 | 65 | use OCP\Files\Storage\IStorage;
|
66 | 66 | use OCP\Files\StorageInvalidException;
|
67 |
| -use OCP\ILogger; |
68 | 67 | use OCP\IUser;
|
69 | 68 | use OCP\Lock\ILockingProvider;
|
70 | 69 | use OCP\Lock\LockedException;
|
@@ -838,14 +837,14 @@ public function rename($path1, $path2) {
|
838 | 837 | } else {
|
839 | 838 | $result = false;
|
840 | 839 | }
|
841 |
| - // moving a file/folder within the same mount point |
| 840 | + // moving a file/folder within the same mount point |
842 | 841 | } elseif ($storage1 === $storage2) {
|
843 | 842 | if ($storage1) {
|
844 | 843 | $result = $storage1->rename($internalPath1, $internalPath2);
|
845 | 844 | } else {
|
846 | 845 | $result = false;
|
847 | 846 | }
|
848 |
| - // moving a file/folder between storages (from $storage1 to $storage2) |
| 847 | + // moving a file/folder between storages (from $storage1 to $storage2) |
849 | 848 | } else {
|
850 | 849 | $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
|
851 | 850 | }
|
@@ -1064,7 +1063,6 @@ public function toTmpFile($path) {
|
1064 | 1063 | public function fromTmpFile($tmpFile, $path) {
|
1065 | 1064 | $this->assertPathLength($path);
|
1066 | 1065 | if (Filesystem::isValidPath($path)) {
|
1067 |
| - |
1068 | 1066 | // Get directory that the file is going into
|
1069 | 1067 | $filePath = dirname($path);
|
1070 | 1068 |
|
@@ -1820,7 +1818,6 @@ private function assertPathLength($path) {
|
1820 | 1818 | * @return boolean
|
1821 | 1819 | */
|
1822 | 1820 | private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) {
|
1823 |
| - |
1824 | 1821 | // note: cannot use the view because the target is already locked
|
1825 | 1822 | $fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
|
1826 | 1823 | if ($fileId === -1) {
|
|
0 commit comments