this fixes #218 and more

Author: gorhill

js/background.js

@@ -19,6 +19,8 @@
     Home: https://github.com/gorhill/httpswitchboard
 */
 
+/* global chrome */
+
 /******************************************************************************/
 
 var HTTPSB = {
@@ -67,47 +69,9 @@ var HTTPSB = {
         'assets/user/ubiquitous-blacklisted-hosts.txt': {},
 
         // HTTPSB
-        'assets/httpsb/blacklist.txt': {},
-
-        // Third parties
-
-        // Various
-        'assets/thirdparties/mirror1.malwaredomains.com/files/immortal_domains.txt': {},
-        'assets/thirdparties/mirror1.malwaredomains.com/files/justdomains': {},
-        'assets/thirdparties/pgl.yoyo.org/as/serverlist': {},
-        'assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt': {},
-        'assets/thirdparties/hosts-file.net/ad-servers': {},
-        'assets/thirdparties/someonewhocares.org/hosts/hosts': {},
-
-        // Various
-        'assets/thirdparties/winhelp2002.mvps.org/hosts.txt': {},
-
-        // From here on, any new list is 'off' by default
-        // Adblock Plus
-        'assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt': {},
-        'assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt': {},
-        'assets/thirdparties/easylist-downloads.adblockplus.org/fanboy-annoyance.txt': { off: true },
-
-        // Fanboy
-        'assets/thirdparties/www.fanboy.co.nz/enhancedstats.txt': { off: true },
-
-        'assets/thirdparties/easylist-downloads.adblockplus.org/easylistgermany.txt': { off: true },
-        'assets/thirdparties/easylist-downloads.adblockplus.org/easylistitaly.txt': { off: true },
-        'assets/thirdparties/easylist-downloads.adblockplus.org/easylistdutch.txt': { off: true },
-        'assets/thirdparties/easylist-downloads.adblockplus.org/liste_fr.txt': { off: true },
-        'assets/thirdparties/easylist-downloads.adblockplus.org/advblock.txt': { off: true },
-        'assets/thirdparties/easylist-downloads.adblockplus.org/easylistchina.txt': { off: true },
-        'assets/thirdparties/adblock-chinalist.googlecode.com/svn/trunk/adblock.txt': { off: true },
-        'assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt': { off: true },
-        'assets/thirdparties/stanev.org/abp/adblock_bg.txt': { off: true },
-        'assets/thirdparties/indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt': { off: true },
-        'assets/thirdparties/liste-ar-adblock.googlecode.com/hg/Liste_AR.txt': { off: true },
-        'assets/thirdparties/adblock-czechoslovaklist.googlecode.com/svn/filters.txt': { off: true },
-         // 'assets/thirdparties/gitorious.org/adblock-latvian/adblock-latvian/raw/5f5fc83eb1a2d0e97df9a5c382febaa651511757%3Alists/latvian-list.txt': { off: true },
-        'assets/thirdparties/raw.github.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt': { off: true },
-        'assets/thirdparties/download.wiltteri.net/wiltteri.txt': { off: true },
-
-        'assets/thirdparties/hosts-file.net/hosts.txt': { off: true }
+        'assets/httpsb/blacklist.txt': { title: 'HTTP Switchboard' },
+        
+        // 3rd-party lists now fetched dynamically
         },
 
     // urls stats are kept on the back burner while waiting to be reactivated

js/storage.js

@@ -212,8 +212,14 @@ HTTPSB.loadUbiquitousBlacklists = function() {
         }
         if ( details.what === 'mergeUbiquitousBlacklist' ) {
             mergeBlacklist(details);
+            return;
+        }
+        if ( details.what === 'listOfBlockListsLoaded' ) {
+            onListOfBlockListsLoaded(details);
+            return;
         }
     };
+    chrome.runtime.onMessage.addListener(onMessageHandler);
 
     var removeObsoleteBlacklistsHandler = function(store) {
         if ( !store.remoteBlacklists ) {
@@ -271,22 +277,18 @@ HTTPSB.loadUbiquitousBlacklists = function() {
         // Load each preset blacklist which is not disabled.
         var location;
         while ( location = blacklistLocations.pop() ) {
-            // rhill 2014-01-24: HTTPSB-maintained lists sit now in their
-            // own directory, "asset/httpsb/". Ensure smooth transition.
-            // TODO: Remove this code when everybody upgraded beyond 0.7.7.1
-            if ( location === 'assets/httpsb-blacklist.txt' && store.remoteBlacklists[location].off === true ) {
-                // In case it was already processed
-                httpsb.remoteBlacklists['assets/httpsb/blacklist.txt'].off = true;
-                // In case it was not yet processed
-                store.remoteBlacklists['assets/httpsb/blacklist.txt'].off = true;
-            }
             // If loaded list location is not part of default list locations,
             // remove its entry from local storage.
             if ( !httpsb.remoteBlacklists[location] ) {
                 obsoleteBlacklists.push(location);
                 blacklistLoadCount -= 1;
                 continue;
             }
+            // https://github.com/gorhill/httpswitchboard/issues/218
+            // Transfer potentially existing list title into restored list data.
+            if ( store.remoteBlacklists[location].title !== httpsb.remoteBlacklists[location].title ) {
+                store.remoteBlacklists[location].title = httpsb.remoteBlacklists[location].title;
+            }
             // Store details of this preset blacklist
             httpsb.remoteBlacklists[location] = store.remoteBlacklists[location];
             // rhill 2013-12-09:
@@ -300,13 +302,32 @@ HTTPSB.loadUbiquitousBlacklists = function() {
         }
     };
 
-    chrome.runtime.onMessage.addListener(onMessageHandler);
+    var onListOfBlockListsLoaded = function(details) {
+        var httpsb = HTTPSB;
+        // Initialize built-in list of 3rd-party block lists.
+        var lists = JSON.parse(details.content);
+        for ( var location in lists ) {
+            if ( lists.hasOwnProperty(location) === false ) {
+                continue;
+            }
+            httpsb.remoteBlacklists['assets/thirdparties/' + location] = lists[location];
+        }
+        // Now get user's selection of list of block lists.
+        chrome.storage.local.get(
+            { 'remoteBlacklists': httpsb.remoteBlacklists },
+            loadBlacklistsStart
+        );
+    };
 
-    // Get remote blacklist data (which may be saved locally).
-    chrome.storage.local.get(
-        { 'remoteBlacklists': this.remoteBlacklists },
-        loadBlacklistsStart
-    );
+    // Reset list of 3rd-party block lists.
+    for ( var location in this.remoteBlacklists ) {
+        if ( location.indexOf('assets/thirdparties/') === 0 ) {
+            delete this.remoteBlacklists[location];
+        }
+    }
+
+    // Get new list of 3rd-party block lists.
+    this.assets.get('assets/httpsb/ubiquitous-block-lists.json', 'listOfBlockListsLoaded');
 };
 
 /******************************************************************************/

js/ubiquitous-rules.js

@@ -19,6 +19,8 @@
     Home: https://github.com/gorhill/httpswitchboard
 */
 
+/* global chrome, $ */
+
 /******************************************************************************/
 
 (function() {
@@ -74,27 +76,46 @@ function renderBlacklists() {
             .replace('{{ubiquitousBlacklistCount}}', renderNumber(httpsb.ubiquitousBlacklist.count))
     );
 
+    // Assemble a pretty blacklist name if possible
+    var prettifyListName = function(blacklistTitle, blacklistHref) {
+        if ( !blacklistTitle ) {
+            return blacklistHref;
+        }
+        if ( blacklistHref.indexOf('assets/thirdparties/') !== 0 ) {
+            return blacklistTitle;
+        }
+        var matches = blacklistHref.match(/^assets\/thirdparties\/([^\/]+)/);
+        if ( matches === null || matches.length !== 2 ) {
+            return blacklistTitle;
+        }
+        var domain = httpsb.URI.domainFromHostname(matches[1]);
+        if ( domain === '' ) {
+            return blacklistTitle;
+        }
+        return blacklistTitle + ' <i>(' + domain + ')</i>';
+    };
+
     var blacklists = httpsb.remoteBlacklists;
     var ul = $('#blacklists');
     var keys = Object.keys(blacklists);
     var i = keys.length;
-    var blacklist, blacklistName;
+    var blacklist, blacklistHref;
     var liTemplate = $('#blacklistTemplate .blacklistDetails').first();
     var li, child, text;
     while ( i-- ) {
-        blacklistName = keys[i];
-        blacklist = blacklists[blacklistName];
+        blacklistHref = keys[i];
+        blacklist = blacklists[blacklistHref];
         li = liTemplate.clone();
         child = $('input', li);
         child.prop('checked', !blacklist.off);
         child = $('a', li);
         // Special rendering: user list
-        if ( blacklistName === httpsb.userBlacklistPath ) {
+        if ( blacklistHref === httpsb.userBlacklistPath ) {
             child.attr('href', userListHref);
             child.text($(userListHref).text());
         } else {
-            child.attr('href', encodeURI(blacklistName));
-            child.text(blacklistName);
+            child.attr('href', encodeURI(blacklistHref));
+            child.html(prettifyListName(blacklist.title, blacklistHref));
         }
         child = $('span', li);
         text = child.text()

manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extName__",
     "short_name": "HTTPSB",
-    "version": "0.9.5.5",
+    "version": "0.9.5.6",
     "description": "__MSG_extShortDesc__",
     "icons": {
         "16": "icon_16.png",

ubiquitous-rules.html

@@ -20,7 +20,7 @@
     margin: 0 0 0 1em;
     }
 .dim {
-    color: #888;
+    color: #444;
     }
 .userUbiquitousHosts {
     font-size: smaller;