Accept json files on item import

tropy · Jan 21, 2020 · 8deafe4 · 8deafe4
1 parent 2d0b2ad
commit 8deafe4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/src/actions/item.js b/src/actions/item.js
@@ -25,7 +25,7 @@ module.exports = {
         history: 'add',
         cancel: true,
         search: true,
-        prompt: true,
+        prompt: 'items',
         ...meta
       }
     }

diff --git a/src/actions/photo.js b/src/actions/photo.js
@@ -30,7 +30,7 @@ module.exports = {
         cancel: true,
         cmd: 'project',
         history: 'add',
-        prompt: true,
+        prompt: 'images',
         ...meta
       }
     }

diff --git a/src/commands/import.js b/src/commands/import.js
@@ -44,6 +44,8 @@ class ImportCommand extends Command {
       switch (type) {
         case 'dir':
           return open.dir()
+        case 'items':
+          return open.items()
         default:
           return open.images()
       }
@@ -63,12 +65,14 @@ class ImportCommand extends Command {
     if (!files.length && !urls.length && meta.prompt)
       files = await this.promptForFilesToImport(meta.prompt)
 
-    files = await dir.expand(files, {
+    let json = files.filter(f => (/^\.json(ld)?$/i).test(extname(f)))
+
+    let images = await dir.expand(files, {
       filter: this.canImportFile,
       recursive: true
     })
 
-    return [...files, ...urls]
+    return [...json, ...images, ...urls]
   }
 
   *openImage(path) {

diff --git a/src/dialog.js b/src/dialog.js
@@ -98,38 +98,48 @@ function save(options) {
   return show('save', options)
 }
 
-function open(options) {
-  return show('file', options)
+function open(opts) {
+  return show('file', opts)
 }
 
-open.images = (options) => open({
+open.images = (opts) => open({
   filters: [{
     name: t('dialog', 'filter', 'images'),
     extensions: IMAGE.EXT
   }],
   defaultPath: ARGS.pictures,
   properties: ['openFile', 'multiSelections'],
-  ...options
+  ...opts
 })
 
-open.image = (options) => open.images({
+open.items = (opts) => open({
+  filters: [{
+    name: t('dialog', 'filter', 'items'),
+    extensions: [...IMAGE.EXT, 'json', 'jsonld']
+  }],
+  defaultPath: ARGS.pictures,
+  properties: ['openFile', 'multiSelections'],
+  ...opts
+})
+
+open.image = (opts) => open.images({
   properties: ['openFile'],
-  ...options
+  ...opts
 })
 
-open.dir = (options) => open({
+open.dir = (opts) => open({
   properties: ['openDirectory', 'multiSelections'],
-  ...options
+  ...opts
 })
 
-open.vocab = (options) => open({
+open.vocab = (opts) => open({
   filters: [{
     name: t('dialog', 'filter', 'rdf'),
     extensions: ['n3', 'ttl']
   }],
   defaultPath: ARGS.documents,
   properties: ['openFile', 'multiSelections'],
-  ...options
+  ...opts
 })
 
 open.templates = (options) => open({