Issue 5728 - Replace Services.vc.compare

lib/notification.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
  * 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 Handles notifications.
  */
 
 const {Prefs} = require("prefs");
 const {Downloader, Downloadable,
        MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 const {Utils} = require("utils");
 const {Matcher, defaultMatcher} = require("matcher");
 const {Filter, RegExpFilter, WhitelistFilter} = require("filterClasses");
-const {compareVersion} = require("coreUtils");
 
 const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
 const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
 const EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
 const TYPE = {
   information: 0,
   question: 1,
   relentless: 2,
   critical: 3
 };
@@ skipping 18 matching lines @@
 {
   if (locale in translations)
     return translations[locale];
 
   let languagePart = locale.substring(0, locale.indexOf("-"));
   if (languagePart && languagePart in translations)
     return translations[languagePart];
 
   let defaultLocale = "en-US";
   return translations[defaultLocale];
+}
+
+function parseVersionComponent(comp)
+{
+  if (comp == "*")
+    return Infinity;
+  return parseInt(comp, 10) || 0;
+}
+
+function compareVersion(v1, v2)
+{
+  let regexp = /^(.*?)([a-z].*)?$/i;
+  let [, head1, tail1] = regexp.exec(v1);
+  let [, head2, tail2] = regexp.exec(v2);
+  let components1 = head1.split(".");
+  let components2 = head2.split(".");
+
+  for (let i = 0; i < components1.length ||
+                  i < components2.length; i++)
+  {
+    let result = parseVersionComponent(components1[i]) -
+                 parseVersionComponent(components2[i]) || 0;
+
+    if (result != 0)
+      return result;
+  }
+
+  // Compare version suffix (e.g. 0.1alpha < 0.1b1 < 01.b2 < 0.1).
+  // However, note that this is a simple string comparision, meaning: b10 < b2
+  if (tail1 == tail2)
+    return 0;
+  if (!tail1 || tail2 && tail1 > tail2)
+    return 1;
+  return -1;
 }
 
 /**
  * The object providing actual downloading functionality.
  * @type {Downloader}
  */
 let downloader = null;
 let localData = [];
 
 /**
@@ skipping 401 matching lines @@
     else if (index != -1 && forceValue !== true)
       categories.splice(index, 1);
 
     // HACK: JSON values aren't saved unless they are assigned a
     // different object.
     Prefs.notifications_ignoredcategories =
       JSON.parse(JSON.stringify(categories));
   }
 };
 Notification.init();