JI-1062 Add interface function for saving files from .h5p

Make it easier for plugins to override the unpacking of the
package files.

Author: icc

h5p-default-storage.class.php

@@ -357,15 +357,14 @@ public function cloneContentFile($file, $fromId, $toId) {
    * content from the current temporary upload folder to the editor path.
    *
    * @param string $source path to source directory
-   * @param string $contentId Id of content
-   *
-   * @return object Object containing h5p json and content json data
+   * @param string $contentId Id of contentarray
    */
   public function moveContentDirectory($source, $contentId = NULL) {
     if ($source === NULL) {
       return NULL;
     }
 
+    // TODO: Remove $contentId and never copy temporary files into content folder. JI-366
     if ($contentId === NULL || $contentId == 0) {
       $target = $this->getEditorPath();
     }
@@ -385,14 +384,7 @@ public function moveContentDirectory($source, $contentId = NULL) {
       }
     }
 
-    // Successfully loaded content json of file into editor
-    $h5pJson = $this->getContent($source . DIRECTORY_SEPARATOR . 'h5p.json');
-    $contentJson = $this->getContent($contentSource . DIRECTORY_SEPARATOR . 'content.json');
-
-    return (object) array(
-      'h5pJson' => $h5pJson,
-      'contentJson' => $contentJson
-    );
+    // TODO: Return list of all files so that they can be marked as temporary. JI-366
   }
 
   /**
@@ -476,6 +468,26 @@ public function getUpgradeScript($machineName, $majorVersion, $minorVersion) {
     }
   }
 
+  /**
+   * Store the given stream into the given file.
+   *
+   * @param string $path
+   * @param string $file
+   * @param resource $stream
+   * @return bool
+   */
+  public function saveFileFromZip($path, $file, $stream) {
+    $filePath = $path . '/' . $file;
+
+    // Make sure the directory exists first
+    $matches = array();
+    preg_match('/(.+)\/[^\/]*$/', $filePath, $matches);
+    self::dirReady($matches[1]);
+
+    // Store in local storage folder
+    return file_put_contents($filePath, $stream);
+  }
+
   /**
    * Recursive function for copying directories.
    *

h5p-file-storage.interface.php

@@ -209,4 +209,14 @@ public function hasPresave($libraryName, $developmentPath = null);
    * @return string Relative path
    */
   public function getUpgradeScript($machineName, $majorVersion, $minorVersion);
+
+  /**
+   * Store the given stream into the given file.
+   *
+   * @param string $path
+   * @param string $file
+   * @param resource $stream
+   * @return bool
+   */
+  public function saveFileFromZip($path, $file, $stream);
 }