Issue 2040 - Replaced localStorage with chrome.storage.local

lib/storage/io.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 15 matching lines @@
     if (file instanceof FakeFile)
       return file.path;
     else if ("spec" in file)
       return file.spec;
 
     throw new Error("Unexpected file type");
   },
 
   _setFileContents: function(path, contents, lastModified)
   {
-    ext.storage[path] = contents;
-    ext.storage[path + "/lastModified"] = lastModified || 0;
+    safari.extension.settings[path] = contents;

[kzar, 2015/03/09 15:10:29]

Perhaps I'm missing something here but how come you are using
safari.extension.settings in this file? If this is all Safari specific code
shouldn't it live in safari/ext somewhere?

[Sebastian Noack, 2015/03/09 15:21:37]

This is just a temporary hack. This code will be removed with the other patch,
which unifies the IO module, to use the new asynchronous ext.storage on all
platforms. Initially this file were used for Opera as well, but now it's only
Safari.

[kzar, 2015/03/09 15:24:28]

Fair enough but in that case there should be a quick comment in this file to
explain that is the case IMO.

[Sebastian Noack, 2015/03/09 15:27:49]

Note that I'm going to push both patches together once they are reviewed. I
merely split the change, introducing this hack here, to make it easier to
review.

[kzar, 2015/03/09 15:32:54]

OK that makes more sense then, looking at the other review now.

+    safari.extension.settings[path + "/lastModified"] = lastModified || 0;
   },
 
   lineBreak: "\n",
 
   resolveFilePath: function(path)
   {
     return new FakeFile(path);
   },
 
   readFromFile: function(file, listener, callback, timeLineID)
   {
     var Utils = require("utils").Utils;
     Utils.runAsync(function()
     {
       var path = this._getFilePath(file);
-      if (!(path in ext.storage))
+      if (!(path in safari.extension.settings))
       {
         callback(new Error("File doesn't exist"))
         return;
       }
 
-      var lines = ext.storage[path].split(/[\r\n]+/);
+      var lines = safari.extension.settings[path].split(/[\r\n]+/);
       for (var i = 0; i < lines.length; i++)
         listener.process(lines[i]);
       listener.process(null);
       callback(null);
     }.bind(this));
   },
 
   writeToFile: function(file, data, callback, timeLineID)
   {
     var path = this._getFilePath(file);
@@ skipping 18 matching lines @@
       if (e)
         callback(e);
       else
         this.writeToFile(toFile, data, callback);
     }.bind(this));
   },
 
   renameFile: function(fromFile, newName, callback)
   {
     var path = this._getFilePath(fromFile);
-    if (!(path in ext.storage))
+    if (!(path in safari.extension.settings))
     {
       callback(new Error("File doesn't exist"))
       return;
     }
 
-    this._setFileContents(newName, ext.storage[path], ext.storage[path + "/lastModified"]);
+    this._setFileContents(newName, safari.extension.settings[path], safari.extension.settings[path + "/lastModified"]);
     this.removeFile(fromFile, callback);
   },
 
   removeFile: function(file, callback)
   {
     var path = this._getFilePath(file);
-    delete ext.storage[path];
-    delete ext.storage[path + "/lastModified"];
+    delete safari.extension.settings[path];
+    delete safari.extension.settings[path + "/lastModified"];
     callback(null);
   },
 
   statFile: function(file, callback)
   {
     var path = this._getFilePath(file);
 
     // This needs to use Utils.runAsync(), otherwise FilterStorage might
     // initialize too early - see #337.
     require("utils").Utils.runAsync(callback.bind(null, null, {
-      exists: path in ext.storage,
+      exists: path in safari.extension.settings,
       isDirectory: false,
       isFile: true,
-      lastModified: parseInt(ext.storage[path + "/lastModified"], 10) || 0
+      lastModified: parseInt(safari.extension.settings[path + "/lastModified"], 10) || 0
     }));
   }
 };