From b582ae8576c7180cd192415c99358fa8a71cd6f9 Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Thu, 7 Jun 2018 14:36:03 -0400
Subject: [PATCH] Skip import of missing files.

Handle the previous export failure as gracefully as we can.

Refs #2966
---
 src/content/backup/import.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/content/backup/import.js b/src/content/backup/import.js
index 7497fc6b3..de9d6f312 100644
--- a/src/content/backup/import.js
+++ b/src/content/backup/import.js
@@ -115,13 +115,21 @@ async function fillDownloaderFromZipFolder(
 
   let requires = {};
   parsedDetails.requireUrls.forEach(u => {
-    requires[u] = zip.file(urlMap[u]).async('text');
+    try {
+      requires[u] = zip.file(urlMap[u]).async('text');
+    } catch (e) {
+      console.warn('Could not load from backup zip, will attempt download:', u);
+    }
   });
   downloader.setKnownRequires(requires);
 
   let resources = {};
   Object.values(parsedDetails.resourceUrls).forEach(u => {
-    resources[u] = zip.file(urlMap[u]).async('blob');
+    try {
+      resources[u] = zip.file(urlMap[u]).async('blob');
+    } catch (e) {
+      console.warn('Could not load from backup zip, will attempt download:', u);
+    }
   });
   downloader.setKnownResources(resources);