From 4d8974fe806f4199d26353a2911ba317b9088d1f Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 6 Apr 2018 16:02:35 -0400
Subject: [PATCH] code review: avoid redundant PSL selfie

---
 src/js/background.js | 10 +++-------
 src/js/start.js      | 45 +++++++++-----------------------------------
 src/js/storage.js    | 21 ++++++++++++++++++++-
 3 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/src/js/background.js b/src/js/background.js
index 66c843845..bf82e99f5 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -132,8 +132,8 @@ var µBlock = (function() { // jshint ignore:line
 
         // read-only
         systemSettings: {
-            compiledMagic: 'puuijtkfpspv',
-            selfieMagic: 'tuqilngsxkwo'
+            compiledMagic: 1,
+            selfieMagic: 1
         },
 
         restoreBackupSettings: {
@@ -177,11 +177,7 @@ var µBlock = (function() { // jshint ignore:line
         epickerZap: false,
         epickerEprom: null,
 
-        scriptlets: {
-        },
-
-        // so that I don't have to care for last comma
-        dummy: 0
+        scriptlets: {},
     };
 
 })();
diff --git a/src/js/start.js b/src/js/start.js
index 95444489c..19ec3d354 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -19,8 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* global publicSuffixList */
-
 'use strict';
 
 /******************************************************************************/
@@ -95,7 +93,12 @@ var onAllReady = function() {
 // - PSL
 
 var onPSLReady = function() {
-    µb.loadFilterLists(onAllReady);
+    µb.selfieManager.load(function(valid) {
+        if ( valid === true ) {
+            return onAllReady();
+        }
+        µb.loadFilterLists(onAllReady);
+    });
 };
 
 /******************************************************************************/
@@ -161,31 +164,6 @@ var onVersionReady = function(lastVersion) {
 
 /******************************************************************************/
 
-var onSelfieReady = function(selfie) {
-    if (
-        selfie instanceof Object === false ||
-        selfie.magic !== µb.systemSettings.selfieMagic
-    ) {
-        return false;
-    }
-    if ( publicSuffixList.fromSelfie(selfie.publicSuffixList) !== true ) {
-        return false;
-    }
-    if ( selfie.redirectEngine === undefined ) {
-        return false;
-    }
-
-    µb.availableFilterLists = selfie.availableFilterLists;
-    µb.staticNetFilteringEngine.fromSelfie(selfie.staticNetFilteringEngine);
-    µb.redirectEngine.fromSelfie(selfie.redirectEngine);
-    µb.staticExtFilteringEngine.fromSelfie(selfie.staticExtFilteringEngine);
-    µb.loadRedirectResources();
-
-    return true;
-};
-
-/******************************************************************************/
-
 // https://github.com/chrisaljoudi/uBlock/issues/226
 // Whitelist in memory.
 // Whitelist parser needs PSL to be ready.
@@ -243,7 +221,7 @@ var onSystemSettingsReady = function(fetched) {
     if ( mustSaveSystemSettings ) {
         fetched.selfie = null;
         µb.selfieManager.destroy();
-        vAPI.storage.set(µb.systemSettings, µb.noopFunc);
+        vAPI.storage.set(µb.systemSettings);
     }
 };
 
@@ -261,13 +239,8 @@ var onFirstFetchReady = function(fetched) {
     onNetWhitelistReady(fetched.netWhitelist);
     onVersionReady(fetched.version);
 
-    // If we have a selfie, skip loading PSL, filter lists
-    vAPI.cacheStorage.get('selfie', function(bin) {
-        if ( bin instanceof Object && onSelfieReady(bin.selfie) ) {
-            return onAllReady();
-        }
-        µb.loadPublicSuffixList(onPSLReady);
-    });
+    µb.loadPublicSuffixList(onPSLReady);
+    µb.loadRedirectResources();
 };
 
 /******************************************************************************/
diff --git a/src/js/storage.js b/src/js/storage.js
index 312dd7bb6..edaa12b21 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -1001,7 +1001,6 @@
         timer = null;
         var selfie = {
             magic: this.systemSettings.selfieMagic,
-            publicSuffixList: publicSuffixList.toSelfie(),
             availableFilterLists: this.availableFilterLists,
             staticNetFilteringEngine: this.staticNetFilteringEngine.toSelfie(),
             redirectEngine: this.redirectEngine.toSelfie(),
@@ -1010,6 +1009,25 @@
         vAPI.cacheStorage.set({ selfie: selfie });
     }.bind(µBlock);
 
+    var load = function(callback) {
+        vAPI.cacheStorage.get('selfie', function(bin) {
+            var µb = µBlock;
+            if (
+                bin instanceof Object === false ||
+                bin.selfie instanceof Object === false ||
+                bin.selfie.magic !== µb.systemSettings.selfieMagic ||
+                bin.selfie.redirectEngine === undefined
+            ) {
+                return callback(false);
+            }
+            µb.availableFilterLists = bin.selfie.availableFilterLists;
+            µb.staticNetFilteringEngine.fromSelfie(bin.selfie.staticNetFilteringEngine);
+            µb.redirectEngine.fromSelfie(bin.selfie.redirectEngine);
+            µb.staticExtFilteringEngine.fromSelfie(bin.selfie.staticExtFilteringEngine);
+            callback(true);
+        });
+    };
+
     var destroy = function() {
         if ( timer !== null ) {
             clearTimeout(timer);
@@ -1020,6 +1038,7 @@
     }.bind(µBlock);
 
     return {
+        load: load,
         destroy: destroy
     };
 })();