From 975de1954e7c7a1ce8cdf2ff05ecac6fff108ac3 Mon Sep 17 00:00:00 2001
From: Nicolas Raynaud <nraynaud@gmail.com>
Date: Thu, 4 Apr 2019 01:59:44 -0700
Subject: [PATCH] feat(xo-web/vm-import): don't block the UI when dropping a
 big OVA file (#4018)

---
 CHANGELOG.unreleased.md                           |  2 ++
 packages/xo-vmdk-to-vhd/src/vmdk-read-table.js    | 13 +++++++------
 packages/xo-web/src/common/xo/index.js            |  8 ++++++--
 packages/xo-web/src/xo-app/vm-import/ova/index.js |  7 +++----
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 51590e130..84bfe9939 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -4,6 +4,7 @@
 
 - [Settings/remotes] Expose mount options field for SMB [#4063](https://github.com/vatesfr/xen-orchestra/issues/4063) (PR [#4067](https://github.com/vatesfr/xen-orchestra/pull/4067))
 - [Backup/Schedule] Add warning regarding DST when you add a schedule [#4042](https://github.com/vatesfr/xen-orchestra/issues/4042) (PR [#4056](https://github.com/vatesfr/xen-orchestra/pull/4056))
+- [Import] Avoid blocking the UI when dropping a big OVA file on the UI (PR [#4018](https://github.com/vatesfr/xen-orchestra/pull/4018))
 
 ### Bug fixes
 
@@ -11,6 +12,7 @@
 
 ### Released packages
 
+- xo-vmdk-to-vhd v0.1.7
 - vhd-lib v0.6.1
 - xo-server v5.39.0
 - xo-web v5.39.0
diff --git a/packages/xo-vmdk-to-vhd/src/vmdk-read-table.js b/packages/xo-vmdk-to-vhd/src/vmdk-read-table.js
index fae29d6de..440c3e31f 100644
--- a/packages/xo-vmdk-to-vhd/src/vmdk-read-table.js
+++ b/packages/xo-vmdk-to-vhd/src/vmdk-read-table.js
@@ -12,10 +12,10 @@ const GRAIN_ADDRESS_OFFSET = 56
  */
 export default async function readVmdkGrainTable(fileAccessor) {
   const getLongLong = (buffer, offset, name) => {
-    if (buffer.length < offset + 8) {
+    if (buffer.byteLength < offset + 8) {
       throw new Error(
         `buffer ${name} is too short, expecting ${offset + 8} minimum, got ${
-          buffer.length
+          buffer.byteLength
         }`
       )
     }
@@ -61,11 +61,12 @@ export default async function readVmdkGrainTable(fileAccessor) {
   const grainTablePhysicalSize = numGTEsPerGT * 4
   const grainDirectoryEntries = Math.ceil(grainCount / numGTEsPerGT)
   const grainDirectoryPhysicalSize = grainDirectoryEntries * 4
-  const grainDirBuffer = await fileAccessor(
-    grainDirPosBytes,
-    grainDirPosBytes + grainDirectoryPhysicalSize
+  const grainDir = new Uint32Array(
+    await fileAccessor(
+      grainDirPosBytes,
+      grainDirPosBytes + grainDirectoryPhysicalSize
+    )
   )
-  const grainDir = new Uint32Array(grainDirBuffer)
   const cachedGrainTables = []
   for (let i = 0; i < grainDirectoryEntries; i++) {
     const grainTableAddr = grainDir[i] * SECTOR_SIZE
diff --git a/packages/xo-web/src/common/xo/index.js b/packages/xo-web/src/common/xo/index.js
index 4258bf2f3..4ab44027a 100644
--- a/packages/xo-web/src/common/xo/index.js
+++ b/packages/xo-web/src/common/xo/index.js
@@ -1373,11 +1373,15 @@ export const fetchVmStats = (vm, granularity) =>
 
 export const getVmsHaValues = () => _call('vm.getHaValues')
 
-export const importVm = (file, type = 'xva', data = undefined, sr) => {
+export const importVm = async (file, type = 'xva', data = undefined, sr) => {
   const { name } = file
 
   info(_('startVmImport'), name)
-
+  if (data !== undefined && data.tables !== undefined) {
+    for (const k in data.tables) {
+      data.tables[k] = await data.tables[k]
+    }
+  }
   return _call('vm.import', { type, data, sr: resolveId(sr) }).then(
     ({ $sendTo }) =>
       post($sendTo, file)
diff --git a/packages/xo-web/src/xo-app/vm-import/ova/index.js b/packages/xo-web/src/xo-app/vm-import/ova/index.js
index 38444c75e..8927de17e 100644
--- a/packages/xo-web/src/xo-app/vm-import/ova/index.js
+++ b/packages/xo-web/src/xo-app/vm-import/ova/index.js
@@ -217,7 +217,8 @@ async function parseTarFile(file) {
           const fileSlice = file.slice(offset, offset + header.fileSize)
           const readFile = async (start, end) =>
             readFileFragment(fileSlice, start, end)
-          data.tables[header.fileName] = await readVmdkGrainTable(readFile)
+          // storing the promise, not the value
+          data.tables[header.fileName] = readVmdkGrainTable(readFile)
         }
       }
       offset += Math.ceil(header.fileSize / 512) * 512
@@ -228,6 +229,4 @@ async function parseTarFile(file) {
   }
 }
 
-const parseOvaFile = async file => parseTarFile(file)
-
-export { parseOvaFile as default }
+export { parseTarFile as default }