Issue 5562 - Move Edge storage to IndexedDB

lib/io.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 10 matching lines @@
 
 function fileToKey(fileName)
 {
   return keyPrefix + fileName;
 }
 
 function loadFile(fileName)
 {
   return new Promise((resolve, reject) =>
   {
-    let key = fileToKey(fileName);
-
-    ext.storage.get(key, items =>
+    console.trace();

[Sebastian Noack, 2017/08/24 17:11:00]

Did you forget to remove this?

[Oleksandr, 2017/08/24 17:17:04]

Whoops. Yes, sorry. Some of the refreshes before commit didn't work apparently.

+    localforage.getItem(fileToKey(fileName), (err, value) =>
     {
-      let entry = items[key];
-
-      if (entry)
-        resolve(entry);
+      if (err || value == null)
+        reject({type: "NoSuchFile"});
       else
-        reject({type: "NoSuchFile"});
+        resolve(value);
     });
   });
 }
 
 function saveFile(fileName, data)
 {
-  return new Promise((resolve, reject) =>
-  {
-    ext.storage.set(
-      fileToKey(fileName),
-      {
-        content: Array.from(data),
-        lastModified: Date.now()
-      },
-      resolve
-    );
+  let key = fileToKey(fileName);
+  return localforage.setItem(key, {
+    content: Array.from(data),
+    lastModified: Date.now()
   });
 }
 
 function removeFile(fileName)
 {
   return new Promise((resolve, reject) =>
   {
     ext.storage.remove(fileToKey(fileName), () =>
     {
       if (chrome.runtime.lastError)
@@ skipping 59 matching lines @@
    *    Name of the file to be renamed
    * @param {string} newName
    *    New file name, will be overwritten if exists
    * @return {Promise}
    *    Promise to be resolved or rejected once the operation is completed
    */
   renameFile(fromFile, newName)
   {
     return loadFile(fromFile).then(entry =>
     {
-      return new Promise((resolve, reject) =>
-      {
-        ext.storage.set(fileToKey(newName), entry, () =>
-        {
-          if (chrome.runtime.lastError)
-            reject(chrome.runtime.lastError.message);
-          else
-            resolve();
-        });
-      });
+      return saveFile(fileToKey(newName), entry);
     }).then(() => removeFile(fromFile));
   },
 
   /**
    * Removes a file.
    * @param {string} fileName
    *    Name of the file to be removed
    * @return {Promise}
    *    Promise to be resolved or rejected once the operation is completed
    */
@@ skipping 19 matching lines @@
         lastModified: entry.lastModified
       };
     }).catch(error =>
     {
       if (error.type == "NoSuchFile")
         return {exists: false};
       throw error;
     });
   }
 };