uploads have to be zipped #5

This is a first rough fix. Uploads are exactly like downolads, so the
file needs to be wrapped into a zip and metadata needs to be added.

This seems to make the upload work as planned. But it needs some more
testing and refactoring.

Author: splitbrain

composer.json

@@ -12,7 +12,8 @@
   "require": {
     "ramsey/uuid": "^3.7",
     "guzzlehttp/guzzle": "^6.3",
-    "psr/log": "^1.0"
+    "psr/log": "^1.0",
+    "splitbrain/php-archive": "^1.0"
   },
   "require-dev": {
     "splitbrain/php-cli": "^1.1"

composer.lock

@@ -148,9 +148,8 @@ protected function cmdUpload($file, $parent, $uuid)
             $parent = $fs->mkdirP($parent);
         }
 
-        $stream = \GuzzleHttp\Psr7\stream_for($file);
         $name = basename($file);
-        $this->api->uploadDocument($stream, $name, $parent);
+        $this->api->uploadDocument(file_get_contents($file), $name, $parent);
     }
 
     /**
@@ -166,7 +165,7 @@ protected function cmdDownload($file, $to, $uuid)
         if (!$uuid) {
             $fs = new RemarkableFS($this->api);
             $item = $fs->findFirst($file, RemarkableAPI::TYPE_DOCUMENT);
-            if($item === null) throw new \Exception('Document not found');
+            if ($item === null) throw new \Exception('Document not found');
             $file = $item['ID'];
         }
 

remarkable.php

@@ -7,6 +7,7 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Ramsey\Uuid\Uuid;
+use splitbrain\PHPArchive\Zip;
 
 /**
  * Class RemarkableAPI
@@ -227,6 +228,23 @@ public function uploadDocument($body, $name, $parentID = '')
         ];
         $item = $this->createUploadRequest($stub);
 
+        # FIXME once this works it needs refactoring
+        $zip = new Zip();
+        $zip->create();
+        $zip->addData($stub['ID'] . '.pdf', (string)$body);
+        $zip->addData($stub['ID'] . '.pagedata', '');
+        $zip->addData($stub['ID'] . '.content', json_encode([
+            'extraMeatadata' => [],
+            'fileType' => 'pdf',
+            'lastOpenedPage' => 0,
+            'lineHeight' => -1,
+            'margins' => 100,
+#            'pageCount' => 1, #FIXME how to find out
+            'textScale' => 1,
+            'transform' => [] #FIXME wtf is this?
+        ], JSON_PRETTY_PRINT));
+        $body = $zip->getArchive();
+
         if (!isset($item['BlobURLPut'])) {
             print_r($item);
             throw new \Exception('No put url');

src/RemarkableAPI.php

@@ -80,7 +80,7 @@ public function getTree()
     public function mkdirP($folder)
     {
         $folder = trim($folder, '/');
-        if($folder === '') return '';
+        if ($folder === '') return '';
         $parts = explode('/', $folder);
 
         $current = '';