Merge pull request #4599 from dpalou/MOBILE-4842

MOBILE-4842 h5p: Fix delete content files on lib upgrade

Author: crazyserver

src/core/classes/sqlitedb.ts

@@ -435,6 +435,7 @@ export class SQLiteDB {
     /**
      * Execute a SQL query.
      * IMPORTANT: Use this function only if you cannot use any of the other functions in this API.
+     * Please notice that the rows property in the result cannot be converted to an array using Array.from().
      *
      * @param sql SQL query to execute.
      * @param params Query parameters.

src/core/features/h5p/classes/file-storage.ts

@@ -200,9 +200,9 @@ export class CoreH5PFileStorage {
                     'WHERE hcl.libraryid = ?';
         const queryArgs = [libraryId];
 
-        const result = await db.execute(query, queryArgs);
+        const entries = await db.getRecordsSql<{foldername: string}>(query, queryArgs);
 
-        await Promise.all(Array.from(result.rows).map(async (entry: {foldername: string}) => {
+        await Promise.all(entries.map(async (entry) => {
             try {
                 // Delete the index.html.
                 await this.deleteContentIndex(entry.foldername, site.getId());

src/core/features/h5p/classes/framework.ts

@@ -58,6 +58,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreFileHelper } from '@services/file-helper';
 import { CoreUrl, CoreUrlPartNames } from '@singletons/url';
 import { CorePromiseUtils } from '@singletons/promise-utils';
+import { CoreArray } from '@singletons/array';
 
 /**
  * Equivalent to Moodle's implementation of H5PFrameworkInterface.
@@ -654,15 +655,7 @@ export class CoreH5PFramework {
                         'l1.minorversion < l2.minorversion)) ' +
                     'WHERE l1.addto IS NOT NULL AND l2.machinename IS NULL';
 
-        const result = await db.execute(query);
-
-        const addons: CoreH5PLibraryAddonData[] = [];
-
-        for (let i = 0; i < result.rows.length; i++) {
-            addons.push(this.parseLibAddonData(result.rows.item(i)));
-        }
-
-        return addons;
+        return await db.getRecordsSql<CoreH5PLibraryAddonData>(query);
     }
 
     /**
@@ -762,17 +755,9 @@ export class CoreH5PFramework {
 
         query += ' ORDER BY hcl.weight';
 
-        const result = await db.execute(query, queryArgs);
-
-        const dependencies: {[machineName: string]: CoreH5PContentDependencyData} = {};
+        const dependencies = await db.getRecordsSql<CoreH5PContentDependencyData>(query, queryArgs);
 
-        for (let i = 0; i < result.rows.length; i++) {
-            const dependency = result.rows.item(i);
-
-            dependencies[dependency.machineName] = dependency;
-        }
-
-        return dependencies;
+        return CoreArray.toObject(dependencies, 'machineName');
     }
 
     /**
@@ -831,18 +816,17 @@ export class CoreH5PFramework {
 
         const db = await CoreSites.getSiteDb(siteId);
 
-        const result = await db.execute(sql, sqlParams);
+        const dependencies = await db.getRecordsSql<LibraryDependency>(sql, sqlParams);
 
-        for (let i = 0; i < result.rows.length; i++) {
-            const dependency: LibraryDependency = result.rows.item(i);
+        dependencies.forEach((dependency) => {
             const key = `${dependency.dependencytype}Dependencies`;
 
             libraryData[key].push({
                 machineName: dependency.machinename,
                 majorVersion: dependency.majorversion,
                 minorVersion: dependency.minorversion,
             });
-        }
+        });
 
         return libraryData;
     }