EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed uploading packages and export functionality with development mode. 

Changed update package to save package, update package was moved from interface in january, replaced with savePackage.
Added optional parameter to exportLibrary where you can pass in development folder path for the library if it lives inside development folder.
HVP-147
pull/21/head
Thomas Marstrander 2016-04-21 11:38:14 +02:00
parent 64de9d53f8
commit 414751aad2
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
h5p-default-storage.class.php
View File

@ -116,10 +116,13 @@ class H5PDefaultStorage implements \H5PFileStorage {
* Library properties * Library properties
* @param string $target * @param string $target
* Where the library folder will be saved * Where the library folder will be saved
* @param string $developmentPath
* Folder that library resides in
*/ */
public function exportLibrary($library, $target) { public function exportLibrary($library, $target, $developmentPath=NULL) {
$folder = \H5PCore::libraryToString($library, TRUE); $folder = \H5PCore::libraryToString($library, TRUE);
self::copyFileTree("{$this->path}/libraries/{$folder}", "{$target}/{$folder}"); $srcPath = ($developmentPath === NULL ? "/libraries/{$folder}" : $developmentPath);
self::copyFileTree("{$this->path}{$srcPath}", "{$target}/{$folder}");
} }
/** /**
@ -253,6 +256,8 @@ class H5PDefaultStorage implements \H5PFileStorage {
* To path * To path
* @return boolean * @return boolean
* Indicates if the directory existed. * Indicates if the directory existed.
*
* @throws Exception Unable to copy the file
*/ */
private static function copyFileTree($source, $destination) { private static function copyFileTree($source, $destination) {
if (!self::dirReady($destination)) { if (!self::dirReady($destination)) {

19
h5p.classes.php
View File

@ -1550,8 +1550,25 @@ Class H5PExport {
$library = $dependency['library']; $library = $dependency['library'];
try { try {
$exportFolder = NULL;
// Determine path of export library
if (isset($this->h5pC) && isset($this->h5pC->h5pD)) {
// Tries to find library in development folder
$isDevLibrary = $this->h5pC->h5pD->getLibrary(
$library['machineName'],
$library['majorVersion'],
$library['minorVersion']
);
if ($isDevLibrary !== NULL) {
$exportFolder = "/" . $library['path'];
}
}
// Export required libraries // Export required libraries
$this->h5pC->fs->exportLibrary($library, $tmpPath); $this->h5pC->fs->exportLibrary($library, $tmpPath, $exportFolder);
} }
catch (Exception $e) { catch (Exception $e) {
$this->h5pF->setErrorMessage($this->h5pF->t($e->getMessage())); $this->h5pF->setErrorMessage($this->h5pF->t($e->getMessage()));