Unbreak my heart

Author: chriszs

README.md

@@ -42,7 +42,7 @@ fec list --rss
 To load the most recent five filings from the FEC's RSS feed, run:
 
 ```bash
-for url in $(fec list --rss --headers=false --columns=fec_url --format=tsv | head -n 5); do curl -s $url | fec convert $(echo $url | tr -dc '0-9') --format=psql | psql -v ON_ERROR_STOP=on --single-transaction; done
+for url in $(fec list --rss --headers=false --columns=fec_url --format=tsv | head -n 5); do FILING_ID=$(echo $url | tr -dc '0-9'); curl -s "https://docquery.fec.gov/dcdev/posted/"$FILING_ID".fec" | fec convert $FILING_ID --format=psql | psql -v ON_ERROR_STOP=on --single-transaction; done
 ```
 
 To get just a summary line as JSON:

commands/convert.js

@@ -1,7 +1,7 @@
 const fec = require('../');
 
 module.exports = {
-    command: 'convert',
+    command: 'convert [filing_id]',
     describe:
         'Pipe in an .fec file to convert it to newline-delimited JSON or psql COPY commands.',
     builder(yargs) {

commands/list.js

@@ -22,7 +22,7 @@ module.exports = {
         format: {
             type: 'string',
             default: 'tsv',
-            choices: ['table','ndjson','json','csv','tsv'],
+            choices: ['ndjson','csv','tsv'], // 'json', 'table'
             describe: 'choose output format'
         },
         headers: {
@@ -33,13 +33,13 @@ module.exports = {
         columns: {
             type: 'string',
             describe: 'choose columns to show'
-        },
+        }/*,
         columnLength: {
             type: 'integer',
             default: 30,
             describe:
                 'how many characters to show in each table cell'
-        }
+        }*/
     },
     handler: async options => {
         if (!options.rss && !options.key) {

lib/format.js

@@ -17,13 +17,14 @@ module.exports = (stream, format, columns, headers = true, maxLength = 30) => {
     */
 
     switch (format) {
+        /*
         case 'json':
             let initial = true;
 
             return stream.pipe(
                 through2(
                     { objectMode: true },
-                    function(row, enc, next) {
+                    function (row, enc, next) {
                         if (initial) {
                             this.push('{"rows":');
                         }
@@ -32,16 +33,16 @@ module.exports = (stream, format, columns, headers = true, maxLength = 30) => {
 
                         next();
                     },
-                    function() {
+                    function () {
                         this.push(']}');
 
                         cb();
                     }
                 )
-            );
+            );*/
         case 'ndjson':
             return stream.pipe(
-                through2.obj((row, enc, next) => {
+                through2.obj(function (row, enc, next) {
                     this.push(`${JSON.stringify(row)}\n`);
 
                     next();
@@ -80,12 +81,12 @@ module.exports = (stream, format, columns, headers = true, maxLength = 30) => {
                 headers,
                 delimiter: (format == 'tsv' ? '\t' : ',')
             })
-            .transform(row => Object.assign({}, ...columns.map(prop => ({[prop]: row[prop]}))));
+            .transform(row => columns ? Object.assign({}, ...columns.map(prop => ({[prop]: row[prop]}))) : row);
 
             return stream.pipe(formatStream);
         default:
             throw new Error(
-                'Invalid format specified, options are: table, ndjson, csv'
+                'Invalid format specified, options are: ndjson, tsv csv' // table,
             );
     }
 };

lib/init.js

@@ -3,5 +3,5 @@ const models = require('@publici/fec-model')({
 });
 
 module.exports = (options) => {
-	return models.sync();
+	return models.sync(() => {});
 }