Issue 4878 - Start using ESLint for adblockpluscore

lib/synchronizer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Manages synchronization of filter subscriptions.
  */
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
 const {Downloader, Downloadable,
        MILLIS_IN_SECOND, MILLIS_IN_MINUTE,
        MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
-const {Filter, CommentFilter} = require("filterClasses");
+const {Filter} = require("filterClasses");
 const {FilterStorage} = require("filterStorage");
 const {FilterNotifier} = require("filterNotifier");
 const {Prefs} = require("prefs");
 const {Subscription, DownloadableSubscription} = require("subscriptionClasses");
 const {Utils} = require("utils");
 
-let INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
-let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
-let DEFAULT_EXPIRATION_INTERVAL = 5 * MILLIS_IN_DAY;

[Wladimir Palant, 2017/03/02 14:07:06]

The values declared above are actual constants.

[kzar, 2017/03/08 12:33:54]

Done.

+const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
+const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
+const DEFAULT_EXPIRATION_INTERVAL = 5 * MILLIS_IN_DAY;
 
 /**
  * The object providing actual downloading functionality.
  * @type {Downloader}
  */
 let downloader = null;
 
 /**
  * This object is responsible for downloading filter subscriptions whenever
  * necessary.
@@ skipping 24 matching lines @@
    * @param {string} url  URL of the subscription
    * @return {boolean}
    */
   isExecuting(url)
   {
     return downloader.isDownloading(url);
   },
 
   /**
    * Starts the download of a subscription.
-   * @param {DownloadableSubscription} subscription  Subscription to be
-   *                                                 downloaded
-   * @param {boolean} manual  true for a manually started download
-   *                          (should not trigger fallback requests)

[Wladimir Palant, 2017/03/02 14:07:06]

Messy indentation here.

[kzar, 2017/03/08 12:33:53]

Done.

+   * @param {DownloadableSubscription} subscription
+   *   Subscription to be downloaded
+   * @param {boolean} manual
+   *   true for a manually started download (should not trigger fallback
+   *   requests)
    */
   execute(subscription, manual)
   {
     downloader.download(this._getDownloadable(subscription, manual));
   },
 
   /**
    * Yields Downloadable instances for all subscriptions that can be downloaded.
    */
   *_getDownloadables()
@@ skipping 237 matching lines @@
         {
           if (onShutdown.done)
             return;
 
           if (!(subscription.url in FilterStorage.knownSubscriptions))
             return;
 
           let match = /^(\d+)(?:\s+(\S+))?$/.exec(request.responseText);
           if (match && match[1] == "301" &&    // Moved permanently
               match[2] && /^https?:\/\//i.test(match[2]))
+          {
             redirectCallback(match[2]);
+          }
           else if (match && match[1] == "410") // Gone
           {
             let data = "[Adblock]\n" +
               subscription.filters.map(f => f.text).join("\n");
             redirectCallback("data:text/plain," + encodeURIComponent(data));
           }
         }, false);
         request.send(null);
       }
     }
   }
 };
 Synchronizer.init();