Issue 7094 - Keep subscription filters by text only

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 20 matching lines @@
  *
  * @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._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,
 
   /**
    * Filter text contained in the filter subscription.
    * @type {Array.<string>}
    * @private
    */
   _filterText: null,
 
-  /**
-   * {@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 47 matching lines @@
     }
     return this._disabled;
   },
 
   /**
    * The number of filters in the subscription.
    * @type {number}
    */
   get filterCount()
   {
-    return this._filters.length;
+    return this._filterText.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.
+   * Returns the filter text at the given 0-based index.
    * @param {number} index
    * @returns {?Filter}
    */
-  filterAt(index)
+  filterTextAt(index)
   {
-    return this._filters[index] || null;
+    return this._filterText[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);
+  },
+
+  /**
+   * Adds a filter to the subscription.
+   * @param {string} filterText
+   */
+  addFilterText(filterText)
+  {
+    this._filterText.push(filterText);
   },
 
   /**
    * 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;
 
@@ skipping 447 matching lines @@
     if (errors)
       yield "errors=" + errors;
     if (version)
       yield "version=" + version;
     if (requiredVersion)
       yield "requiredVersion=" + requiredVersion;
     if (downloadCount)
       yield "downloadCount=" + downloadCount;
   }
 });