From e8d6c71ee96a96230aadd5504e3f312774896920 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Fri, 11 Jun 2010 21:49:43 +0200 Subject: More cleanup to make a simple reproducer --- lib/bzpage.js | 16 +--- lib/color.js | 236 ------------------------------------------------ lib/logger.js | 4 - lib/old-main.js | 106 ---------------------- lib/puvodni/color.js | 236 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/puvodni/old-main.js | 106 ++++++++++++++++++++++ lib/puvodni/xmlrpc.js | 168 ++++++++++++++++++++++++++++++++++ lib/rhbzpage.js | 19 +--- lib/util.js | 109 ---------------------- lib/xmlrpc.js | 168 ---------------------------------- 10 files changed, 516 insertions(+), 652 deletions(-) delete mode 100644 lib/color.js delete mode 100644 lib/old-main.js create mode 100644 lib/puvodni/color.js create mode 100644 lib/puvodni/old-main.js create mode 100644 lib/puvodni/xmlrpc.js delete mode 100644 lib/xmlrpc.js diff --git a/lib/bzpage.js b/lib/bzpage.js index d150031..8395ba9 100644 --- a/lib/bzpage.js +++ b/lib/bzpage.js @@ -5,12 +5,6 @@ "use strict"; var util = require("util"); var simpleStorage = require("simple-storage"); -var Color = require("color").Color; - -var TriagedDistro = 13; -var NumberOfFrames = 7; -var XMLRPCurl = "https://bugzilla.redhat.com/xmlrpc.cgi"; -var bugURL = "https://bugzilla.redhat.com/show_bug.cgi?id="; // ==================================================================================== // BZPage's methods @@ -18,16 +12,12 @@ var bugURL = "https://bugzilla.redhat.com/show_bug.cgi?id="; var BZPage = exports.BZPage = function BZPage(doc, config) { console.log("doc = " + doc.title); console.log("config = " + config); - // constants - this.SalmonPink = new Color(255, 224, 176); // RGB 255, 224, 176; HSL 36, 2, - // 85 - this.ReporterColor = new Color(255, 255, 166); // RGB 255, 255, 166; HSL 60, 2, - // 83 + // initialize dynamic properties - this.doc = doc; + this.doc = doc; console.log("Now we are inside!"); }; BZPage.prototype.getBugId = function getBugId () { return util.getBugNo(this.doc.location.href); -}; \ No newline at end of file +}; diff --git a/lib/color.js b/lib/color.js deleted file mode 100644 index 2da2fa7..0000000 --- a/lib/color.js +++ /dev/null @@ -1,236 +0,0 @@ -// Released under the MIT/X11 license -// http://www.opensource.org/licenses/mit-license.php -"use strict"; -// ============================================================================ -// Color management methods -// originally from -// http://www.mjijackson.com/2008/02\ -// /rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript -var Color = exports.Color = function Color(r, g, b) { - this.Luminosity = 0.85; - this.Desaturated = 0.4; - - if (r instanceof Array) { - this.r = r[0]; - this.g = r[1]; - this.b = r[2]; - } else { - this.r = r; - this.g = g; - this.b = b; - } -} - -Color.prototype.update = function(r, g, b) { - this.r = r; - this.g = g; - this.b = b; -}; - -Color.prototype.hs = function(nStr) { - if (Number(nStr) === 0) { - return "00"; - } else if (nStr.length < 2) { - return "0" + nStr; - } else { - return nStr; - } -}; - -Color.prototype.toString = function() { - let rH = Number(this.r.toFixed()).toString(16); - let gH = Number(this.g.toFixed()).toString(16); - let bH = Number(this.b.toFixed()).toString(16); - return "#" + this.hs(rH) + this.hs(gH) + this.hs(bH); -}; - -/** - * Converts an RGB color value to HSL. Conversion formula adapted from - * http://en.wikipedia.org/wiki/HSL_color_space. Assumes r, g, and b are - * contained in the set [0, 255] and returns h, s, and l in the set [0, 1].4343 - * - * @param Number r The red color value - * @param Number g The green color value - * @param Number b The blue color value - * @return Array The HSL representation - */ -Color.prototype.hsl = function() { - let r = this.r / 255; - let g = this.g / 255; - let b = this.b / 255; - let max = Math.max(r, g, b), min = Math.min(r, g, b); - let h, s, l = (max + min) / 2; - - if (max === min) { - h = s = 0; // achromatic - } else { - let d = max - min; - s = l > 0.5 ? d / (2 - max - min) : d / (max + min); - switch (max) { - case r: - h = (g - b) / d + (g < b ? 6 : 0); - break; - case g: - h = (b - r) / d + 2; - break; - case b: - h = (r - g) / d + 4; - break; - } - h /= 6; - } - - return [ h, s, l ]; -}; - -/** - * Converts an HSL color value to RGB. Conversion formula adapted from - * http://en.wikipedia.org/wiki/HSL_color_space. Assumes h, s, and l are - * contained in the set [0, 1] and returns r, g, and b in the set [0, 255]. - * - * @param Number h The hue - * @param Number s The saturation - * @param Number l The lightness - * @return Array The RGB representation - */ -Color.prototype.hslToRgb = function(h, s, l) { - function hue2rgb(p, q, t) { - if (t < 0) { - t += 1; - } - if (t > 1) { - t -= 1; - } - if (t < 1 / 6) { - return p + (q - p) * 6 * t; - } - if (t < 1 / 2) { - return q; - } - if (t < 2 / 3) { - return p + (q - p) * (2 / 3 - t) * 6; - } - return p; - } - - let r, g, b; - - if (s === 0) { - r = g = b = l; // achromatic - } else { - let q = l < 0.5 ? l * (1 + s) : l + s - l * s; - let p = 2 * l - q; - r = hue2rgb(p, q, h + 1 / 3); - g = hue2rgb(p, q, h); - b = hue2rgb(p, q, h - 1 / 3); - } - - return [ r * 255, g * 255, b * 255 ]; -}; - -/** - * Converts an RGB color value to HSV. Conversion formula adapted from - * http://en.wikipedia.org/wiki/HSV_color_space. Assumes r, g, and b are - * contained in the set [0, 255] and returns h, s, and v in the set [0, 1]. - * - * @param Number r The red color value - * @param Number g The green color value - * @param Number b The blue color value - * @return Array The HSV representation - */ -Color.prototype.hsv = function() { - let r = this.r / 255; - let g = this.g / 255; - let b = this.b / 255; - let max = Math.max(r, g, b), min = Math.min(r, g, b); - let h, s, v = max; - - let d = max - min; - s = max === 0 ? 0 : d / max; - - if (max === min) { - h = 0; // achromatic - } else { - switch (max) { - case r: - h = (g - b) / d + (g < b ? 6 : 0); - break; - case g: - h = (b - r) / d + 2; - break; - case b: - h = (r - g) / d + 4; - break; - } - h /= 6; - } - - return [ h, s, v ]; -}; - -/** - * Converts an HSV color value to RGB. Conversion formula adapted from - * http://en.wikipedia.org/wiki/HSV_color_space. Assumes h, s, and v are - * contained in the set [0, 1] and returns r, g, and b in the set [0, 255]. - * - * @param Number h The hue - * @param Number s The saturation - * @param Number v The value - * @return Array The RGB representation - */ -Color.prototype.hsvToRgb = function(h, s, v) { - let r, g, b; - - let i = Math.floor(h * 6); - let f = h * 6 - i; - let p = v * (1 - s); - let q = v * (1 - f * s); - let t = v * (1 - (1 - f) * s); - - switch (i % 6) { - case 0: - r = v; - g = t; - b = p; - break; - case 1: - r = q; - g = v; - b = p; - break; - case 2: - r = p; - g = v; - b = t; - break; - case 3: - r = p; - g = q; - b = v; - break; - case 4: - r = t; - g = p; - b = v; - break; - case 5: - r = v; - g = p; - b = q; - break; - } - - return [ r * 255, g * 255, b * 255 ]; -}; - -/** - * Provide - */ -Color.prototype.lightColor = function() { - let hslArray = this.hsl(); - let h = Number(hslArray[0]); - let s = Number(hslArray[1]) * this.Desaturated; - let l = this.Luminosity; - let desA = this.hslToRgb(h, s, l); - return new Color(desA[0], desA[1], desA[2]); -}; diff --git a/lib/logger.js b/lib/logger.js index 702465a..cc3f213 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -3,11 +3,8 @@ "use strict"; var urlMod = require("url"); var urilMod = require("util"); -var Color = require("color").Color; var Logger = exports.Logger = function Logger(store, abbsMap) { - this.EmptyLogsColor = new Color(0, 255, 0); - this.FullLogsColor = new Color(0, 40, 103); this.store = store; this.abbsMap = abbsMap; @@ -27,7 +24,6 @@ Logger.prototype.addLogRecord = function(that) { + urlMod.parse(rec.url).host + "+" + that.bugNo; let clearLogAElem = that.doc.getElementById("clearLogs"); - clearLogAElem.style.color = this.FullLogsColor; clearLogAElem.style.fontWeight = "bolder"; if (this.store[recKey]) { this.store[recKey].comment += "
\n" + comment; diff --git a/lib/old-main.js b/lib/old-main.js deleted file mode 100644 index db81448..0000000 --- a/lib/old-main.js +++ /dev/null @@ -1,106 +0,0 @@ -/*jslint onevar: false, browser: true, evil: true, laxbreak: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, maxerr: 1000, immed: false, white: false, plusplus: false, regexp: false, undef: false */ -/*global jetpack */ -// Released under the MIT/X11 license -// http://www.opensource.org/licenses/mit-license.php -// -// Links to read through -// http://ehsanakhgari.org/blog/2010-01-07/bugzilla-tweaks-enhanced -// http://hg.mozilla.org/users/ehsan.akhgari_gmail.com/extensions/file/tip/bugzillatweaks -// http://hg.mozilla.org/users/ehsan.akhgari_gmail.com/extensions/file/ecfa0f028b81/bugzillatweaks/lib/main.js -// http://hg.mozilla.org/users/avarma_mozilla.com/atul-packages/file/42ac1e99a107/packages\ -// /facebook-acquaintances/lib/main.js#l11 -// http://ehsanakhgari.org/blog/2010-05-31/my-experience-jetpack-sdk#comment-1253 -// -"use strict"; -var util = require("util"); -var logger = require("logger"); -var file = require("file"); -var myStorage = require("simple-storage").storage; - -var TriagedDistro = 13; -var NumberOfFrames = 7; -var XMLRPCurl = "https://bugzilla.redhat.com/xmlrpc.cgi"; - -let config = {}; -config.matches = [ - "https://bugzilla.redhat.com/show_bug.cgi", - "https://bugzilla.mozilla.org/show_bug.cgi" -]; - - -// ============================================================== -// https://wiki.mozilla.org/Labs/Jetpack/JEP/24 -var manifest = { - settings : [ - { - name : "BZpassword", - type : "password", - label : "Bugzilla password" - }, - { - name : "JSONURL", - type : "text", - label : "Configuration file URL", - "default" : "http://mcepl.fedorapeople.org/scripts/BugZappers_data.json" - }, - { - name : "enabledPacks", - type : "text", - label : "comment packs which should be enabled", - "default" : "" - } - ] -}; -jetpack.future.import("storage.settings"); - -// ///////////////////////////////////////////////////////////////////////////// -function isOurPage(window) { - if ("window" in window) { - window = window.window; - } - - if (window.location.protocol == "https:") { - // like ["name1": "url1", "name2":"url2"] - // FIXME the real name of bugzillaPageModLocation array - for (var loc in bugzillaPageModLocation) { - if (bugzillaPageModLocation[loc].test(window.location.href)) { - return true; - } - } - } - // we haven't found a conforming bugzilla - return false; -} - - -function initialize() { - -} - -util.loadJSON(jetpack.storage.settings.JSONURL, function(parsedData) { - config.gJSONData = parsedData; - - // Get card translation table - let keys = ""; - for (let key in config.gJSONData) { - keys += key + " "; - } - if ("PCIIDsURL" in config.gJSONData.configData) { - util.loadJSON(config.gJSONData.configData.PCIIDsURL, function(response) { - config.PCI_ID_Array = response; - }); - } - - config.logger = new logger.Logger(myStorage.logs, - config.gJSONData.constantData.bugzillalabelAbbreviations); - - let callback = function(doc) { - if (config.gJSONData.configData.objectStyle = "RH") { - let curPage = new RHBugzillaPage(doc); - } else if (config.gJSONData.configData.objectStyle = "MoFo") { - let curPage = new MozillaBugzilla(doc); - } - }; - - jetpack.pageMods.add(callback, config); -}, this); diff --git a/lib/puvodni/color.js b/lib/puvodni/color.js new file mode 100644 index 0000000..2da2fa7 --- /dev/null +++ b/lib/puvodni/color.js @@ -0,0 +1,236 @@ +// Released under the MIT/X11 license +// http://www.opensource.org/licenses/mit-license.php +"use strict"; +// ============================================================================ +// Color management methods +// originally from +// http://www.mjijackson.com/2008/02\ +// /rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript +var Color = exports.Color = function Color(r, g, b) { + this.Luminosity = 0.85; + this.Desaturated = 0.4; + + if (r instanceof Array) { + this.r = r[0]; + this.g = r[1]; + this.b = r[2]; + } else { + this.r = r; + this.g = g; + this.b = b; + } +} + +Color.prototype.update = function(r, g, b) { + this.r = r; + this.g = g; + this.b = b; +}; + +Color.prototype.hs = function(nStr) { + if (Number(nStr) === 0) { + return "00"; + } else if (nStr.length < 2) { + return "0" + nStr; + } else { + return nStr; + } +}; + +Color.prototype.toString = function() { + let rH = Number(this.r.toFixed()).toString(16); + let gH = Number(this.g.toFixed()).toString(16); + let bH = Number(this.b.toFixed()).toString(16); + return "#" + this.hs(rH) + this.hs(gH) + this.hs(bH); +}; + +/** + * Converts an RGB color value to HSL. Conversion formula adapted from + * http://en.wikipedia.org/wiki/HSL_color_space. Assumes r, g, and b are + * contained in the set [0, 255] and returns h, s, and l in the set [0, 1].4343 + * + * @param Number r The red color value + * @param Number g The green color value + * @param Number b The blue color value + * @return Array The HSL representation + */ +Color.prototype.hsl = function() { + let r = this.r / 255; + let g = this.g / 255; + let b = this.b / 255; + let max = Math.max(r, g, b), min = Math.min(r, g, b); + let h, s, l = (max + min) / 2; + + if (max === min) { + h = s = 0; // achromatic + } else { + let d = max - min; + s = l > 0.5 ? d / (2 - max - min) : d / (max + min); + switch (max) { + case r: + h = (g - b) / d + (g < b ? 6 : 0); + break; + case g: + h = (b - r) / d + 2; + break; + case b: + h = (r - g) / d + 4; + break; + } + h /= 6; + } + + return [ h, s, l ]; +}; + +/** + * Converts an HSL color value to RGB. Conversion formula adapted from + * http://en.wikipedia.org/wiki/HSL_color_space. Assumes h, s, and l are + * contained in the set [0, 1] and returns r, g, and b in the set [0, 255]. + * + * @param Number h The hue + * @param Number s The saturation + * @param Number l The lightness + * @return Array The RGB representation + */ +Color.prototype.hslToRgb = function(h, s, l) { + function hue2rgb(p, q, t) { + if (t < 0) { + t += 1; + } + if (t > 1) { + t -= 1; + } + if (t < 1 / 6) { + return p + (q - p) * 6 * t; + } + if (t < 1 / 2) { + return q; + } + if (t < 2 / 3) { + return p + (q - p) * (2 / 3 - t) * 6; + } + return p; + } + + let r, g, b; + + if (s === 0) { + r = g = b = l; // achromatic + } else { + let q = l < 0.5 ? l * (1 + s) : l + s - l * s; + let p = 2 * l - q; + r = hue2rgb(p, q, h + 1 / 3); + g = hue2rgb(p, q, h); + b = hue2rgb(p, q, h - 1 / 3); + } + + return [ r * 255, g * 255, b * 255 ]; +}; + +/** + * Converts an RGB color value to HSV. Conversion formula adapted from + * http://en.wikipedia.org/wiki/HSV_color_space. Assumes r, g, and b are + * contained in the set [0, 255] and returns h, s, and v in the set [0, 1]. + * + * @param Number r The red color value + * @param Number g The green color value + * @param Number b The blue color value + * @return Array The HSV representation + */ +Color.prototype.hsv = function() { + let r = this.r / 255; + let g = this.g / 255; + let b = this.b / 255; + let max = Math.max(r, g, b), min = Math.min(r, g, b); + let h, s, v = max; + + let d = max - min; + s = max === 0 ? 0 : d / max; + + if (max === min) { + h = 0; // achromatic + } else { + switch (max) { + case r: + h = (g - b) / d + (g < b ? 6 : 0); + break; + case g: + h = (b - r) / d + 2; + break; + case b: + h = (r - g) / d + 4; + break; + } + h /= 6; + } + + return [ h, s, v ]; +}; + +/** + * Converts an HSV color value to RGB. Conversion formula adapted from + * http://en.wikipedia.org/wiki/HSV_color_space. Assumes h, s, and v are + * contained in the set [0, 1] and returns r, g, and b in the set [0, 255]. + * + * @param Number h The hue + * @param Number s The saturation + * @param Number v The value + * @return Array The RGB representation + */ +Color.prototype.hsvToRgb = function(h, s, v) { + let r, g, b; + + let i = Math.floor(h * 6); + let f = h * 6 - i; + let p = v * (1 - s); + let q = v * (1 - f * s); + let t = v * (1 - (1 - f) * s); + + switch (i % 6) { + case 0: + r = v; + g = t; + b = p; + break; + case 1: + r = q; + g = v; + b = p; + break; + case 2: + r = p; + g = v; + b = t; + break; + case 3: + r = p; + g = q; + b = v; + break; + case 4: + r = t; + g = p; + b = v; + break; + case 5: + r = v; + g = p; + b = q; + break; + } + + return [ r * 255, g * 255, b * 255 ]; +}; + +/** + * Provide + */ +Color.prototype.lightColor = function() { + let hslArray = this.hsl(); + let h = Number(hslArray[0]); + let s = Number(hslArray[1]) * this.Desaturated; + let l = this.Luminosity; + let desA = this.hslToRgb(h, s, l); + return new Color(desA[0], desA[1], desA[2]); +}; diff --git a/lib/puvodni/old-main.js b/lib/puvodni/old-main.js new file mode 100644 index 0000000..db81448 --- /dev/null +++ b/lib/puvodni/old-main.js @@ -0,0 +1,106 @@ +/*jslint onevar: false, browser: true, evil: true, laxbreak: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, maxerr: 1000, immed: false, white: false, plusplus: false, regexp: false, undef: false */ +/*global jetpack */ +// Released under the MIT/X11 license +// http://www.opensource.org/licenses/mit-license.php +// +// Links to read through +// http://ehsanakhgari.org/blog/2010-01-07/bugzilla-tweaks-enhanced +// http://hg.mozilla.org/users/ehsan.akhgari_gmail.com/extensions/file/tip/bugzillatweaks +// http://hg.mozilla.org/users/ehsan.akhgari_gmail.com/extensions/file/ecfa0f028b81/bugzillatweaks/lib/main.js +// http://hg.mozilla.org/users/avarma_mozilla.com/atul-packages/file/42ac1e99a107/packages\ +// /facebook-acquaintances/lib/main.js#l11 +// http://ehsanakhgari.org/blog/2010-05-31/my-experience-jetpack-sdk#comment-1253 +// +"use strict"; +var util = require("util"); +var logger = require("logger"); +var file = require("file"); +var myStorage = require("simple-storage").storage; + +var TriagedDistro = 13; +var NumberOfFrames = 7; +var XMLRPCurl = "https://bugzilla.redhat.com/xmlrpc.cgi"; + +let config = {}; +config.matches = [ + "https://bugzilla.redhat.com/show_bug.cgi", + "https://bugzilla.mozilla.org/show_bug.cgi" +]; + + +// ============================================================== +// https://wiki.mozilla.org/Labs/Jetpack/JEP/24 +var manifest = { + settings : [ + { + name : "BZpassword", + type : "password", + label : "Bugzilla password" + }, + { + name : "JSONURL", + type : "text", + label : "Configuration file URL", + "default" : "http://mcepl.fedorapeople.org/scripts/BugZappers_data.json" + }, + { + name : "enabledPacks", + type : "text", + label : "comment packs which should be enabled", + "default" : "" + } + ] +}; +jetpack.future.import("storage.settings"); + +// ///////////////////////////////////////////////////////////////////////////// +function isOurPage(window) { + if ("window" in window) { + window = window.window; + } + + if (window.location.protocol == "https:") { + // like ["name1": "url1", "name2":"url2"] + // FIXME the real name of bugzillaPageModLocation array + for (var loc in bugzillaPageModLocation) { + if (bugzillaPageModLocation[loc].test(window.location.href)) { + return true; + } + } + } + // we haven't found a conforming bugzilla + return false; +} + + +function initialize() { + +} + +util.loadJSON(jetpack.storage.settings.JSONURL, function(parsedData) { + config.gJSONData = parsedData; + + // Get card translation table + let keys = ""; + for (let key in config.gJSONData) { + keys += key + " "; + } + if ("PCIIDsURL" in config.gJSONData.configData) { + util.loadJSON(config.gJSONData.configData.PCIIDsURL, function(response) { + config.PCI_ID_Array = response; + }); + } + + config.logger = new logger.Logger(myStorage.logs, + config.gJSONData.constantData.bugzillalabelAbbreviations); + + let callback = function(doc) { + if (config.gJSONData.configData.objectStyle = "RH") { + let curPage = new RHBugzillaPage(doc); + } else if (config.gJSONData.configData.objectStyle = "MoFo") { + let curPage = new MozillaBugzilla(doc); + } + }; + + jetpack.pageMods.add(callback, config); +}, this); diff --git a/lib/puvodni/xmlrpc.js b/lib/puvodni/xmlrpc.js new file mode 100644 index 0000000..69bb77e --- /dev/null +++ b/lib/puvodni/xmlrpc.js @@ -0,0 +1,168 @@ +// Released under the MIT/X11 license +// http://www.opensource.org/licenses/mit-license.php +"use strict"; +/* + * + * xmlrpc.js beta version 1 Tool for creating XML-RPC formatted requests in + * JavaScript + * + * Copyright 2001 Scott Andrew LePera scott@scottandrew.com + * http://www.scottandrew.com/xml-rpc + * + * License: You are granted the right to use and/or redistribute this code only + * if this license and the copyright notice are included and you accept that no + * warranty of any kind is made or implied by the author. + * + */ + +var XMLRPCMessage = exports.XMLRPCMessage = function XMLRPCMessage(methodname) { + this.method = methodname || "system.listMethods"; + this.params = []; + return this; +} + +XMLRPCMessage.prototype.setMethod = function(methodName) { + if (!methodName) return; + this.method = methodName; +}; + +XMLRPCMessage.prototype.addParameter = function(data) { + if (arguments.length == 0) return; + this.params[this.params.length] = data; +}; + +XMLRPCMessage.prototype.xml = function() { + + let method = this.method; + + // assemble the XML message header + let xml = ""; + + xml += "\n"; + xml += "\n"; + xml += "" + method + "\n"; + xml += "\n"; + + // do individual parameters + for ( let i = 0; i < this.params.length; i++) { + let data = this.params[i]; + xml += "\n"; + xml += "" + + this.getParamXML(this.dataTypeOf(data), + data) + "\n"; + xml += "\n"; + } + + xml += "\n"; + xml += ""; + + return xml; // for now +}; + +XMLRPCMessage.prototype.dataTypeOf = function(o) { + // identifies the data type + let type = typeof (o); + type = type.toLowerCase(); + switch (type) { + case "number": + if (Math.round(o) == o) + type = "i4"; + else + type = "double"; + break; + case "object": + let con = o.constructor; + if (con == Date) + type = "date"; + else if (con == Array) + type = "array"; + else + type = "struct"; + break; + } + return type; +}; + +XMLRPCMessage.prototype.doValueXML = function(type, data) { + let xml = "<" + type + ">" + data + ""; + return xml; +}; + +XMLRPCMessage.prototype.doBooleanXML = function(data) { + let value = (data == true) ? 1 : 0; + let xml = "" + value + ""; + return xml; +}; + +XMLRPCMessage.prototype.doDateXML = function(data) { + let leadingZero = function (n) { + // pads a single number with a leading zero. Heh. + if (n.length == 1) + n = "0" + n; + return n; + }; + let dateToISO8601 = function(date) { + // wow I hate working with the Date object + let year = new String(date.getYear()); + let month = this.leadingZero(new String(date.getMonth())); + let day = this.leadingZero(new String(date.getDate())); + let time = this.leadingZero(new String(date.getHours())) + ":" + + this.leadingZero(new String(date.getMinutes())) + ":" + + this.leadingZero(new String(date.getSeconds())); + + let converted = year + month + day + "T" + time; + return converted; + }; + + let xml = ""; + xml += dateToISO8601(data); + xml += ""; + return xml; +}; + +XMLRPCMessage.prototype.doArrayXML = function(data) { + let xml = "\n"; + for ( let i = 0; i < data.length; i++) { + xml += "" + + this.getParamXML(this.dataTypeOf(data[i]), + data[i]) + "\n"; + } + xml += "\n"; + return xml; +}; + +XMLRPCMessage.prototype.doStructXML = function(data) { + let xml = "\n"; + for ( let i in data) { + xml += "\n"; + xml += "" + i + "\n"; + xml += "" + + this.getParamXML(this.dataTypeOf(data[i]), + data[i]) + "\n"; + xml += "\n"; + } + xml += "\n"; + return xml; +}; + +XMLRPCMessage.prototype.getParamXML = function(type, data) { + let xml; + switch (type) { + case "date": + xml = this.doDateXML(data); + break; + case "array": + xml = this.doArrayXML(data); + break; + case "struct": + xml = this.doStructXML(data); + break; + case "boolean": + xml = this.doBooleanXML(data); + break; + default: + xml = this.doValueXML(type, data); + break; + } + return xml; +}; diff --git a/lib/rhbzpage.js b/lib/rhbzpage.js index 468818b..407d383 100644 --- a/lib/rhbzpage.js +++ b/lib/rhbzpage.js @@ -4,15 +4,7 @@ // http://www.opensource.org/licenses/mit-license.php "use strict"; var util = require("util"); -var xrpc = require("xmlrpc"); -var xhr = require("xhr"); -var clip = require("clipboard"); -var Color = require("color").Color; var BZPage = require("bzpage").BZPage; -// var TriagedDistro = 13; -// var NumberOfFrames = 7; -// var XMLRPCurl = "https://bugzilla.redhat.com/xmlrpc.cgi"; -// var bugURL = "https://bugzilla.redhat.com/show_bug.cgi?id="; // ==================================================================================== // RHBugzillaPage object @@ -21,17 +13,12 @@ var RHBugzillaPage = exports.RHBugzillaPage = function RHBugzillaPage(doc, confi // inheritance ... call superobject's constructor BZPage.call(this, doc, config); - // For identification of graphics card - var manuChipStrs = [ [ "ATI Radeon", "ATI", "1002" ], - [ "ATI Mobility Radeon", "ATI", "1002" ], - [ "Intel Corporation", "INTEL", "8086" ], [ "NVIDIA", "NV", "10de" ] ]; - - console.log("Now we are outside!"); - console.log("location = " + this.doc.location); + this.bugId = this.getBugId(); console.log("bug number = " + this.bugId); + console.log("Now we are outside!"); }; // END OF RHBugzillaPage CONSTRUCTOR RHBugzillaPage.prototype = util.heir(BZPage); -RHBugzillaPage.prototype.constructor = RHBugzillaPage; \ No newline at end of file +RHBugzillaPage.prototype.constructor = RHBugzillaPage; diff --git a/lib/util.js b/lib/util.js index 3ce50c5..b019022 100644 --- a/lib/util.js +++ b/lib/util.js @@ -34,116 +34,7 @@ exports.heir = function heir(p) { return new f(); }; -/** - * Check whether an item is member of the list. Idea is just to make long if - * commands slightly more readable. - * - * @param mbr string to be searched in the list - * @param list list - * @return position of the string in the list, or -1 if none found. - */ -var isInList = exports.isInList = function isInList(mbr, list) { - if (!list) { - return false; - } - return (list.indexOf(mbr) !== -1); -}; - -/** - * select element of the array where regexp in the first element matches second - * parameter of this function - * - * @param list Array with regexps and return values - * @param chosingMark String by which the element of array is to be matched - * @return Object chosen element - */ -exports.filterByRegexp = function filterByRegexp(list, chosingMark) { - let chosenPair = []; - if (list.length > 0) { - chosenPair = list.filter(function(pair) { - return new RegExp(pair.regexp, "i").test(chosingMark); - }); - } - if (chosenPair.length > 0) { - return chosenPair[0].addr; - } else { - return ""; - } -}; - -/** - * format date to be in ISO format (just day part) - * - * @param date - * @return string with the formatted date - */ -exports.getISODate = function getISODate(dateStr) { - function pad(n) { - return n < 10 ? '0' + n : n; - } - var date = new Date(dateStr); - return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + - pad(date.getDate()); -}; -/** - * Make sure value returned is Array - * - * @param Array/String - * @return Array - * - * If something else than Array or String is passed to the function - * the result will be untouched actual argument of the call. - */ -var valToArray = exports.valToArray = function valToArray(val) { - var isArr = val && - val.constructor && - val.constructor.name === "Array"; - return isArr ? val : [val]; -}; - -/** - * Merges two comma separated string as a list and returns new string - * - * @param str String with old values - * @param value String/Array with other values - * @return String with merged lists - */ -exports.addCSVValue = function addCSVValue(str, value) { - var parts = (str.trim().length > 0 ? str.split(/,\s*/) : []); - if (!value) { - return str; - } - if (!isInList(value, parts)) { - var newValue = valToArray(value); - parts = parts.concat(newValue); - } - // this is necessary to get comma-space separated string even when - // value is an array already - parts = parts.join(",").split(","); - return parts.join(", "); -}; - -/** - * Treats comma separated string as a list and removes one item from it - * - * @param str String treated as a list - * @param value String with the value to be removed from str - * @return String with the resulting list comma separated - */ -exports.removeCSVValue = function removeCSVValue(str, value) { - str = str.trim(); - var parts = str ? str.split(/,\s*/) : []; - var valueArr = value instanceof Array ? value : value.split(/,\s*/); - parts = parts.filter(function (e, i, a) { - return (!isInList(e, valueArr)); - }); - return parts.join(", "); -}; - -/** - * - */ var getBugNo = exports.getBugNo = function getBugNo(url) { var re = new RegExp(".*id=([0-9]+).*$"); var bugNo = null; diff --git a/lib/xmlrpc.js b/lib/xmlrpc.js deleted file mode 100644 index 69bb77e..0000000 --- a/lib/xmlrpc.js +++ /dev/null @@ -1,168 +0,0 @@ -// Released under the MIT/X11 license -// http://www.opensource.org/licenses/mit-license.php -"use strict"; -/* - * - * xmlrpc.js beta version 1 Tool for creating XML-RPC formatted requests in - * JavaScript - * - * Copyright 2001 Scott Andrew LePera scott@scottandrew.com - * http://www.scottandrew.com/xml-rpc - * - * License: You are granted the right to use and/or redistribute this code only - * if this license and the copyright notice are included and you accept that no - * warranty of any kind is made or implied by the author. - * - */ - -var XMLRPCMessage = exports.XMLRPCMessage = function XMLRPCMessage(methodname) { - this.method = methodname || "system.listMethods"; - this.params = []; - return this; -} - -XMLRPCMessage.prototype.setMethod = function(methodName) { - if (!methodName) return; - this.method = methodName; -}; - -XMLRPCMessage.prototype.addParameter = function(data) { - if (arguments.length == 0) return; - this.params[this.params.length] = data; -}; - -XMLRPCMessage.prototype.xml = function() { - - let method = this.method; - - // assemble the XML message header - let xml = ""; - - xml += "\n"; - xml += "\n"; - xml += "" + method + "\n"; - xml += "\n"; - - // do individual parameters - for ( let i = 0; i < this.params.length; i++) { - let data = this.params[i]; - xml += "\n"; - xml += "" - + this.getParamXML(this.dataTypeOf(data), - data) + "\n"; - xml += "\n"; - } - - xml += "\n"; - xml += ""; - - return xml; // for now -}; - -XMLRPCMessage.prototype.dataTypeOf = function(o) { - // identifies the data type - let type = typeof (o); - type = type.toLowerCase(); - switch (type) { - case "number": - if (Math.round(o) == o) - type = "i4"; - else - type = "double"; - break; - case "object": - let con = o.constructor; - if (con == Date) - type = "date"; - else if (con == Array) - type = "array"; - else - type = "struct"; - break; - } - return type; -}; - -XMLRPCMessage.prototype.doValueXML = function(type, data) { - let xml = "<" + type + ">" + data + ""; - return xml; -}; - -XMLRPCMessage.prototype.doBooleanXML = function(data) { - let value = (data == true) ? 1 : 0; - let xml = "" + value + ""; - return xml; -}; - -XMLRPCMessage.prototype.doDateXML = function(data) { - let leadingZero = function (n) { - // pads a single number with a leading zero. Heh. - if (n.length == 1) - n = "0" + n; - return n; - }; - let dateToISO8601 = function(date) { - // wow I hate working with the Date object - let year = new String(date.getYear()); - let month = this.leadingZero(new String(date.getMonth())); - let day = this.leadingZero(new String(date.getDate())); - let time = this.leadingZero(new String(date.getHours())) + ":" - + this.leadingZero(new String(date.getMinutes())) + ":" - + this.leadingZero(new String(date.getSeconds())); - - let converted = year + month + day + "T" + time; - return converted; - }; - - let xml = ""; - xml += dateToISO8601(data); - xml += ""; - return xml; -}; - -XMLRPCMessage.prototype.doArrayXML = function(data) { - let xml = "\n"; - for ( let i = 0; i < data.length; i++) { - xml += "" - + this.getParamXML(this.dataTypeOf(data[i]), - data[i]) + "\n"; - } - xml += "\n"; - return xml; -}; - -XMLRPCMessage.prototype.doStructXML = function(data) { - let xml = "\n"; - for ( let i in data) { - xml += "\n"; - xml += "" + i + "\n"; - xml += "" - + this.getParamXML(this.dataTypeOf(data[i]), - data[i]) + "\n"; - xml += "\n"; - } - xml += "\n"; - return xml; -}; - -XMLRPCMessage.prototype.getParamXML = function(type, data) { - let xml; - switch (type) { - case "date": - xml = this.doDateXML(data); - break; - case "array": - xml = this.doArrayXML(data); - break; - case "struct": - xml = this.doStructXML(data); - break; - case "boolean": - xml = this.doBooleanXML(data); - break; - default: - xml = this.doValueXML(type, data); - break; - } - return xml; -}; -- cgit