Issue 7094 - Encapsulate management of subscription filters

lib/subscriptionClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 18 matching lines @@
 /**
  * Abstract base class for filter subscriptions
  *
  * @param {string} url    download location of the subscription
  * @param {string} [title]  title of the filter subscription
  * @constructor
  */
 function Subscription(url, title)
 {
   this.url = url;
-  this.filters = [];
+
+  this._filterText = [];
+  this._filters = [];
+
   if (title)
     this._title = title;
+
   Subscription.knownSubscriptions.set(url, this);
 }
 exports.Subscription = Subscription;
 
 Subscription.prototype =
 {
   /**
    * Download location of the subscription
    * @type {string}
    */
   url: null,
 
   /**
    * Type of the subscription
    * @type {?string}
    */
   type: null,
 
   /**
-   * Filters contained in the filter subscription
+   * Filter text contained in the filter subscription.
    * @type {Array.<string>}
-   */
-  filters: null,
-
-  /**
-   * A list of {@link Filter} objects associated with the subscription in some
-   * way. This is used by {@link INIParser} to temporarily cache objects
-   * corresponding to the subscription's filter text.
-   * @type {?Array.<Filter>}
-   * @package
-   */
-  filterObjects: null,
+   * @private
+   */
+  _filterText: null,

[hub, 2018/11/19 17:47:49]

shouldn't this be named `_filtersText` since it is many filters?

Also would be consistent with `_filters`

[Manish Jethani, 2018/11/20 00:19:39]

I thought about calling it _filtersText but that sounds wrong in English. Maybe
_filterTextList or _filterTextArray? Though I find it clear enough to just call
it _filterText, since text is both singular and plural and it maps nicely to the
generator function filterText()

[hub, 2018/11/20 19:30:19]

my bad. let's leave it at that.

+
+  /**
+   * {@link Filter} objects corresponding to the subscription's filter text.
+   * @type {Array.<Filter>}
+   * @private
+   */
+  _filters: null,
 
   _title: null,
   _fixedTitle: false,
   _disabled: false,
 
   /**
    * Title of the filter subscription
    * @type {string}
    */
   get title()
@@ skipping 40 matching lines @@
   },
   set disabled(value)
   {
     if (value != this._disabled)
     {
       let oldValue = this._disabled;
       this._disabled = value;
       filterNotifier.emit("subscription.disabled", this, value, oldValue);
     }
     return this._disabled;
+  },
+
+  /**
+   * The number of filters in the subscription.
+   * @type {number}
+   */
+  get filterCount()
+  {
+    return this._filters.length;
+  },
+
+  /**
+   * Yields the text for each filter in the subscription.
+   * @yields {string}
+   */
+  *filterText()
+  {
+    yield* this._filterText;
+  },
+
+  /**
+   * Yields the {@link Filter} object for each filter in the subscription.
+   * @yields {Filter}
+   */
+  *filters()
+  {
+    yield* this._filters;
+  },
+
+  /**
+   * Returns the {@link Filter} object at the given 0-based index.
+   * @param {number} index
+   * @returns {?Filter}
+   */
+  filterAt(index)
+  {
+    return this._filters[index] || null;
+  },
+
+  /**
+   * Returns the 0-based index of the given filter.
+   * @param {Filter} filter
+   * @param {number} [fromIndex] The index from which to start the search.
+   * @return {number}
+   */
+  searchFilter(filter, fromIndex = 0)
+  {
+    return this._filterText.indexOf(filter.text, fromIndex);
+  },
+
+  /**
+   * Removes all filters from the subscription.
+   */
+  clearFilters()
+  {
+    this._filterText = [];
+    this._filters = [];
+  },
+
+  /**
+   * Adds a filter to the subscription.
+   * @param {Filter} filter
+   */
+  addFilter(filter)
+  {
+    this._filterText.push(filter.text);
+    this._filters.push(filter);
+  },
+
+  /**
+   * Inserts a filter into the subscription.
+   * @param {Filter} filter
+   * @param {number} index The index at which to insert the filter.
+   */
+  insertFilterAt(filter, index)
+  {
+    this._filterText.splice(index, 0, filter.text);
+    this._filters.splice(index, 0, filter);
+  },
+
+  /**
+   * Deletes a filter from the subscription.
+   * @param {number} index The index at which to delete the filter.
+   */
+  deleteFilterAt(index)
+  {
+    // Ignore index if out of bounds on the negative side, for consistency.
+    if (index < 0)
+      return;
+
+    this._filterText.splice(index, 1);
+    this._filters.splice(index, 1);
   },
 
   /**
    * Serializes the subscription for writing out on disk.
    * @yields {string}
    */
   *serialize()
   {
     let {url, type, _title, _fixedTitle, _disabled} = this;
 
     yield "[Subscription]";
     yield "url=" + url;
 
     if (type)
       yield "type=" + type;
     if (_title)
       yield "title=" + _title;
     if (_fixedTitle)
       yield "fixedTitle=true";
     if (_disabled)
       yield "disabled=true";
   },
 
   *serializeFilters()
   {
-    let {filters} = this;
+    let {_filterText} = this;
 
     yield "[Subscription filters]";
 
-    for (let text of filters)
+    for (let text of _filterText)
       yield text.replace(/\[/g, "\\[");
   },
 
   toString()
   {
     return [...this.serialize()].join("\n");
   }
 };
 
 /**
@@ skipping 161 matching lines @@
 
 /**
  * Creates a new user-defined filter group and adds the given filter to it.
  * This group will act as the default group for this filter type.
  * @param {Filter} filter
  * @return {SpecialSubscription}
  */
 SpecialSubscription.createForFilter = function(filter)
 {
   let subscription = SpecialSubscription.create();
-  subscription.filters.push(filter.text);
+  subscription.addFilter(filter);
   for (let [type, class_] of SpecialSubscription.defaultsMap)
   {
     if (filter instanceof class_)
       subscription.defaults = [type];
   }
   if (!subscription.defaults)
     subscription.defaults = ["blocking"];
   return subscription;
 };
 
@@ skipping 235 matching lines @@
     if (errors)
       yield "errors=" + errors;
     if (version)
       yield "version=" + version;
     if (requiredVersion)
       yield "requiredVersion=" + requiredVersion;
     if (downloadCount)
       yield "downloadCount=" + downloadCount;
   }
 });