From 5793af108dcb66300e2c45afafaeec1a0fa29015 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 26 Apr 2018 09:59:00 +0200 Subject: [PATCH] MOBILE-2350 scorm: Fix unzip in browser and sync WS calls --- src/core/emulator/emulator.module.ts | 7 +- src/core/emulator/providers/zip.ts | 93 +++++++++++++++++++----- src/core/settings/pages/about/about.html | 2 +- src/providers/file.ts | 4 + src/providers/ws.ts | 4 +- 5 files changed, 86 insertions(+), 24 deletions(-) diff --git a/src/core/emulator/emulator.module.ts b/src/core/emulator/emulator.module.ts index 9afd878fc..7dc283b4d 100644 --- a/src/core/emulator/emulator.module.ts +++ b/src/core/emulator/emulator.module.ts @@ -53,7 +53,6 @@ import { CoreEmulatorCaptureHelperProvider } from './providers/capture-helper'; import { CoreAppProvider } from '@providers/app'; import { CoreFileProvider } from '@providers/file'; import { CoreTextUtilsProvider } from '@providers/utils/text'; -import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype'; import { CoreUrlUtilsProvider } from '@providers/utils/url'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreInitDelegate } from '@providers/init'; @@ -184,10 +183,10 @@ export const IONIC_NATIVE_PROVIDERS = [ SQLite, { provide: Zip, - deps: [CoreAppProvider, File, CoreMimetypeUtilsProvider, CoreTextUtilsProvider], - useFactory: (appProvider: CoreAppProvider, file: File, mimeUtils: CoreMimetypeUtilsProvider): Zip => { + deps: [CoreAppProvider, File, CoreTextUtilsProvider], + useFactory: (appProvider: CoreAppProvider, file: File, textUtils: CoreTextUtilsProvider): Zip => { // Use platform instead of CoreAppProvider to prevent circular dependencies. - return appProvider.isMobile() ? new Zip() : new ZipMock(file, mimeUtils); + return appProvider.isMobile() ? new Zip() : new ZipMock(file, textUtils); } }, ] diff --git a/src/core/emulator/providers/zip.ts b/src/core/emulator/providers/zip.ts index 9bc3d315a..f7d93f4c1 100644 --- a/src/core/emulator/providers/zip.ts +++ b/src/core/emulator/providers/zip.ts @@ -14,9 +14,9 @@ import { Injectable } from '@angular/core'; import { Zip } from '@ionic-native/zip'; -import { JSZip } from 'jszip'; +import * as JSZip from 'jszip'; import { File } from '@ionic-native/file'; -import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype'; +import { CoreTextUtilsProvider } from '@providers/utils/text'; /** * Emulates the Cordova Zip plugin in desktop apps and in browser. @@ -24,10 +24,36 @@ import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype'; @Injectable() export class ZipMock extends Zip { - constructor(private file: File, private mimeUtils: CoreMimetypeUtilsProvider) { + constructor(private file: File, private textUtils: CoreTextUtilsProvider) { super(); } + /** + * Create a directory. It creates all the foldes in dirPath 1 by 1 to prevent errors. + * + * @param {string} destination Destination parent folder. + * @param {string} dirPath Relative path to the folder. + * @return {Promise} Promise resolved when done. + */ + protected createDir(destination: string, dirPath: string): Promise { + // Create all the folders 1 by 1 in order, otherwise it fails. + const folders = dirPath.split('/'); + let promise = Promise.resolve(); + + for (let i = 0; i < folders.length; i++) { + const folder = folders[i]; + + promise = promise.then(() => { + return this.file.createDir(destination, folder, true).then(() => { + // Folder created, add it to the destination path. + destination = this.textUtils.concatenatePaths(destination, folder); + }); + }); + } + + return promise; + } + /** * Extracts files from a ZIP archive. * @@ -37,35 +63,68 @@ export class ZipMock extends Zip { * @return {Promise} Promise that resolves with a number. 0 is success, -1 is error. */ unzip(source: string, destination: string, onProgress?: Function): Promise { + // Replace all %20 with spaces. source = source.replace(/%20/g, ' '); destination = destination.replace(/%20/g, ' '); const sourceDir = source.substring(0, source.lastIndexOf('/')), - sourceName = source.substr(source.lastIndexOf('/') + 1); + sourceName = source.substr(source.lastIndexOf('/') + 1), + zip = new JSZip(); + // Read the file first. return this.file.readAsArrayBuffer(sourceDir, sourceName).then((data) => { - const zip = new JSZip(data), - promises = [], - total = Object.keys(zip.files).length; - let loaded = 0; - if (!zip.files || !zip.files.length) { + // Now load the file using the JSZip library. + return zip.loadAsync(data); + }).then((): any => { + + if (!zip.files || !Object.keys(zip.files).length) { // Nothing to extract. return 0; } - zip.files.forEach((file, name) => { - let type, - promise; + // First of all, create the directory where the files will be unzipped. + const destParent = destination.substring(0, source.lastIndexOf('/')), + destFolderName = destination.substr(source.lastIndexOf('/') + 1); + + return this.file.createDir(destParent, destFolderName, false); + }).then(() => { + + const promises = [], + total = Object.keys(zip.files).length; + let loaded = 0; + + for (const name in zip.files) { + const file = zip.files[name]; + let promise; if (!file.dir) { - // It's a file. Get the mimetype and write the file. - type = this.mimeUtils.getMimeType(this.mimeUtils.getFileExtension(name)); - promise = this.file.writeFile(destination, name, new Blob([file.asArrayBuffer()], { type: type })); + // It's a file. + const fileDir = name.substring(0, name.lastIndexOf('/')), + fileName = name.substr(name.lastIndexOf('/') + 1), + filePromises = []; + let fileData; + + if (fileDir) { + // The file is in a subfolder, create it first. + filePromises.push(this.createDir(destination, fileDir)); + } + + // Read the file contents as a Blob. + filePromises.push(file.async('blob').then((data) => { + fileData = data; + })); + + promise = Promise.all(filePromises).then(() => { + // File read and parent folder created, now write the file. + const parentFolder = this.textUtils.concatenatePaths(destination, fileDir); + + return this.file.writeFile(parentFolder, fileName, fileData, {replace: true}); + }); } else { // It's a folder, create it if it doesn't exist. - promise = this.file.createDir(destination, name, false); + promise = this.createDir(destination, name); } promises.push(promise.then(() => { @@ -73,7 +132,7 @@ export class ZipMock extends Zip { loaded++; onProgress && onProgress({ loaded: loaded, total: total }); })); - }); + } return Promise.all(promises).then(() => { return 0; diff --git a/src/core/settings/pages/about/about.html b/src/core/settings/pages/about/about.html index b05a037ec..c7dc40e2e 100644 --- a/src/core/settings/pages/about/about.html +++ b/src/core/settings/pages/about/about.html @@ -38,7 +38,7 @@

{{ 'core.settings.filesystemroot' | translate}}

-

{{ filesystemroot }}

+

{{ fileSystemRoot }}

{{ fileSystemRoot }}

 diff --git a/src/providers/file.ts b/src/providers/file.ts index 06a65452e..836685ab6 100644 --- a/src/providers/file.ts +++ b/src/providers/file.ts @@ -731,6 +731,10 @@ export class CoreFileProvider { destFolder = this.addBasePathIfNeeded(destFolder || this.mimeUtils.removeExtension(path)); return this.zip.unzip(fileEntry.toURL(), destFolder, onProgress); + }).then((result) => { + if (result == -1) { + return Promise.reject(null); + } }); } diff --git a/src/providers/ws.ts b/src/providers/ws.ts index 267ac509d..896917693 100644 --- a/src/providers/ws.ts +++ b/src/providers/ws.ts @@ -706,8 +706,8 @@ export class CoreWSProvider { data = ('response' in xhr) ? xhr.response : xhr.responseText; // Check status. - xhr.status = Math.max(xhr.status === 1223 ? 204 : xhr.status, 0); - if (xhr.status < 200 || xhr.status >= 300) { + const status = Math.max(xhr.status === 1223 ? 204 : xhr.status, 0); + if (status < 200 || status >= 300) { // Request failed. errorResponse.message = data;