Merge pull request #184 from aopell/develop

Version 6.2.1

.build/build.py

@@ -8,17 +8,22 @@
 class BuildRules:
     def __init__(self, config):
         self.excluded_files = config["excluded_files"] or []
+        self.properties = config["properties"] or {}
 
 EXCLUDED_FILES = [".build", ".git", ".github", ".vscode", "SchoologyPlus.zip", "webstore-description.txt"]
 
 chrome_rules = BuildRules({
-    "excluded_files": []
+    "excluded_files": [],
+    "properties": {
+        "content_security_policy": "script-src 'self' https://ssl.google-analytics.com; object-src 'self'"
+    }
 })
 
 firefox_rules = BuildRules({
     "excluded_files": [
         "lib/js/analytics.js"
-    ]
+    ],
+    "properties": { }
 })
 
 targets = {
@@ -82,7 +87,13 @@ def copyFileOrDirectory(src, dst):
     targetManifest = copy.deepcopy(manifest)
 
     for path in rules.excluded_files:
+        print(f"Removing path {path}")
         removePathFromManifest(targetManifest, path)
+        if os.path.exists(f".build/{target}/{path}"):
+            os.remove(f".build/{target}/{path}")
+
+    print("Copying properties")
+    targetManifest.update(rules.properties)
 
     with open(f".build/{target}/manifest.json", "w") as manifestFile:
         manifestFile.write(json.dumps(targetManifest, indent=4))

js/analytics.js

@@ -24,13 +24,13 @@ var trackEvent = function (target, action, label = undefined, value = undefined)
         }
     }
 
-    chrome.storage.sync.get({ analytics: getBrowser() === "Firefox" ? "disabled" : "enabled" }, s => {
+    chrome.storage.sync.get({ analytics: getBrowser() === "Firefox" ? "disabled" : "enabled", theme: "<unset>" }, s => {
         if (s.analytics === "enabled") {
-            enableAnalytics();
+            enableAnalytics(s.theme);
         }
     });
 
-    function enableAnalytics() {
+    function enableAnalytics(selectedTheme) {
         // isogram
         let r = 'ga';
         window['GoogleAnalyticsObject'] = r;
@@ -44,7 +44,8 @@ var trackEvent = function (target, action, label = undefined, value = undefined)
         ga('set', 'checkProtocolTask', null); // Disable file protocol checking.
         ga('set', 'dimension1', chrome.runtime.getManifest().version);
         ga('set', 'dimension2', location.host);
-        ga('send', 'pageview', location.pathname + location.search);
+        ga('set', 'dimension3', selectedTheme);
+        ga('send', 'pageview', location.pathname.replace(/\/\d{3,}\b/g, "/*") + location.search);
 
         trackEvent = function (target, action, label = undefined, value = undefined) {
             ga('send', 'event', target, action, label, value);

manifest.json

@@ -8,7 +8,7 @@
             "id": "[email protected]"
         }
     },
-    "version": "6.2",
+    "version": "6.2.1",
     "icons": {
         "128": "imgs/[email protected]",
         "64": "imgs/[email protected]",
@@ -42,7 +42,7 @@
         "theme-editor.html",
         "default-icons.html"
     ],
-    "content_security_policy": "script-src 'self' https://ssl.google-analytics.com; object-src 'self'",
+    "content_security_policy": "script-src 'self'; object-src 'self'",
     "background": {
         "scripts": [
             "js/analytics.js",