JI-3485 Add support for deleting previous minor version library

h5p-default-storage.class.php

@@ -48,6 +48,10 @@ public function saveLibrary($library) {
     self::copyFileTree($library['uploadDirectory'], $dest);
   }
 
+  public function deleteLibrary($library) {
+    // TODO
+  }
+
   /**
    * Store the content folder.
    *

h5p-file-storage.interface.php

@@ -17,6 +17,13 @@ interface H5PFileStorage {
    */
   public function saveLibrary($library);
 
+  /**
+   * Delete library folder
+   *
+   * @param array $library
+   */
+  public function deleteLibrary($library);
+
   /**
    * Store the content folder.
    *

h5p.classes.php

@@ -1620,20 +1620,20 @@ private function saveLibraries() {
 
     // Go through libraries that came with this package
     foreach ($this->h5pC->librariesJsonData as $libString => &$library) {
-      // Find local library identifier
-      $libraryId = $this->h5pC->getLibraryId($library, $libString);
+      // Find local library with same major + minor
+      $existingLibrary = $this->h5pC->loadLibrary($library['machineName'], $library['majorVersion'], $library['minorVersion']);
 
       // Assume new library
       $new = TRUE;
-      if ($libraryId) {
-        // Found old library
-        $library['libraryId'] = $libraryId;
+      if ($existingLibrary) {
+        // We have the library installed already (with the same major + minor)
 
-        if ($this->h5pF->isPatchedLibrary($library)) {
-          // This is a newer version than ours. Upgrade!
-          $new = FALSE;
-        }
-        else {
+        $library['libraryId'] = $existingLibrary['libraryId'];
+
+        // Is this a newer patchVersion?
+        $new = $existingLibrary['patchVersion'] < $library['patchVersion'];
+
+        if (!$new) {
           $library['saveDependencies'] = FALSE;
           // This is an older version, no need to save.
           continue;
@@ -1663,6 +1663,10 @@ private function saveLibraries() {
       // Remove tmp folder
       H5PCore::deleteFileTree($library['uploadDirectory']);
 
+      if ($existingLibrary) {
+        $this->h5pC->fs->deleteLibrary($existingLibrary);
+      }
+
       if ($new) {
         $newOnes++;
       }
@@ -3159,6 +3163,8 @@ private function getDisplayOptionsAsArray($disable) {
    * @return int Identifier, or FALSE if non-existent
    */
   public function getLibraryId($library, $libString = NULL) {
+    static $libraryIdMap = [];
+
     if (!$libString) {
       $libString = self::libraryToString($library);
     }