From 75e1571b90a4ee8e428f351036d3a9c3a003791d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20R=C3=B6bert?= <dev@xn--rb-fka.it>
Date: Fri, 4 Aug 2017 03:18:16 +0200
Subject: [PATCH] test

---
 clearurls.js   | 35 ++++++++++++++++++++++++++++-------
 data/data.json |  1 +
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/clearurls.js b/clearurls.js
index 74c0e8b..25cf921 100644
--- a/clearurls.js
+++ b/clearurls.js
@@ -13,8 +13,8 @@ function fetchFromURL(url)
     }
 }
 
-var globalRules = fetchFromURL('https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/rules/rules.json');
-var globalExceptions = fetchFromURL('https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/rules/exceptions.json');
+var data = fetchFromURL('https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/data/data.json');
+var providers = [];
 // ##################################################################
 
 /*
@@ -113,9 +113,9 @@ function Provider(_name,_completeProvider=false){
  * # Amazon Provider                                                #
  * ##################################################################
  */
-var amazon = new Provider("Amazon");
-  amazon.setURLPattern('(https:\\/\\/||http:\\/\\/).*(\\.amazon\\.)\\w{2,}\\/.*');
-  amazon.setRules(globalRules);
+// var amazon = new Provider("Amazon");
+//   amazon.setURLPattern('(https:\\/\\/||http:\\/\\/).*(\\.amazon\\.)\\w{2,}\\/.*');
+//   amazon.setRules(globalRules);
   // amazon.addException('.*(amazon\\.)\\w{2,}(\\/gp\\/).*');
   // amazon.addRule('pf_rd_[a-zA-Z]=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?');
   // amazon.addRule('qid=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?');
@@ -193,6 +193,27 @@ var utm = new Provider("UTM", false);
   utm.addRule('utm_[a-zA-Z]*=.*[\\?|&]?');
 // ##################################################################
 
+function createProviders()
+{
+    for(var p = 0; p < data.providers.length; p++)
+    {
+        //Create new provider
+        providers.push(new Provider(data.providers[p],data.providers[p].completeProvider));
+
+        //Add rules to provider
+        for(var r = 0; r < data.providers[p].rules.length; r++)
+        {
+            providers[p].addRule(data.providers[p].rules[r]);
+        }
+
+        //Add exceptions to provider
+        for(var e = 0; e < data.providers[p].exceptions.length; e++)
+        {
+            providers[p].addException(data.providers[p].exceptions[e]);
+        }
+    }
+};
+
 /**
  * Helper function which remove the tracking fields
  * for each provider given as parameter.
@@ -243,8 +264,8 @@ function clearUrl(request)
         "changes": false,
         "url": ""
     };
-    var providers = [amazon, google, googlesyndication, doubleclick, utm];
-
+    // var providers = [amazon, google, googlesyndication, doubleclick, utm];
+    createProviders();
     /*
      * Call for every provider the removeFieldsFormURL method.
      */
diff --git a/data/data.json b/data/data.json
index 0dd77f4..5a0a098 100644
--- a/data/data.json
+++ b/data/data.json
@@ -2,6 +2,7 @@
     "providers": {
         "amazon": {
             "urlPattern": "",
+            "completeProvider": true,
             "rules": [
                 "pf_rd_[a-zA-Z]=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
                 "qid=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",