From 1a93ab4eb53557e0d67306f71ce7985593092647 Mon Sep 17 00:00:00 2001 From: muxator Date: Wed, 29 Aug 2018 03:03:34 +0200 Subject: [PATCH] db/Pad: reversed truthy condition to make core logic evident Since the original comparison compared for truthy and not for "===", and it's 3 AM now, I blindly negated it, in order to show how fragile it was in the first instance. No functional changes. This is the final commit of this refactoring series. --- src/node/db/Pad.js | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index 66f9aa598..91ab7f792 100644 --- a/src/node/db/Pad.js +++ b/src/node/db/Pad.js @@ -505,26 +505,29 @@ Pad.prototype.copy = function copy(destinationID, force, callback) { { if(ERR(err, callback)) return; - if(exists == true) - { - if (!force) - { - console.error("erroring out without force"); - callback(new customError("destinationID already exists","apierror")); - console.error("erroring out without force - after"); - return; - } - - // exists and forcing - padManager.getPad(destinationID, function(err, pad) { - if (ERR(err, callback)) return; - pad.remove(callback); - }); - } - else + /* + * this is the negation of a truthy comparison. Has been left in this + * wonky state to keep the old (possibly buggy) behaviour + */ + if (!(exists == true)) { callback(); + return; } + + if (!force) + { + console.error("erroring out without force"); + callback(new customError("destinationID already exists","apierror")); + console.error("erroring out without force - after"); + return; + } + + // exists and forcing + padManager.getPad(destinationID, function(err, pad) { + if (ERR(err, callback)) return; + pad.remove(callback); + }); }); }, // copy the 'pad' entry