Issue 7016 - Convert serialization functions into generators

lib/filterStorage.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 441 matching lines @@
             subscription.filters.length == 0))
       {
         subscriptions.push(subscription);
       }
     }
 
     yield "# Adblock Plus preferences";
     yield "version=" + formatVersion;
 
     let saved = new Set();
-    let buf = [];
 
     // Save subscriptions
     for (let subscription of subscriptions)
     {
-      yield "";
+      yield* subscription.serialize();
 
-      subscription.serialize(buf);
       if (subscription.filters.length)
       {
-        buf.push("", "[Subscription filters]");
-        subscription.serializeFilters(buf);
+        yield "[Subscription filters]";

[Manish Jethani, 2018/10/21 21:51:43]

We could actually move this line into serializeFilters so the function could
look like this:

  *serializeFilters()
  { 
    yield "[Subscription filters]";

    for (let filter of this.filters)
      yield filter.text.replace(/\[/g, "\\[");
  }

And there's no need to check that the list is non-empty above, we're already
filtering out empty special subscriptions, and it's harmless to have a
"[Subscription filters]" section with no filters (besides because of the async
nature of this now we can't really guarantee that the list will be non-empty,
even if we first check that it's non-empty).

[Jon Sonesen, 2018/10/22 19:27:47]

Yeah I will move it.

+        yield* subscription.serializeFilters();
       }
-      for (let line of buf)
-        yield line;
-      buf.splice(0);
     }
 
     // Save filter data
     for (let subscription of subscriptions)
     {
       for (let filter of subscription.filters)
       {
         if (!saved.has(filter.text))
         {
-          filter.serialize(buf);
+          yield* filter.serialize();
           saved.add(filter.text);
-          for (let line of buf)
-            yield line;
-          buf.splice(0);
         }
       }
     }
   },
 
   /**
    * Will be set to true if saveToDisk() is running (reentrance protection).
    * @type {boolean}
    */
   _saving: false,
@@ skipping 152 matching lines @@
  * @param {Subscription} subscription filter subscription to be removed
  */
 function removeSubscriptionFilters(subscription)
 {
   if (!FilterStorage.knownSubscriptions.has(subscription.url))
     return;
 
   for (let filter of subscription.filters)
     filter.removeSubscription(subscription);
 }