Streamline dialog helpers

src/actions/wizard.js

@@ -2,7 +2,7 @@
 
 const { Database } = require('../common/db')
 const { ipcRenderer: ipc } = require('electron')
-const { fail, saveProject } = require('../dialog')
+const { fail, save } = require('../dialog')
 const { PROJECT, WIZARD } = require('../constants')
 const { create } = require('../models/project')
 
@@ -30,7 +30,7 @@ module.exports = {
     save(payload) {
       return async (dispatch) => {
         try {
-          const file = await saveProject({ defaultPath: payload })
+          const file = await save.project({ defaultPath: payload })
           dispatch(module.exports.project.update({ file }))
 
         } catch (error) {

src/commands/item.js

@@ -5,7 +5,7 @@ const { basename } = require('path')
 const { warn, verbose } = require('../common/log')
 const { all, call, put, select } = require('redux-saga/effects')
 const { Command } = require('./command')
-const { prompt, openImages, fail  } = require('../dialog')
+const { prompt, open, fail  } = require('../dialog')
 const { Image } = require('../image')
 const { imagePath } = require('../common/cache')
 const { text } = require('../value')
@@ -56,7 +56,7 @@ class Import extends Command {
 
     if (!files) {
       this.isInteractive = true
-      files = yield call(openImages)
+      files = yield call(open.images)
     }
 
     if (!files) return

src/commands/ontology.js

@@ -14,13 +14,7 @@ const mod = require('../models')
 const sanitize = require('sanitize-filename')
 const { join } = require('path')
 const { keys } = Object
-
-const {
-  openTemplates,
-  openVocabs,
-  exportTemplate,
-  fail
-} = require('../dialog')
+const dialog = require('../dialog')
 
 
 class Import extends Command {
@@ -31,7 +25,7 @@ class Import extends Command {
     let { files, isProtected } = this.action.payload
 
     if (!files) {
-      files = yield call(openVocabs)
+      files = yield call(dialog.open.vocab)
       this.init = performance.now()
     }
 
@@ -62,7 +56,7 @@ class Import extends Command {
             } catch (error) {
               warn(`Failed to import "${id}": ${error.message}`)
               verbose(error.stack)
-              fail(error, this.action.type)
+              dialog.fail(error, this.action.type)
             }
           }
         })
@@ -71,7 +65,7 @@ class Import extends Command {
       } catch (error) {
         warn(`Failed to import "${file}": ${error.message}`)
         verbose(error.stack)
-        fail(error, this.action.type)
+        dialog.fail(error, this.action.type)
       }
     }
 
@@ -215,7 +209,7 @@ class TemplateImport extends Command {
     let { files, isProtected } = payload
 
     if (!files) {
-      files = yield call(openTemplates)
+      files = yield call(dialog.open.templates)
       this.init = performance.now()
     }
 
@@ -251,7 +245,7 @@ class TemplateImport extends Command {
         warn(`Failed to import "${file}": ${error.message}`)
         verbose(error.stack)
 
-        fail(error, this.action.type)
+        dialog.fail(error, this.action.type)
       }
     }
 
@@ -278,7 +272,7 @@ class TemplateExport extends Command {
 
       if (!path) {
         this.isInteractive = true
-        path = yield call(exportTemplate, {
+        path = yield call(dialog.save.template, {
           defaultPath: join(
             ARGS.documents,
             data.name ? sanitize(`${data.name}.ttp`) : ''
@@ -294,7 +288,7 @@ class TemplateExport extends Command {
       warn(`Failed to export template ${id} to ${path}: ${error.message}`)
       verbose(error.stack)
 
-      fail(error, this.action.type)
+      dialog.fail(error, this.action.type)
     }
   }
 }
@@ -318,7 +312,7 @@ class TemplateCreate extends Command {
         warn(`Failed to create template "${id}": ${error.message}`)
         verbose(error.stack)
 
-        fail(error, this.action.type)
+        dialog.fail(error, this.action.type)
       }
     }
 

src/commands/photo.js

@@ -2,7 +2,7 @@
 
 const { all, call, put, select } = require('redux-saga/effects')
 const { Command } = require('./command')
-const { openImages } = require('../dialog')
+const { open } = require('../dialog')
 const mod = require('../models')
 const act = require('../actions')
 const { PHOTO } = require('../constants')
@@ -29,7 +29,7 @@ class Create extends Command {
     }
 
     if (!files) {
-      files = yield call(openImages)
+      files = yield call(open.images)
       this.init = performance.now()
     }
 

src/dialog.js

@@ -41,7 +41,7 @@ function onClosed(_, { id, payload, error }) {
   }
 }
 
-function open(type, options = {}) {
+function show(type, options = {}) {
   return new Promise((resolve, reject) => {
     const id = seq.next().value
 
@@ -51,7 +51,7 @@ function open(type, options = {}) {
 }
 
 function notify(options) {
-  return open('message-box', {
+  return show('message-box', {
     type: 'none', buttons: ['OK'], ...options
   })
 }
@@ -73,7 +73,7 @@ async function prompt(message, {
   isChecked,
   ...options
 } = {}, prefix = 'dialog.prompt.') {
-  const { response, checked } = await open('message-box', {
+  const { response, checked } = await show('message-box', {
     type: 'question',
     buttons: buttons.map(id => t(id, prefix)),
     message: t(message, prefix),
@@ -92,73 +92,65 @@ async function prompt(message, {
 }
 
 function save(options) {
-  return open('save', options)
+  return show('save', options)
 }
 
-function file(options) {
-  return open('file', options)
+function open(options) {
+  return show('file', options)
 }
 
-function openImages(options) {
-  return open('file', {
-    filters: [
-      { name: t('dialog.filter.images'), extensions: ['jpg', 'jpeg'] }
-    ],
-    properties: ['openFile', 'multiSelections'],
-    ...options
-  })
-}
+open.images = (options) => open({
+  filters: [{
+    name: t('dialog.filter.images'),
+    extensions: ['jpg', 'jpeg']
+  }],
+  properties: ['openFile', 'multiSelections'],
+  ...options
+})
+
+open.vocab = (options) => open({
+  filters: [{
+    name: t('dialog.filter.rdf'),
+    extensions: ['n3', 'ttl']
+  }],
+  properties: ['openFile', 'multiSelections'],
+  ...options
+})
+
+open.templates = (options) => open({
+  filters: [{
+    name: t('dialog.filter.templates'),
+    extensions: ['ttp']
+  }],
+  properties: ['openFile', 'multiSelections'],
+  ...options
+})
 
-function openVocabs(options) {
-  return open('file', {
-    filters: [
-      { name: t('dialog.filter.rdf'), extensions: ['n3', 'ttl'] }
-    ],
-    properties: ['openFile', 'multiSelections'],
-    ...options
-  })
-}
 
-function openTemplates(options) {
-  return open('file', {
-    filters: [
-      { name: t('dialog.filter.templates'), extensions: ['ttp'] }
-    ],
-    properties: ['openFile', 'multiSelections'],
-    ...options
-  })
-}
+save.project = (options) => save({
+  filters: [{
+    name: t('dialog.filter.projects'),
+    extensions: ['tpy']
+  }],
+  ...options
+})
 
-function saveProject(options) {
-  return open('save', {
-    filters: [
-      { name: t('dialog.filter.projects'), extensions: ['tpy'] }
-    ],
-    ...options
-  })
-}
 
-function exportTemplate(options) {
-  return open('save', {
-    filters: [
-      { name: t('dialog.filter.templates'), extensions: ['ttp'] }
-    ],
-    ...options
-  })
-}
+save.template = (options) => save({
+  filters: [{
+    name: t('dialog.filter.templates'),
+    extensions: ['ttp']
+  }],
+  ...options
+})
 
 module.exports = {
-  start,
-  stop,
-  open,
-  notify,
-  exportTemplate,
   fail,
-  file,
-  openImages,
-  openTemplates,
-  openVocabs,
+  notify,
+  open,
+  prompt,
   save,
-  saveProject,
-  prompt
+  show,
+  start,
+  stop
 }