metadata implemented

Author: justicenode

.idea/files_external_ipfs.iml

@@ -6,10 +6,10 @@ This app allows you to use IPFS as an external storage for Nextcloud.
 
 _Place this app in **nextcloud/apps/**_
 
-## Important Notes
-- unless you create a private IPFS swarm all files will be public *[How to](https://github.com/ahester57/ipfs-private-swarm)*
-
 ## Documentation
 - **[Getting Started](docs/README.md)**
 - [Changelog](CHANGELOG.md)
 
+## Notes
+- unless you create a private IPFS swarm all files will be public *[How to](https://github.com/ahester57/ipfs-private-swarm)*
+- `js-ipfs` <= `v0.40` and `go-ipfs` dont have write support

.idea/php.xml

@@ -1,16 +1,17 @@
 {
-    "name": "Files IPFS",
+    "name": "IPFS for Nextcloud",
     "description": "IPFS Backend for file storage",
     "type": "project",
     "license": "AGPL",
     "authors": [
         {
-            "name": "Carlo Meier"
+            "name": "V31L"
         }
     ],
     "require": {
+        "ext-curl": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.4"
+        "phpunit/phpunit": "^5.7"
     }
 }

.idea/phpunit.xml

@@ -46,19 +46,19 @@ public function __construct(string $host, string $root) {
 	 * @param array $data POST data
 	 * @return bool|string false or the body of the response
 	 */
-	private function callAPI(string $url, array $params = [], array $data = []) {
+	private function callAPI(string $url, array $params = [], MultipartData $data = null) {
 		$curl = curl_init();
 
 		curl_setopt($curl, CURLOPT_POST, 1);
-		curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+
+		if (!empty($data)) $data->apply($curl);
 
 		if (!empty($params)) $url = sprintf("%s?%s", $url, http_build_query($params));
 
 		curl_setopt($curl, CURLOPT_URL, "{$this->host}{$url}");
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 
 		$result = curl_exec($curl);
-
 		curl_close($curl);
 
 		return $result;
@@ -88,6 +88,7 @@ private function normalizeFile(array $entry, $root = false) {
 			'path' => $root ? ltrim("{$root}/{$entry['Name']}", '/') : $entry['Name'],
 			'timestamp' => isset($entry['Mtime']) ? $entry['Mtime'] : time(),
 			'size' => $entry['Size'],
+			'visibility' => isset($entry['Mode']) && substr($entry['Mode'], 2) != '00' ? 'public' : 'private',
 		];
 	}
 
@@ -101,17 +102,16 @@ private function normalizeFile(array $entry, $root = false) {
 	 * @return array|bool metadata of false if the operation failed
 	 */
 	private function upload(string $path, string $contents, Config $config ,$append = false) {
-		$args = ['arg' => "/{$path}", 'create' => true, 'mode' => $this->permissions['file']['public']];
+		$args = ['arg' => "/{$path}", 'create' => 'true'];
 
 		if ($append) {
 			$meta = $this->getMetadata($path);
 			$args['offset'] = $meta['size'];
-		} else $args['truncate'] = true;
+		} else $args['truncate'] = 'true';
 
-		if (in_array($config->get('visibility'), ['public', 'private']))
-			$args['mode'] = $this->permissions['file'][$config->get('visibility')];
+		$mode = in_array($config->get('visibility'), ['public', 'private']) ? $this->permissions['file'][$config->get('visibility')] : $this->permissions['file']['public'];
 
-		$response = $this->callAPI('/files/write', $args, ['data' => $contents]);
+		$response = $this->callAPI('/files/write', $args, new MultipartData($contents, $path, $mode));
 
 		if ($response != '') return false; // On error return false
 
@@ -190,7 +190,7 @@ public function getTimestamp($path) {
 	}
 
 	public function getVisibility($path) {
-		//TODO
+		return $this->getMetadata($path);
 	}
 
 	/**
@@ -263,6 +263,6 @@ public function createDir($dirname, Config $config) {
 
 	public function setVisibility($path, $visibility) {
 		$mode = $this->permissions[$this->getMetadata($path)['type']][$visibility];
-		$this->callAPI('/files/chmod', ['arg' => $path, 'mode' => $mode]);
+		$this->callAPI('/files/chmod', ['arg' => $path, 'mode' => sprintf('%o', $mode)]);
 	}
 }

README.md

@@ -0,0 +1,66 @@
+<?php
+
+namespace OCA\Files_External_IPFS\Storage;
+
+/**
+ * Class MultipartData
+ * @package OCA\Files_External_IPFS\Storage
+ * @author V31L <[email protected]>
+ */
+class MultipartData {
+	private $content, $path, $mode, $mtime, $mime, $delimiter, $data, $fields;
+
+	public function __construct($content, string $path, int $mode, int $mtime = null, string $mime = 'application/octet-stream') {
+		$this->content = $content;
+		$this->mode = sprintf('0%o', $mode);
+		$this->mtime = empty($mtime) ? time() : $mtime;
+		$this->path = $path;
+		$this->mime = $mime;
+		$this->delimiter = '-------------' . uniqid();
+	}
+
+	/**
+	 * @param array $fields
+	 */
+	public function setFields(array $fields) {
+		$this->fields = $fields;
+	}
+
+	/**
+	 * @param $curl
+	 */
+	public function apply($curl) {
+		$this->data = '';
+
+		// populate normal fields
+		foreach ($this->fields as $name => $content) {
+			$this->data .= "--{$this->delimiter}\r\n";
+			$this->data .= "Content-Disposition: form-data; name=\"{$name}\"\r\n{$content}\r\n\r\n";
+		}
+
+		// populate file field
+		$this->data .= "--" . $this->delimiter . "\r\n";
+		$this->data .= "Content-Disposition: form-data; name=\"file\"; filename=\"{$this->path}\"\r\n";
+		$this->data .= "Content-Type: {$this->mime}\r\n";
+		$this->data .= "mode: {$this->mode}\r\n";
+		$this->data .= "mtime: {$this->mtime}\r\n";
+		$this->data .= $this->content . "\r\n";
+
+		// last delimiter
+		$this->data .= "--" . $this->delimiter . "--\r\n";
+
+		// Add data to curl request
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $this->getHeaders());
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $this->data);
+	}
+
+	/**
+	 * @return string[]
+	 */
+	private function getHeaders() {
+		return [
+			"Content-Type: multipart/form-data; boundary={$this->delimiter}",
+			'Content-Length: ' . strlen($this->data)
+		];
+	}
+}