Issue 189 - Implement API changes from #117, #153, #192 in Chrome

lib/filesystem/io.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 30 matching lines @@
     }, errorCallback);
   },
 
   lineBreak: "\n",
 
   resolveFilePath: function(path)
   {
     return new FakeFile(path);
   },
 
-  readFromFile: function(file, decode, listener, callback, timeLineID)
+  readFromFile: function(file, listener, callback, timeLineID)
   {
     // Hack to allow importing old data
     if (typeof file == "string")
     {
       var Utils = require("utils").Utils;
       Utils.runAsync(function()
       {
         var lines = file.split(/[\r\n]+/);
         for (var i = 0; i < lines.length; i++)
           listener.process(lines[i]);
         listener.process(null);
         callback(null);
       }.bind(this));
       return;
     }
 
-    if ("spec" in file && /^defaults\b/.test(file.spec))
-    {
-      // Code attempts to read the default patterns.ini, we don't have that.
-      // Make sure to execute first-run actions instead.
-      var Utils = require("utils").Utils;
-      Utils.runAsync(function()
-      {
-        if (ext.storage.currentVersion)
-          seenDataCorruption = true;
-        delete ext.storage.currentVersion;
-        callback(null);
-      });
-      return;
-    }
-
     this._getFileEntry(file, false, function(fs, fileEntry)
     {
       fileEntry.file(function(file)
       {
         var reader = new FileReader();
         reader.onloadend = function()
         {
           if (reader.error)
             callback(reader.error);
           else
           {
             var lines = reader.result.split(/[\r\n]+/);
             for (var i = 0; i < lines.length; i++)
               listener.process(lines[i]);
             listener.process(null);
             callback(null);
           }
         };
         reader.readAsText(file);
       }, callback);
     }, callback);
   },
 
-  writeToFile: function(file, encode, data, callback, timeLineID)
+  writeToFile: function(file, data, callback, timeLineID)
   {
     this._getFileEntry(file, true, function(fs, fileEntry)
     {
       fileEntry.createWriter(function(writer)
       {
         var executeWriteOperation = function(op, nextOperation)
         {
           writer.onwriteend = function()
           {
             if (writer.error)
@@ skipping 25 matching lines @@
           executeWriteOperation(writer.write.bind(writer, blob), callback.bind(null, null));
         }.bind(this));
       }.bind(this), callback);
     }.bind(this), callback);
   },
 
   copyFile: function(fromFile, toFile, callback)
   {
     // Simply combine read and write operations
     var data = [];
-    this.readFromFile(fromFile, false, {
+    this.readFromFile(fromFile, {
       process: function(line)
       {
         if (line !== null)
           data.push(line);
       }
     }, function(e)
     {
       if (e)
         callback(e);
       else
-        this.writeToFile(toFile, false, data, callback);
+        this.writeToFile(toFile, data, callback);
     }.bind(this));
   },
 
   renameFile: function(fromFile, newName, callback)
   {
     this._getFileEntry(fromFile, false, function(fs, fileEntry)
     {
       fileEntry.moveTo(fs.root, newName, function()
       {
         callback(null);
@@ skipping 34 matching lines @@
         callback(null, {
           exists: true,
           isDirectory: fileEntry.isDirectory,
           isFile: fileEntry.isFile,
           lastModified: metadata.modificationTime.getTime()
         });
       }, callback);
     }, callback);
   }
 };