Issue 4721 - Use IndexedDB for storage in Edge

lib/io.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 const keyPrefix = "file:";
 
 function fileToKey(file)
 {
   return keyPrefix + (file instanceof FakeFile ? file.path : file.spec);
 }
 
 function loadFile(file, successCallback, errorCallback)
 {
   let key = fileToKey(file);
+
   // Make sure we do not have subscriptions in localStorage from older
   // versions first
   let entry = localStorage.getItem(key);
   if (typeof entry == "string")
   {
     try
     {
       entry = JSON.parse(entry);
     }
     catch(err) 
@@ skipping 11 matching lines @@
       errorCallback(new Error("File doesn't exist"));
     else
       successCallback(value);
   });
 }
 
 function saveFile(file, data, callback)
 {
   var key = fileToKey(file);
   var entry = {
-    lastModified: Date.now(),
-    content: Array.from(data)
+    content: Array.from(data),
+    lastModified: Date.now()
   };
 
   localStorage.removeItem(key);
   localforage.setItem(key, entry, callback);
 }
-exports.IO = {

[kzar, 2016/12/19 13:31:04]

Nit: looks like you missed this change, please could you move the { back?

+
+exports.IO =
+{
   resolveFilePath: function(path)
   {
     return new FakeFile(path);
   },
 
   readFromFile: function(file, listener, callback)
   {
     function onLoaded(entry)
     {
       if ("content" in entry)
@@ skipping 13 matching lines @@
     saveFile(file, data, callback);
   },
 
   copyFile: function(fromFile, toFile, callback)
   {
     function onLoaded(entry)
     {
       saveFile(toFile, entry.content, callback);
     }
 
-    loadFile(file, onLoaded, callback);

[kzar, 2016/12/19 13:31:04]

Seems to be a mistake? (Same below.)

[Oleksandr, 2016/12/20 00:18:28]

Yep. We don't use any of these functions anyway, so it went unnoticed. In fact
the whole storage code can be refactored now that we don't use backups.

+    loadFile(fromFile, onLoaded, callback);
   },
 
   renameFile: function(fromFile, newName, callback)
   {
     function onLoaded()
     {
       ext.storage.remove(fileToKey(fromFile), function()
       {
         ext.storage.set(keyPrefix + newName, entry, callback);
       });
     }
 
-    loadFile(file, onLoaded, callback);
+    loadFile(fromFile, onLoaded, callback);
   },
 
   removeFile: function(file, callback)
   {
     ext.storage.remove(fileToKey(file), callback);
   },
 
   statFile: function(file, callback)
   {
     function onLoaded(entry)
     {
       callback(null, {
         exists: true,
         lastModified: entry.lastModified
       });
     }
 
     loadFile(file, onLoaded, callback);
   }
 };