TextPatterMatcher renamed to TextRegexpMatcher

I even had a spell error

Author: Xenofex

lib/matchers.js

@@ -17,7 +17,7 @@ Matcher.parse = function parse(filterRule) {
     } else if (stringStartsWith(filterRule, '|')) {
         return new PrefixMatcher(filterRule.substring(1));
     } else {
-        return new TextPatterMatcher(filterRule);
+        return new TextRegexpMatcher(filterRule);
     }
 };
 
@@ -45,7 +45,7 @@ let DomainNameMatcher = Class({
     }
 });
 
-let TextPatterMatcher = Class({
+let TextRegexpMatcher = Class({
     extends: Matcher,
 
     initialize: function initialize(expression) {
@@ -75,4 +75,4 @@ let TextPatterMatcher = Class({
 exports.Matcher = Matcher;
 exports.PrefixMatcher = PrefixMatcher;
 exports.DomainNameMatcher = DomainNameMatcher;
-exports.TextPatterMatcher = TextPatterMatcher;
+exports.TextRegexpMatcher = TextRegexpMatcher;

lib/proxy.js

@@ -85,13 +85,13 @@ function applyFilter(proxyService, uri, proxyInfo) {
         }
 
         if (matchesAnyIn(parsedRules.whiteList, uri, allDomains)) {
-            console.log(uri.spec, ' matched whiteList');
+            console.log(uri.spec + ' matched whiteList');
             return proxyInfo;
         } else if (matchesAnyIn(parsedRules.proxyList, uri, allDomains)) {
-            console.log(uri.spec, ' matched proxyList');
+            console.log(uri.spec + ' matched proxyList');
             return defaultProxy;
         } else {
-            console.log(uri.spec, ' matched nothing');
+            console.log(uri.spec + ' matched nothing');
             return proxyInfo;
         }
     } else { // Proxy Off
@@ -104,7 +104,10 @@ var AutoProxyPlusFilter = Class({
     interfaces: [ 'nsIProtocolProxyFilter' ],
     applyFilter: function(proxyService, uri, proxyInfo) {
         var ret = applyFilter(proxyService, uri, proxyInfo);
-        console.log(ret);
+
+        if (ret) {
+            console.log(uri.spec + " [proxy: " + ret.type + '://' + ret.host + ':' + ret.port + ']');
+        }
 
         return ret;
     }

lib/proxy_rule.js

@@ -1,7 +1,7 @@
 let ss = require('sdk/simple-storage');
 let { Class } = require('sdk/core/heritage');
 const { EventTarget } = require("sdk/event/target");
-let { Matcher, PrefixMatcher, DomainNameMatcher, TextPatterMatcher } = require('./matchers');
+let { Matcher, PrefixMatcher, DomainNameMatcher, TextRegexpMatcher } = require('./matchers');
 let { on, once, off, emit } = require('sdk/event/core');
 
 if (!ss.storage.userProxyRules) {
@@ -63,7 +63,7 @@ ProxyRule.prototype.toMatcher = function() {
     } else if (this.type == 'prefix') {
         return new PrefixMatcher(this.expression);
     } else if (this.type == 'expression') {
-        return new TextPatterMatcher(this.expression);
+        return new TextRegexpMatcher(this.expression);
     } else {
         return undefined;
     }

lib/proxy_rules_subscription.js

@@ -1,6 +1,6 @@
 let { domainOf, allDomainsOf } = require('./domain_utils');
 let { stringStartsWith } = require('./utils');
-let { Matcher, PrefixMatcher, DomainNameMatcher, TextPatterMatcher } = require('./matchers');
+let { Matcher, PrefixMatcher, DomainNameMatcher, TextRegexpMatcher } = require('./matchers');
 let XMLHttpRequest = require('sdk/net/xhr').XMLHttpRequest;
 let base64 = require("sdk/base64");
 let sp = require("sdk/simple-prefs");
@@ -71,7 +71,7 @@ function parseGfwList(gfwlist) {
         }
 
 
-        if (matcher instanceof TextPatterMatcher) {
+        if (matcher instanceof TextRegexpMatcher) {
             if (matcher.isRegex()) {
                 addValueToKey(toList, DEFAULT, matcher);
             } else {

test/test-matchers.js

@@ -1,8 +1,8 @@
-let { Matcher, PrefixMatcher, DomainNameMatcher, TextPatterMatcher } = require('./matchers');
+let { Matcher, PrefixMatcher, DomainNameMatcher, TextRegexpMatcher } = require('./matchers');
 
 exports['test Matcher parsing'] = function(assert) {
-    assert.ok(Matcher.parse("alliance.org.hk") instanceof TextPatterMatcher);
-    assert.ok(Matcher.parse(".allinfa.com") instanceof TextPatterMatcher);
+    assert.ok(Matcher.parse("alliance.org.hk") instanceof TextRegexpMatcher);
+    assert.ok(Matcher.parse(".allinfa.com") instanceof TextRegexpMatcher);
     assert.ok(Matcher.parse("|http://allinfa.com") instanceof PrefixMatcher);
     assert.ok(Matcher.parse("||allinfo.com") instanceof DomainNameMatcher);