Issue 3716 - Split up files stored in storage.local

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
@@ skipping 41 matching lines @@
 
 exports.IO =
 {
   resolveFilePath: function(path)
   {
     return new FakeFile(path);
   },
 
   readFromFile: function(file, listener, callback)
   {
-    loadFile(file).catch(() => null)

[Sebastian Noack, 2016/04/01 10:49:44]

The logic here is wrong. In the case of readFromFile() and statFile() we have to
simply call the callback with the error, if the promise is rejected:

  loadFile(file).then(onLoaded, callback);

-                  .then(entry => 
+    function onLoaded(entry)
     {
-      if (!entry)
-        return;
       if ("content" in entry)
       {
         for (let line of entry.content)
           listener.process(line);
 
         listener.process(null);
         callback(null);
       }
       else
       {
         let keys = [];
         for (let i = 0; i < entry.chunks; i++)
           keys.push(fileToKey(file, i));
 
         ext.storage.get(keys, items =>
         {
            for (let key of keys)
              for (let line of items[key])
                listener.process(line);
 
            listener.process(null);
            callback(null);
         });
       }
-    });
+    }
+
+    loadFile(file).then(onLoaded, callback);
   },
-  

[Sebastian Noack, 2016/04/01 10:49:44]

Nit: You added trailing whitespaces to this line.

+
   writeToFile: function(file, data, callback)
   {
     let items = {};
     let entry = items[fileToKey(file)] = {lastModified: Date.now()};
 
-    if (typeof browser != "object")
+    if (typeof browser == "object")
     {
       loadFile(file).catch(() => null)
                     .then(oldEntry =>
       {
         let quota = 1024 * 1024 / 2 - 1000;
         let chunks = [];
         let chunk = [];
         let chunkSize = 0;
 
         for (let line of data)
@@ skipping 16 matching lines @@
         ext.storage.set(items, callback);
 
         if (oldEntry && "chunks" in oldEntry)
           for (let i = entry.chunks; i < oldEntry.chunks; i++)
             ext.storage.remove(fileToKey(file, i));
       });
     }
     else
     {
       entry.content = data;
-      ext.storage.set(items, callback); 

[Sebastian Noack, 2016/04/01 10:49:44]

Nit: You added trailing whitespaces to this line.

+      ext.storage.set(items, callback);
     }
   },
 
   statFile: function(file, callback)
   {
-    loadFile(file).catch((val) => null)
-                  .then(entry =>
+    function onLoaded(entry)
     {
-      if (entry)
-        callback(null, {
-          exists: true,
-          lastModified: entry.lastModified
-        });
-    });
-  },
+      callback(null, {
+        exists: true,
+        lastModified: entry.lastModified
+      });
+    }
+
+    loadFile(file).then(onLoaded, callback);
+  }
 };