From 5b98c47c4c353be2360bef50420cc084dff99773 Mon Sep 17 00:00:00 2001 From: Andrew Prentice Date: Wed, 20 Jul 2016 12:04:08 -0400 Subject: [PATCH] fix(rhymebrain): rate-limiting and result output --- build/cmds/rhymebrain_cmds/rhyme.js | 49 ++++++++++++++++++++--------- src/cmds/rhymebrain_cmds/rhyme.js | 43 ++++++++++++++++++------- 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/build/cmds/rhymebrain_cmds/rhyme.js b/build/cmds/rhymebrain_cmds/rhyme.js index 6275d3a..8c913cd 100644 --- a/build/cmds/rhymebrain_cmds/rhyme.js +++ b/build/cmds/rhymebrain_cmds/rhyme.js @@ -42,7 +42,7 @@ exports.builder = { max: { alias: 'm', desc: 'Max results to return', - default: 50, + default: 5, type: 'number' } }; @@ -51,13 +51,14 @@ exports.handler = function (argv) { var config = noon.load(CFILE); var proceed = false; var stamp = new Date(config.rbrain.date.stamp); - var now = new Date(); - var diff = moment(now).diff(stamp, 'minutes'); - var reset = 60 - diff; + var now = moment(new Date()).diff(stamp, 'minutes'); + var diff = 60 - now; + var reset = false; if (diff < 60) { config.rbrain.date.remain = config.rbrain.date.remain - 1; noon.save(CFILE, config); } else if (diff >= 60) { + reset = true; config.rbrain.date.stamp = moment().format(); config.rbrain.date.remain = config.rbrain.date.limit; console.log(chalk.white('Reset API limit to ' + config.rbrain.date.limit + '/' + config.rbrain.date.interval + '.')); @@ -76,9 +77,11 @@ exports.handler = function (argv) { if (proceed) { (function () { var userConfig = { - rhyme: { - lang: argv.l, - max: argv.m + rbrain: { + rhyme: { + lang: argv.l, + max: argv.m + } } }; if (config.merge) config = _.merge({}, config, userConfig); @@ -102,22 +105,38 @@ exports.handler = function (argv) { var ctstyle = _.get(chalk, theme.content.style); needle.get(url, function (error, response) { if (!error && response.statusCode === 200) { + console.log(response.body); var list = response.body; - var rcont = []; + var lcont = []; for (var i = 0; i <= list.length - 1; i++) { var item = list[i]; - rcont.push(ctstyle('' + item.word)); - if (item.score >= 300) { - tofile[['hiscore' + i]] = item.word; + lcont.push(item.word); + } + lcont.sort(function (a, b) { + if (a < b) return -1; + if (a > b) return 1; + return 0; + }); + var rcont = []; + for (var j = 0; j <= lcont.length - 1; j++) { + var _item = lcont[j]; + rcont.push(ctstyle('' + _item.word)); + if (_item.score >= 300) { + tofile[['hiscore' + j]] = _item.word; } else { - tofile[['rhyme' + i]] = item.word; + tofile[['rhyme' + j]] = _item.word; } } - themes.labelRight('Rhymes', theme, rcont.join(',')); + rcont.sort(); + themes.labelRight('Rhymes', theme, rcont.join(', ')); if (argv.o) tools.outFile(argv.o, argv.f, tofile); if (argv.s && config.merge) noon.save(CFILE, config); if (argv.s && !config.merge) console.err(chalk.red('Set option merge to true!')); - console.log(config.rbrain.date.remain + '/' + config.rbrain.date.limit + ' requests remaining this hour, will reset in ' + reset + ' minutes.'); + if (reset) { + console.log(config.rbrain.date.remain + '/' + config.rbrain.date.limit + ' requests remaining this hour.'); + } else { + console.log(config.rbrain.date.remain + '/' + config.rbrain.date.limit + ' requests remaining this hour, will reset in ' + diff + ' minutes.'); + } } else { console.error(chalk.red.bold('HTTP ' + response.statusCode + ':') + ' ' + chalk.red(error)); } @@ -128,4 +147,4 @@ exports.handler = function (argv) { process.exit(1); } }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["cmds/rhymebrain_cmds/rhyme.js"],"names":[],"mappings":"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","file":"cmds/rhymebrain_cmds/rhyme.js","sourcesContent":["/* eslint max-len:0 */\nconst themes = require('../../themes')\nconst tools = require('../../tools')\n\nconst _ = require('lodash')\nconst chalk = require('chalk')\nconst moment = require('moment')\nconst needle = require('needle')\nconst noon = require('noon')\n\nconst CFILE = `${process.env.HOME}/.leximaven.noon`\n\nexports.command = 'rhyme <word>'\nexports.desc = 'Rhymebrain rhymes'\nexports.builder = {\n  out: {\n    alias: 'o',\n    desc: 'Write cson, json, noon, plist, yaml, xml',\n    default: '',\n    type: 'string',\n  },\n  force: {\n    alias: 'f',\n    desc: 'Force overwriting outfile',\n    default: false,\n    type: 'boolean',\n  },\n  save: {\n    alias: 's',\n    desc: 'Save flags to config file',\n    default: false,\n    type: 'boolean',\n  },\n  lang: {\n    alias: 'l',\n    desc: 'ISO 639-1 language code',\n    default: 'en',\n    type: 'string',\n  },\n  max: {\n    alias: 'm',\n    desc: 'Max results to return',\n    default: 50,\n    type: 'number',\n  },\n}\nexports.handler = (argv) => {\n  tools.checkConfig(CFILE)\n  let config = noon.load(CFILE)\n  let proceed = false\n  const stamp = new Date(config.rbrain.date.stamp)\n  const now = new Date\n  const diff = moment(now).diff(stamp, 'minutes')\n  const reset = 60 - diff\n  if (diff < 60) {\n    config.rbrain.date.remain = config.rbrain.date.remain - 1\n    noon.save(CFILE, config)\n  } else if (diff >= 60) {\n    config.rbrain.date.stamp = moment().format()\n    config.rbrain.date.remain = config.rbrain.date.limit\n    console.log(chalk.white(`Reset API limit to ${config.rbrain.date.limit}/${config.rbrain.date.interval}.`))\n    config.rbrain.date.remain = config.rbrain.date.remain - 1\n    noon.save(CFILE, config)\n  }\n  if (config.rbrain.date.remain === 0) {\n    proceed = false\n  } else if (config.rbrain.date.remain < 0) {\n    proceed = false\n    config.rbrain.date.remain = 0\n    noon.save(CFILE, config)\n  } else {\n    proceed = true\n  }\n  if (proceed) {\n    const userConfig = {\n      rhyme: {\n        lang: argv.l,\n        max: argv.m,\n      },\n    }\n    if (config.merge) config = _.merge({}, config, userConfig)\n    const theme = themes.loadTheme(config.theme)\n    if (config.verbose) themes.labelDown('Rhymebrain', theme, null)\n    const word = argv.word\n    const task = 'Rhymes'\n    const prefix = 'http://rhymebrain.com/talk?function=get'\n    const uri = `${prefix}${task}&word=${word}&`\n    const pcont = []\n    pcont.push(`lang=${config.rbrain.rhyme.lang}&`)\n    pcont.push(`maxResults=${config.rbrain.rhyme.max}&`)\n    const rest = pcont.join('')\n    let url = `${uri}${rest}`\n    url = encodeURI(url)\n    const tofile = {\n      type: 'rhyme',\n      source: 'http://rhymebrain.com',\n      url,\n    }\n    const ctstyle = _.get(chalk, theme.content.style)\n    needle.get(url, (error, response) => {\n      if (!error && response.statusCode === 200) {\n        const list = response.body\n        const rcont = []\n        for (let i = 0; i <= list.length - 1; i++) {\n          const item = list[i]\n          rcont.push(ctstyle(`${item.word}`))\n          if (item.score >= 300) {\n            tofile[[`hiscore${i}`]] = item.word\n          } else {\n            tofile[[`rhyme${i}`]] = item.word\n          }\n        }\n        themes.labelRight('Rhymes', theme, rcont.join(','))\n        if (argv.o) tools.outFile(argv.o, argv.f, tofile)\n        if (argv.s && config.merge) noon.save(CFILE, config)\n        if (argv.s && !config.merge) console.err(chalk.red('Set option merge to true!'))\n        console.log(`${config.rbrain.date.remain}/${config.rbrain.date.limit} requests remaining this hour, will reset in ${reset} minutes.`)\n      } else {\n        console.error(`${chalk.red.bold(`HTTP ${response.statusCode}:`)} ${chalk.red(error)}`)\n      }\n    })\n  } else {\n    console.error(chalk.red(`Reached this hour's usage limit of ${config.rbrain.date.limit}.`))\n    process.exit(1)\n  }\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["cmds/rhymebrain_cmds/rhyme.js"],"names":[],"mappings":";;AAAA;AACA,IAAM,SAAS,QAAQ,cAAR,CAAf;AACA,IAAM,QAAQ,QAAQ,aAAR,CAAd;;AAEA,IAAM,IAAI,QAAQ,QAAR,CAAV;AACA,IAAM,QAAQ,QAAQ,OAAR,CAAd;AACA,IAAM,SAAS,QAAQ,QAAR,CAAf;AACA,IAAM,SAAS,QAAQ,QAAR,CAAf;AACA,IAAM,OAAO,QAAQ,MAAR,CAAb;;AAEA,IAAM,QAAW,QAAQ,GAAR,CAAY,IAAvB,qBAAN;;AAEA,QAAQ,OAAR,GAAkB,cAAlB;AACA,QAAQ,IAAR,GAAe,mBAAf;AACA,QAAQ,OAAR,GAAkB;AAChB,OAAK;AACH,WAAO,GADJ;AAEH,UAAM,0CAFH;AAGH,aAAS,EAHN;AAIH,UAAM;AAJH,GADW;AAOhB,SAAO;AACL,WAAO,GADF;AAEL,UAAM,2BAFD;AAGL,aAAS,KAHJ;AAIL,UAAM;AAJD,GAPS;AAahB,QAAM;AACJ,WAAO,GADH;AAEJ,UAAM,2BAFF;AAGJ,aAAS,KAHL;AAIJ,UAAM;AAJF,GAbU;AAmBhB,QAAM;AACJ,WAAO,GADH;AAEJ,UAAM,yBAFF;AAGJ,aAAS,IAHL;AAIJ,UAAM;AAJF,GAnBU;AAyBhB,OAAK;AACH,WAAO,GADJ;AAEH,UAAM,uBAFH;AAGH,aAAS,CAHN;AAIH,UAAM;AAJH;AAzBW,CAAlB;AAgCA,QAAQ,OAAR,GAAkB,UAAC,IAAD,EAAU;AAC1B,QAAM,WAAN,CAAkB,KAAlB;AACA,MAAI,SAAS,KAAK,IAAL,CAAU,KAAV,CAAb;AACA,MAAI,UAAU,KAAd;AACA,MAAM,QAAQ,IAAI,IAAJ,CAAS,OAAO,MAAP,CAAc,IAAd,CAAmB,KAA5B,CAAd;AACA,MAAM,MAAM,OAAO,IAAI,IAAJ,EAAP,EAAiB,IAAjB,CAAsB,KAAtB,EAA6B,SAA7B,CAAZ;AACA,MAAM,OAAO,KAAK,GAAlB;AACA,MAAI,QAAQ,KAAZ;AACA,MAAI,OAAO,EAAX,EAAe;AACb,WAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,OAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,CAAxD;AACA,SAAK,IAAL,CAAU,KAAV,EAAiB,MAAjB;AACD,GAHD,MAGO,IAAI,QAAQ,EAAZ,EAAgB;AACrB,YAAQ,IAAR;AACA,WAAO,MAAP,CAAc,IAAd,CAAmB,KAAnB,GAA2B,SAAS,MAAT,EAA3B;AACA,WAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,OAAO,MAAP,CAAc,IAAd,CAAmB,KAA/C;AACA,YAAQ,GAAR,CAAY,MAAM,KAAN,yBAAkC,OAAO,MAAP,CAAc,IAAd,CAAmB,KAArD,SAA8D,OAAO,MAAP,CAAc,IAAd,CAAmB,QAAjF,OAAZ;AACA,WAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,OAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,CAAxD;AACA,SAAK,IAAL,CAAU,KAAV,EAAiB,MAAjB;AACD;AACD,MAAI,OAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,KAA8B,CAAlC,EAAqC;AACnC,cAAU,KAAV;AACD,GAFD,MAEO,IAAI,OAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,CAAhC,EAAmC;AACxC,cAAU,KAAV;AACA,WAAO,MAAP,CAAc,IAAd,CAAmB,MAAnB,GAA4B,CAA5B;AACA,SAAK,IAAL,CAAU,KAAV,EAAiB,MAAjB;AACD,GAJM,MAIA;AACL,cAAU,IAAV;AACD;AACD,MAAI,OAAJ,EAAa;AAAA;AACX,UAAM,aAAa;AACjB,gBAAQ;AACN,iBAAO;AACL,kBAAM,KAAK,CADN;AAEL,iBAAK,KAAK;AAFL;AADD;AADS,OAAnB;AAQA,UAAI,OAAO,KAAX,EAAkB,SAAS,EAAE,KAAF,CAAQ,EAAR,EAAY,MAAZ,EAAoB,UAApB,CAAT;AAClB,UAAM,QAAQ,OAAO,SAAP,CAAiB,OAAO,KAAxB,CAAd;AACA,UAAI,OAAO,OAAX,EAAoB,OAAO,SAAP,CAAiB,YAAjB,EAA+B,KAA/B,EAAsC,IAAtC;AACpB,UAAM,OAAO,KAAK,IAAlB;AACA,UAAM,OAAO,QAAb;AACA,UAAM,SAAS,yCAAf;AACA,UAAM,WAAS,MAAT,GAAkB,IAAlB,cAA+B,IAA/B,MAAN;AACA,UAAM,QAAQ,EAAd;AACA,YAAM,IAAN,WAAmB,OAAO,MAAP,CAAc,KAAd,CAAoB,IAAvC;AACA,YAAM,IAAN,iBAAyB,OAAO,MAAP,CAAc,KAAd,CAAoB,GAA7C;AACA,UAAM,OAAO,MAAM,IAAN,CAAW,EAAX,CAAb;AACA,UAAI,WAAS,GAAT,GAAe,IAAnB;AACA,YAAM,UAAU,GAAV,CAAN;AACA,UAAM,SAAS;AACb,cAAM,OADO;AAEb,gBAAQ,uBAFK;AAGb;AAHa,OAAf;AAKA,UAAM,UAAU,EAAE,GAAF,CAAM,KAAN,EAAa,MAAM,OAAN,CAAc,KAA3B,CAAhB;AACA,aAAO,GAAP,CAAW,GAAX,EAAgB,UAAC,KAAD,EAAQ,QAAR,EAAqB;AACnC,YAAI,CAAC,KAAD,IAAU,SAAS,UAAT,KAAwB,GAAtC,EAA2C;AACzC,kBAAQ,GAAR,CAAY,SAAS,IAArB;AACA,cAAM,OAAO,SAAS,IAAtB;AACA,cAAM,QAAQ,EAAd;AACA,eAAK,IAAI,IAAI,CAAb,EAAgB,KAAK,KAAK,MAAL,GAAc,CAAnC,EAAsC,GAAtC,EAA2C;AACzC,gBAAM,OAAO,KAAK,CAAL,CAAb;AACA,kBAAM,IAAN,CAAW,KAAK,IAAhB;AACD;AACD,gBAAM,IAAN,CAAW,UAAC,CAAD,EAAI,CAAJ,EAAU;AACnB,gBAAI,IAAI,CAAR,EAAW,OAAO,CAAC,CAAR;AACX,gBAAI,IAAI,CAAR,EAAW,OAAO,CAAP;AACX,mBAAO,CAAP;AACD,WAJD;AAKA,cAAM,QAAQ,EAAd;AACA,eAAK,IAAI,IAAI,CAAb,EAAgB,KAAK,MAAM,MAAN,GAAe,CAApC,EAAuC,GAAvC,EAA4C;AAC1C,gBAAM,QAAO,MAAM,CAAN,CAAb;AACA,kBAAM,IAAN,CAAW,aAAW,MAAK,IAAhB,CAAX;AACA,gBAAI,MAAK,KAAL,IAAc,GAAlB,EAAuB;AACrB,qBAAO,aAAW,CAAX,CAAP,IAA0B,MAAK,IAA/B;AACD,aAFD,MAEO;AACL,qBAAO,WAAS,CAAT,CAAP,IAAwB,MAAK,IAA7B;AACD;AACF;AACD,gBAAM,IAAN;AACA,iBAAO,UAAP,CAAkB,QAAlB,EAA4B,KAA5B,EAAmC,MAAM,IAAN,CAAW,IAAX,CAAnC;AACA,cAAI,KAAK,CAAT,EAAY,MAAM,OAAN,CAAc,KAAK,CAAnB,EAAsB,KAAK,CAA3B,EAA8B,MAA9B;AACZ,cAAI,KAAK,CAAL,IAAU,OAAO,KAArB,EAA4B,KAAK,IAAL,CAAU,KAAV,EAAiB,MAAjB;AAC5B,cAAI,KAAK,CAAL,IAAU,CAAC,OAAO,KAAtB,EAA6B,QAAQ,GAAR,CAAY,MAAM,GAAN,CAAU,2BAAV,CAAZ;AAC7B,cAAI,KAAJ,EAAW;AACT,oBAAQ,GAAR,CAAe,OAAO,MAAP,CAAc,IAAd,CAAmB,MAAlC,SAA4C,OAAO,MAAP,CAAc,IAAd,CAAmB,KAA/D;AACD,WAFD,MAEO;AACL,oBAAQ,GAAR,CAAe,OAAO,MAAP,CAAc,IAAd,CAAmB,MAAlC,SAA4C,OAAO,MAAP,CAAc,IAAd,CAAmB,KAA/D,qDAAoH,IAApH;AACD;AACF,SAjCD,MAiCO;AACL,kBAAQ,KAAR,CAAiB,MAAM,GAAN,CAAU,IAAV,WAAuB,SAAS,UAAhC,OAAjB,SAAmE,MAAM,GAAN,CAAU,KAAV,CAAnE;AACD;AACF,OArCD;AA5BW;AAkEZ,GAlED,MAkEO;AACL,YAAQ,KAAR,CAAc,MAAM,GAAN,0CAAgD,OAAO,MAAP,CAAc,IAAd,CAAmB,KAAnE,OAAd;AACA,YAAQ,IAAR,CAAa,CAAb;AACD;AACF,CAlGD","file":"cmds/rhymebrain_cmds/rhyme.js","sourcesContent":["/* eslint max-len:0 */\nconst themes = require('../../themes')\nconst tools = require('../../tools')\n\nconst _ = require('lodash')\nconst chalk = require('chalk')\nconst moment = require('moment')\nconst needle = require('needle')\nconst noon = require('noon')\n\nconst CFILE = `${process.env.HOME}/.leximaven.noon`\n\nexports.command = 'rhyme <word>'\nexports.desc = 'Rhymebrain rhymes'\nexports.builder = {\n  out: {\n    alias: 'o',\n    desc: 'Write cson, json, noon, plist, yaml, xml',\n    default: '',\n    type: 'string',\n  },\n  force: {\n    alias: 'f',\n    desc: 'Force overwriting outfile',\n    default: false,\n    type: 'boolean',\n  },\n  save: {\n    alias: 's',\n    desc: 'Save flags to config file',\n    default: false,\n    type: 'boolean',\n  },\n  lang: {\n    alias: 'l',\n    desc: 'ISO 639-1 language code',\n    default: 'en',\n    type: 'string',\n  },\n  max: {\n    alias: 'm',\n    desc: 'Max results to return',\n    default: 5,\n    type: 'number',\n  },\n}\nexports.handler = (argv) => {\n  tools.checkConfig(CFILE)\n  let config = noon.load(CFILE)\n  let proceed = false\n  const stamp = new Date(config.rbrain.date.stamp)\n  const now = moment(new Date).diff(stamp, 'minutes')\n  const diff = 60 - now\n  let reset = false\n  if (diff < 60) {\n    config.rbrain.date.remain = config.rbrain.date.remain - 1\n    noon.save(CFILE, config)\n  } else if (diff >= 60) {\n    reset = true\n    config.rbrain.date.stamp = moment().format()\n    config.rbrain.date.remain = config.rbrain.date.limit\n    console.log(chalk.white(`Reset API limit to ${config.rbrain.date.limit}/${config.rbrain.date.interval}.`))\n    config.rbrain.date.remain = config.rbrain.date.remain - 1\n    noon.save(CFILE, config)\n  }\n  if (config.rbrain.date.remain === 0) {\n    proceed = false\n  } else if (config.rbrain.date.remain < 0) {\n    proceed = false\n    config.rbrain.date.remain = 0\n    noon.save(CFILE, config)\n  } else {\n    proceed = true\n  }\n  if (proceed) {\n    const userConfig = {\n      rbrain: {\n        rhyme: {\n          lang: argv.l,\n          max: argv.m,\n        },\n      },\n    }\n    if (config.merge) config = _.merge({}, config, userConfig)\n    const theme = themes.loadTheme(config.theme)\n    if (config.verbose) themes.labelDown('Rhymebrain', theme, null)\n    const word = argv.word\n    const task = 'Rhymes'\n    const prefix = 'http://rhymebrain.com/talk?function=get'\n    const uri = `${prefix}${task}&word=${word}&`\n    const pcont = []\n    pcont.push(`lang=${config.rbrain.rhyme.lang}&`)\n    pcont.push(`maxResults=${config.rbrain.rhyme.max}&`)\n    const rest = pcont.join('')\n    let url = `${uri}${rest}`\n    url = encodeURI(url)\n    const tofile = {\n      type: 'rhyme',\n      source: 'http://rhymebrain.com',\n      url,\n    }\n    const ctstyle = _.get(chalk, theme.content.style)\n    needle.get(url, (error, response) => {\n      if (!error && response.statusCode === 200) {\n        console.log(response.body)\n        const list = response.body\n        const lcont = []\n        for (let i = 0; i <= list.length - 1; i++) {\n          const item = list[i]\n          lcont.push(item.word)\n        }\n        lcont.sort((a, b) => {\n          if (a < b) return -1\n          if (a > b) return 1\n          return 0\n        })\n        const rcont = []\n        for (let j = 0; j <= lcont.length - 1; j++) {\n          const item = lcont[j]\n          rcont.push(ctstyle(`${item.word}`))\n          if (item.score >= 300) {\n            tofile[[`hiscore${j}`]] = item.word\n          } else {\n            tofile[[`rhyme${j}`]] = item.word\n          }\n        }\n        rcont.sort()\n        themes.labelRight('Rhymes', theme, rcont.join(', '))\n        if (argv.o) tools.outFile(argv.o, argv.f, tofile)\n        if (argv.s && config.merge) noon.save(CFILE, config)\n        if (argv.s && !config.merge) console.err(chalk.red('Set option merge to true!'))\n        if (reset) {\n          console.log(`${config.rbrain.date.remain}/${config.rbrain.date.limit} requests remaining this hour.`)\n        } else {\n          console.log(`${config.rbrain.date.remain}/${config.rbrain.date.limit} requests remaining this hour, will reset in ${diff} minutes.`)\n        }\n      } else {\n        console.error(`${chalk.red.bold(`HTTP ${response.statusCode}:`)} ${chalk.red(error)}`)\n      }\n    })\n  } else {\n    console.error(chalk.red(`Reached this hour's usage limit of ${config.rbrain.date.limit}.`))\n    process.exit(1)\n  }\n}\n"]} \ No newline at end of file diff --git a/src/cmds/rhymebrain_cmds/rhyme.js b/src/cmds/rhymebrain_cmds/rhyme.js index 434fe70..0ce0f63 100644 --- a/src/cmds/rhymebrain_cmds/rhyme.js +++ b/src/cmds/rhymebrain_cmds/rhyme.js @@ -40,7 +40,7 @@ exports.builder = { max: { alias: 'm', desc: 'Max results to return', - default: 50, + default: 5, type: 'number', }, } @@ -49,13 +49,14 @@ exports.handler = (argv) => { let config = noon.load(CFILE) let proceed = false const stamp = new Date(config.rbrain.date.stamp) - const now = new Date - const diff = moment(now).diff(stamp, 'minutes') - const reset = 60 - diff + const now = moment(new Date).diff(stamp, 'minutes') + const diff = 60 - now + let reset = false if (diff < 60) { config.rbrain.date.remain = config.rbrain.date.remain - 1 noon.save(CFILE, config) } else if (diff >= 60) { + reset = true config.rbrain.date.stamp = moment().format() config.rbrain.date.remain = config.rbrain.date.limit console.log(chalk.white(`Reset API limit to ${config.rbrain.date.limit}/${config.rbrain.date.interval}.`)) @@ -73,9 +74,11 @@ exports.handler = (argv) => { } if (proceed) { const userConfig = { - rhyme: { - lang: argv.l, - max: argv.m, + rbrain: { + rhyme: { + lang: argv.l, + max: argv.m, + }, }, } if (config.merge) config = _.merge({}, config, userConfig) @@ -99,22 +102,38 @@ exports.handler = (argv) => { const ctstyle = _.get(chalk, theme.content.style) needle.get(url, (error, response) => { if (!error && response.statusCode === 200) { + console.log(response.body) const list = response.body - const rcont = [] + const lcont = [] for (let i = 0; i <= list.length - 1; i++) { const item = list[i] + lcont.push(item.word) + } + lcont.sort((a, b) => { + if (a < b) return -1 + if (a > b) return 1 + return 0 + }) + const rcont = [] + for (let j = 0; j <= lcont.length - 1; j++) { + const item = lcont[j] rcont.push(ctstyle(`${item.word}`)) if (item.score >= 300) { - tofile[[`hiscore${i}`]] = item.word + tofile[[`hiscore${j}`]] = item.word } else { - tofile[[`rhyme${i}`]] = item.word + tofile[[`rhyme${j}`]] = item.word } } - themes.labelRight('Rhymes', theme, rcont.join(',')) + rcont.sort() + themes.labelRight('Rhymes', theme, rcont.join(', ')) if (argv.o) tools.outFile(argv.o, argv.f, tofile) if (argv.s && config.merge) noon.save(CFILE, config) if (argv.s && !config.merge) console.err(chalk.red('Set option merge to true!')) - console.log(`${config.rbrain.date.remain}/${config.rbrain.date.limit} requests remaining this hour, will reset in ${reset} minutes.`) + if (reset) { + console.log(`${config.rbrain.date.remain}/${config.rbrain.date.limit} requests remaining this hour.`) + } else { + console.log(`${config.rbrain.date.remain}/${config.rbrain.date.limit} requests remaining this hour, will reset in ${diff} minutes.`) + } } else { console.error(`${chalk.red.bold(`HTTP ${response.statusCode}:`)} ${chalk.red(error)}`) }