Factorise read()ing

pde · pde · commit da001dedf3fc · 2014-03-21T18:00:45.000-07:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -241,11 +241,10 @@ const RuleWriter = {
     return rv;
   },
 
-  read: function(file, rule_store, ruleset_id) {
+ 
+  read: function(file) {
     if (!file.exists())
       return null;
-    if ((rule_store.targets == null) && (rule_store.targets != {}))
-      this.log(WARN, "TARGETS IS NULL");
     var data = "";
     var fstream = CC["@mozilla.org/network/file-input-stream;1"]
         .createInstance(CI.nsIFileInputStream);
@@ -262,6 +261,14 @@ const RuleWriter = {
 
     sstream.close();
     fstream.close();
+    return data;
+  },
+
+  rulesetFromFile: function(file, rule_store, ruleset_id) {
+    if ((rule_store.targets == null) && (rule_store.targets != {}))
+      this.log(WARN, "TARGETS IS NULL");
+    var data = this.read(file);
+    if (!data) return null;
     return this.readFromString(data, rule_store, ruleset_id);
   },
 
