From d113181bb4703d4de3e8adfdf54a8aba11e46341 Mon Sep 17 00:00:00 2001
From: Lachlan Kermode <lachiekermode@gmail.com>
Date: Sun, 26 Apr 2020 17:17:34 +0200
Subject: [PATCH] fix differential args for fetchers

---
 src/initialize.js     | 13 +++++++++----
 src/lib/Controller.js |  1 -
 src/sheets_config.js  | 18 ++++++++++++------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/initialize.js b/src/initialize.js
index 55765dd..f3c3d43 100755
--- a/src/initialize.js
+++ b/src/initialize.js
@@ -15,10 +15,15 @@ export default callback => {
       // skip config attrs that don't have corresponding fetchers
       if (!(fType in fetchers)) return null
       const FFetcher = fetchers[fType]
-      return config[fType].map(sheet => ({
-        name: sheet.name,
-        fetcher: new FFetcher(new StoreJson(), ...Object.values(sheet))
-      }))
+      return config[fType].map(sheet => {
+        const otherArgs = { ...sheet }
+        delete otherArgs.name
+        delete otherArgs.tabs
+        return {
+          name: sheet.name,
+          fetcher: new FFetcher(new StoreJson(), sheet.name, sheet.tabs, ...Object.values(otherArgs))
+        }
+      })
     })
   })
     .then(res => {
diff --git a/src/lib/Controller.js b/src/lib/Controller.js
index 0910369..970e6f2 100644
--- a/src/lib/Controller.js
+++ b/src/lib/Controller.js
@@ -22,7 +22,6 @@ class Controller {
   update () {
     return Promise.all(
       Object.keys(this.fetchers).map(sheet => {
-        console.log(sheet)
         return this.fetchers[sheet].update()
       })
     ).then(results => {
diff --git a/src/sheets_config.js b/src/sheets_config.js
index a5471c9..0f1f744 100644
--- a/src/sheets_config.js
+++ b/src/sheets_config.js
@@ -1,18 +1,24 @@
 import BP from './lib/blueprinters'
 
 const timemapStructure = {
-  teuruwera_export_events: BP.deeprows,
-  teuruwera_export_categories: [BP.groups, BP.rows],
+  export_events: BP.deeprows,
+  export_categories: [BP.groups, BP.rows],
   export_narratives: BP.rows,
-  teuruwera_export_sources: BP.deepids,
+  export_sources: BP.deepids,
   export_sites: BP.rows,
   export_tags: BP.tree
 }
 
 export default {
   gsheets: [{
-    name: 'example',
-    id: '1UC7DkCFeUXHfpUxUGruExwFbP4pqVBdJLOKfo6wDDGk',
-    tabs: timemapStructure
+    name: 'nzacts',
+    tabs: timemapStructure,
+    id: '1ej3kEtANGYsEBUCTfWsIR0UhTSJIuXFHLYspti2sgHo'
+  }],
+
+  xlsx: [{
+    name: 'morocco_pushbacks',
+    tabs: timemapStructure,
+    path: 'temp/morocco_pushbacks.xlsx'
   }]
 }