Merge pull request #26 from ssiyad/master

Filter top contries using ?top= and --top

Author: sagarkarira

app.js

@@ -9,6 +9,7 @@ const port = process.env.PORT || 3001;
 const { getCountryTable, getJSONData, getJSONDataForCountry } = require('./lib/byCountry');
 const { getCompleteTable } = require('./lib/corona');
 const { lookupCountry } = require('./lib/helpers');
+const { getLiveUpdates } = require('./lib/reddit.js');
 
 
 function errorHandler(error, res) {
@@ -26,36 +27,39 @@ app.use((req, res, next) => {
 });
 
 
-+app.get('/updates', (req, res) => {
-  const format = req.query.format ? req.query.format : '';
-  if (format.toLowerCase() === 'json') {
-    return getLiveUpdates(true).then(result => {
-      return res.json(result);
-    }).catch(error => errorHandler(error, res));
-  }
-  return getLiveUpdates(false).then(result => {
-    return res.send(result);
-  }).catch(error => errorHandler(error, res));
-});
 
 app.get('/', (req, res) => {
   const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
   const format = req.query.format ? req.query.format : '';
   const minimal = req.query.minimal === 'true' ? true : false;
   const emojis = req.query.emojis === 'true' ? true : false;
+  const top = req.query.top ? Number(req.query.top) : 1000;
 
   if (format.toLowerCase() === 'json') {
     return getJSONData().then(result => {
       return res.json(result);
     }).catch(error => errorHandler(error, res));
   }
 
-  return getCompleteTable({ isCurl, emojis, minimal })
+  return getCompleteTable({ isCurl, emojis, minimal, top })
     .then(result => {
       return res.send(result);
     }).catch(error => errorHandler(error, res));
 });
 
+app.get('/updates', (req, res) => {
+  const format = req.query.format ? req.query.format : '';
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
+  if (format.toLowerCase() === 'json') {
+    return getLiveUpdates({ json: true, isCurl }).then(result => {
+      return res.json(result);
+    }).catch(error => errorHandler(error, res));
+  }
+  return getLiveUpdates({ json: false, isCurl }).then(result => {
+    return res.send(result);
+  }).catch(error => errorHandler(error, res));
+});
+
 app.get('/:country', (req, res) => {
   const { country } = req.params;
   const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;

bin/index.js

@@ -44,18 +44,24 @@ const { argv } = yargs
     },
     m: {
       alias: 'minimal',
-      describe: 'remove borders and padding from table',
+      describe: 'Remove borders & padding from table',
       type: 'boolean',
       default: false,
+    },
+    t: {
+      alias: 'top',
+      describe: 'Filter table by rank',
+      type: 'int'
     }
   })
   .strict()
   .help('help');
 
-const { emojis, country, minimal } = argv;
+
+const { emojis, country, minimal, top } = argv;
 (
   country === 'ALL'
-    ? getCompleteTable({ emojis, minimal })
+    ? getCompleteTable({ emojis, minimal, top })
     : getCountryTable({ countryCode: country, emojis, minimal })
 )
   .then(console.log)

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.6.0
+
+* Added filter to show top N countries. ``corona --top=20``
+
 ## Version 0.5.0
 
 * Added minimal / comapct table command. ``corona --minimal``

lib/corona.js

@@ -84,7 +84,23 @@ exports.getCompleteTable = async ({
   isCurl = true,
   emojis = false,
   minimal = false,
+  top = 1000
   }) => {
+  const head = [
+    '',
+    'Country',
+    `Confirmed ${emojis ? ' ✅': ''}`,
+    `Recovered${emojis ? ' 😀' : ''}`,
+    `Deaths${emojis ? ' 😞' : ''}`,
+    `Active${emojis ? ' 😷' : ''}`,
+    'Mortality %',
+    'Recovered %',
+    '1 Day ▲',
+    '1 Week ▲',
+    // 'RoG',
+    ...( emojis ?  ['🏳'] : [] ),
+  ];
+
   const table = new Table({
     head: helpers.getTableHeaders(emojis, 'Country'),
     chars: helpers.getTableBorders(minimal),
@@ -110,7 +126,7 @@ exports.getCompleteTable = async ({
     ]
   })
   let rank = 1;
-  countryData.forEach(cd => {
+  countryData.some(cd => {
     const countryEmoji = getEmoji(cd.countryCode);
     const values = [
       getCountry(`${cd.country} (${cd.countryCode})`),
@@ -126,6 +142,7 @@ exports.getCompleteTable = async ({
       ...(emojis ? [countryEmoji] : [])
     ]
     table.push({ [rank++]: values })
+    return rank == top + 1;
   });
   table.push({
     '': [

lib/reddit.js

@@ -0,0 +1,46 @@
+const axios = require('axios');
+const LIVE_THREAD_URL = 'https://www.reddit.com/live/14d816ty1ylvo/.json';
+const moment = require('moment');
+// const terminalLink = require('terminal-link');
+const Table = require('cli-table3');
+const stripAnsi = require('strip-ansi');
+
+exports.getLiveUpdates = async ({ json = false, isCurl = true }) => {
+  const result = await axios(`https://www.reddit.com/live/14d816ty1ylvo/.json`);
+  if (!result && !result.data) {
+    throw new Error(`Reddit live thread API faliure`);
+  }
+  const mainInfo = result.data.data.children
+    .filter(o => o.data.mobile_embeds.length > 0)
+    .map(o => {
+      return {
+        description: o.data.mobile_embeds[0].description,
+        url:o.data.mobile_embeds[0].original_url,
+        timestamp: o.data.created_utc,
+      };
+    });
+  if (json) {
+    return mainInfo;
+  }
+  return formattedForTerminal(mainInfo, isCurl);
+};
+
+const formattedForTerminal = (mainInfo, isCurl) => {
+  let liveUpdates = 'Latest Updates: \n\n';
+  var table = new Table({
+    head: ['Time', 'Update'],
+    wordWrap: true,
+    colWidths: [20, 120],
+  });
+  mainInfo.forEach(obj => {
+    const prefixTime = moment(moment.unix(obj.timestamp).format()).fromNow();
+    const sourceLink = prefixTime;
+    if (obj.description && sourceLink.indexOf('imgur') === -1) {
+      // liveUpdates += `${obj.description} --[${sourceLink}] \n\n`;
+      table.push([prefixTime, obj.description ]);
+    }
+  });
+  liveUpdates += 'Source: https://www.reddit.com/live/14d816ty1ylvo';
+  // return liveUpdates;
+  return isCurl ? table.toString() : stripAnsi(table.toString());
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coronavirus-tracker-cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "track conronavirus cases from cli",
   "repository": {
     "type": "git",

readme.md

@@ -32,6 +32,18 @@ where <country> can be country name or its ISO code.
 curl https://corona-stats.online?minimal=true
 ````
 
+**Only show top N countries**
+
+```sh
+curl https://corona-stats.online?top=20
+```
+
+**Latest News (Work in Progress)**
+
+```sh
+curl https://corona-stats.online/updates
+```
+
 ## API
 
 Add `?format=json` at the end of any API to get json formatted data.
@@ -52,15 +64,22 @@ npm install coronavirus-tracker-cli -g
 
 **Run command**
 
-````sh
+```sh
 corona
-````
+```
 
 **Filter by country**
 
-````sh
+```sh
 corona italy
-````
+```
+
+**Top N countries**
+
+```sh
+corona --top=10
+```
+
 **With emojis**
 
 ````sh
@@ -79,15 +98,6 @@ corona --minimal
 corona --color=false
 ````
 
-**Top 10** (Working on native command)
-
-Note: This command will cause colored output to be discarded.
-
-````sh
-# Grep the rank of 10 and the 23 lines preceding it
-corona | grep -B 23 ' 10  '
-````
-
 ### ToDos
 
 * ~~Filter by country to get cases by local states.~~