Be more strict on 'fileExists' and 'directoryExists'.

Remove basename from the attributes.
Remove 'directory' mimetype.

Author: ylebre

src/Nextcloud.php

@@ -92,7 +92,7 @@ final public function deleteDirectory(string $dirname): void
     }
 
     /**
-     * Get all the meta data of a file or directory.
+     * Get all the meta data of a file
      *
      * @param string $path
      *
@@ -170,7 +170,12 @@ final public function visibility(string $path): FileAttributes
      */
     final public function fileExists(string $path): bool
     {
-        return $this->folder->nodeExists($path);
+        try {
+            $node = $this->folder->get($path);
+            return !$this->isDirectory($node);
+        } catch (\OCP\Files\NotFoundException $exception) {
+            return false;
+        }
     }
 
     /**
@@ -182,7 +187,12 @@ final public function fileExists(string $path): bool
      */
     final public function directoryExists(string $path): bool
     {
-        return $this->folder->nodeExists($path);
+        try {
+            $node = $this->folder->get($path);
+            return $this->isDirectory($node);
+        } catch (\OCP\Files\NotFoundException $exception) {
+            return false;
+        }
     }
 
     /**
@@ -384,10 +394,9 @@ private function isDirectory(\OCP\Files\Node $node)
     private function normalizeNodeInfo(\OCP\Files\Node $node, array $metaData = []) : array
     {
         return array_merge([
-            'mimetype' => $this->isDirectory($node) ? "directory" : $node->getMimetype(),
+            'mimetype' => $node->getMimetype(),
             'path' => substr($node->getPath(), strlen($this->folder->getPath())+1),
             'size' => $node->getSize(),
-            'basename' => basename($node->getPath()),
             'timestamp' => $node->getMTime(),
             'type' => $node->getType(),
             // @FIXME: Use $node->getPermissions() to set private or public

src/NextcloudCalendar.php

@@ -127,7 +127,7 @@ private function getCalendarId($path) {
     }
 
     /**
-     * Get all the meta data of a file or directory.
+     * Get all the meta data of a file.
      *
      * @param string $path
      *
@@ -217,7 +217,7 @@ final public function fileExists(string $path): bool
 
         $calendarId = $this->getCalendarId($path);
         if ($calendarId !== null) {
-            return true;
+            return false;
         } else {
             list($calendar, $filename) = $this->splitPath($path);
             $calendarId = $this->getCalendarId($calendar);
@@ -229,7 +229,11 @@ final public function fileExists(string $path): bool
 
     final public function directoryExists(string $path): bool
     {
-        return $this->fileExists($path);
+        $calendarId = $this->getCalendarId($path);
+        if ($calendarId !== null) {
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -337,7 +341,6 @@ final public function readStream(string $path): void
 
     private function normalizeAcl($acl) {
         return [
-            'basename' => '.acl',
             'contents' => $acl,
             'mimetype' => 'text/turtle',
             'path' => '.acl',
@@ -354,7 +357,6 @@ private function normalizeCalendarItem($calendarItem, $basePath) {
         }
 
         return [
-            'basename' => $calendarItem['uri'],
             'contents' => $calendarItem['calendardata'],
             'mimetype' => 'text/calendar',
             'path' => $basePath . '/' . $calendarItem['uri'],
@@ -368,8 +370,6 @@ private function normalizeCalendarItem($calendarItem, $basePath) {
     private function normalizeCalendar($calendar)
     {
         return [
-            'basename' => basename($calendar['uri']),
-            'mimetype' => 'directory',
             'path' => $calendar['uri'],
             'size' => 0,
             'timestamp' => 0,

src/NextcloudContacts.php

@@ -216,7 +216,7 @@ final public function fileExists(string $path): bool
 
         $addressBookId = $this->getAddressBookId($path);
         if ($addressBookId !== null) {
-            return true;
+            return false;
         } else {
             list($addressBook, $filename) = $this->splitPath($path);
             $addressBookId = $this->getAddressBookId($addressBook);
@@ -235,7 +235,11 @@ final public function fileExists(string $path): bool
      */
     final public function directoryExists(string $path): bool
     {
-        return $this->fileExists($path);
+        $addressBookId = $this->getAddressBookId($path);
+        if ($addressBookId !== null) {
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -348,7 +352,6 @@ final public function readStream(string $path): void
 
     private function normalizeAcl($acl) {
         return [
-            'basename' => '.acl',
             'contents' => $acl,
             'mimetype' => 'text/turtle',
             'path' => '.acl',
@@ -365,7 +368,6 @@ private function normalizeCard($card, $basePath) {
         }
 
         return [
-            'basename' => $card['uri'],
             'contents' => $card['carddata'],
             'mimetype' => 'text/vcard',
             'path' => $basePath . '/' . $card['uri'],
@@ -379,8 +381,6 @@ private function normalizeCard($card, $basePath) {
     private function normalizeAddressBook($addressBook)
     {
         return [
-            'basename' => basename($addressBook['uri']),
-            'mimetype' => 'directory',
             'path' => $addressBook['uri'],
             'size' => 0,
             'timestamp' => 0,

src/NextcloudProfile.php

@@ -169,7 +169,10 @@ final public function fileExists(string $path): bool
      */
     final public function directoryExists(string $path): bool
     {
-        return $this->fileExists($path);
+        if ($path === '/') {
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -253,7 +256,6 @@ final public function readStream(string $path): void
 
     private function normalizeAcl($acl) {
         return [
-            'basename' => '.acl',
             'contents' => $acl,
             'mimetype' => 'text/turtle',
             'path' => '.acl',
@@ -267,7 +269,6 @@ private function normalizeAcl($acl) {
     private function normalizeProfile() {
         $profile = $this->profile;
         return [
-            'basename' => 'card',
             'contents' => $profile,
             'mimetype' => 'text/turtle',
             'path' => "card",