Merge 62e9233 into d693814

res/menu/app.en.yml

@@ -61,6 +61,12 @@ en:
           submenu:
             - label: 'JSON-LD'
               command: 'app:export-item'
+            - label: 'PDF'
+              submenu:
+                - label: 'Portrait'
+                  command: 'app:print-pdf'
+                - label: 'Landscape'
+                  command: 'app:print-pdf-landscape'
         - type: 'separator'
         - &consolidate
           label: 'Consolidate Photo Library'

res/menu/context.en.yml

@@ -171,9 +171,15 @@ en:
     item-read-only: &item-read-only
       - label: 'Export Item'
         id: 'export'
-        submenu:
+        submenu: &export-submenu
           - label: 'JSON-LD'
             command: 'app:export-item'
+          - label: 'PDF'
+            submenu:
+              - label: 'Portrait'
+                command: 'app:print-pdf'
+              - label: 'Landscape'
+                command: 'app:print-pdf-landscape'
       - label: 'Export Item Notes …'
         command: 'app:export-notes'
       - label: 'Copy Item Link'
@@ -197,9 +203,7 @@ en:
     item-bulk-read-only: &item-bulk-read-only
       - label: 'Export Selected Items'
         id: 'export'
-        submenu:
-          - label: 'JSON-LD'
-            command: 'app:export-item'
+        submenu: *export-submenu
       - label: 'Export Selected Item Notes …'
         command: 'app:export-notes'
       - label: 'Copy Selected Item Notes'

res/strings/browser.en.yml

@@ -3,6 +3,7 @@ en:
     file:
       project: Tropy Projects
       plugin: Tropy Plugins
+      pdf: PDF files
     crashed:
       buttons:
         - Close Window

res/strings/renderer.en.yml

@@ -509,6 +509,7 @@ en:
         }
       load: Loading items …
       merge: Merging item …
+      print: Processing items …
       restore: Restoring item …
       save: Saving items …
       tag:

src/browser/actions.js

@@ -1,3 +1,4 @@
+export { default as activity } from '../actions/activity'
 export { default as api } from '../actions/api'
 export { default as cache } from '../actions/cache'
 export { default as context } from '../actions/context'

src/browser/dialog.js

@@ -26,11 +26,19 @@ const Dialog = {
     })
   },
 
+  save(win, opts) {
+    return Dialog.show('save', win, opts)
+  },
+
   show(type, win, opts) {
     switch (type) {
       case 'save':
         return dialog
-          .showSaveDialog(win, { defaultPath, ...opts })
+          .showSaveDialog(win, {
+            defaultPath,
+            properties: ['createDirectory'],
+            ...opts
+          })
           .then(({ filePath }) => {
             if (filePath) {
               defaultPath = dirname(filePath)

src/browser/papersize.js

@@ -0,0 +1,33 @@
+import { exec } from '../common/spawn'
+import { read } from './mac-defaults'
+import { warn } from '../common/log'
+
+const DARWIN_PAPER = {
+  'iso-a3': 'A3',
+  'iso-a4': 'A4',
+  'iso-a5': 'A5',
+  'na-legal': 'Legal',
+  'na-letter': 'Letter',
+  'tabloid': 'Tabloid'
+}
+
+export async function papersize() {
+  try {
+    switch (process.platform) {
+      case 'linux':
+        return (await exec('paperconf -N')).stdout.trim()
+
+      case 'darwin':
+        return DARWIN_PAPER[
+          await read('org.cups.PrintingPrefs', 'DefaultPaperID', 'string')
+        ] || 'A4'
+
+      case 'win32':
+        return 'A4'
+    }
+  } catch (e) {
+    warn(`failed to fetch system default paper size: ${e.message}`)
+  }
+
+  return 'A4'
+}

src/browser/tropy.js

@@ -744,6 +744,17 @@ export class Tropy extends EventEmitter {
       this.dispatch(act.item.print(), this.wm.current())
     })
 
+    this.on('app:print-pdf', () => {
+      this.dispatch(act.item.print(null, { pdf: true }), this.wm.current())
+    })
+
+    this.on('app:print-pdf-landscape', () => {
+      this.dispatch(act.item.print(null, {
+        pdf: true,
+        landscape: true
+      }), this.wm.current())
+    })
+
     this.on('app:zoom-in', () => {
       this.state.zoom = this.wm.zoom(this.state.zoom + 0.25)
     })
@@ -789,7 +800,7 @@ export class Tropy extends EventEmitter {
       this.emit(cmd, BrowserWindow.fromWebContents(event.sender), ...args)
     })
 
-    ipc.on('print', async (_, opts) => {
+    ipc.handle('print', async (_, opts) => {
       try {
         if (!opts.items.length) return
 
@@ -808,9 +819,31 @@ export class Tropy extends EventEmitter {
           delay(60000)
         ])
 
-        debug('will open print dialog')
-        let status = await WindowManager.print(win)
-        info(`print status: ${status}`)
+        if (opts.pdf) {
+          let path = await dialog.save(win, {
+            filters: [{
+              name: this.dict.dialog.file.pdf,
+              extensions: ['pdf']
+            }]
+          })
+
+          if (!path) {
+            info('pdf printing cancelled: no file selected')
+            return
+          }
+
+          info('will print pdf')
+          await WindowManager.printToPDF(win, path, {
+            landscape: opts.landscape
+          })
+
+          info(`saved pdf ${path}`)
+
+        } else {
+          debug('will open print dialog')
+          let status = await WindowManager.print(win)
+          info(`print status: ${status}`)
+        }
 
       } finally {
         if (win != null) win.destroy()

src/browser/wm.js

@@ -1,13 +1,16 @@
+import assert from 'assert'
 import { EventEmitter } from 'events'
 import { join } from 'path'
 import { URL } from 'url'
 import { read } from './mac-defaults'
+import { papersize } from './papersize'
 import dialog from './dialog'
 import { debug, error, trace, warn } from '../common/log'
 import { darwin } from '../common/os'
 import { channel, paths } from '../common/release'
 import { Icon, View } from '../common/res'
 import { SASS } from '../constants'
+import { writeFile } from 'fs/promises'
 
 import {
   array,
@@ -583,6 +586,22 @@ export class WindowManager extends EventEmitter {
     })
   }
 
+  static async printToPDF(win, path, { pageSize, landscape = false } = {}) {
+    assert(path?.length > 0, 'missing PDF output file')
+
+    if (!pageSize)
+      pageSize = await papersize()
+
+    let data = await win.webContents.printToPDF({
+      pageSize,
+      landscape
+    })
+
+    await writeFile(path, data)
+
+    return path
+  }
+
   static async shouldReduceTransparency() {
     try {
       // TODO re-enable vibrancy effect when sidebar scrolling

src/commands/item/print.js

@@ -1,20 +1,28 @@
 import { ipcRenderer as ipc } from 'electron'
-import { select } from 'redux-saga/effects'
+import { call, select } from 'redux-saga/effects'
 import { Command } from '../command'
 import { ITEM } from '../../constants'
 import { getPrintableItems } from '../../selectors'
 
 
 export class Print extends Command {
   *exec() {
+    let { pdf, landscape } = this.action.meta
+
     let [prefs, project, items] = yield select(state => ([
       state.settings.print,
       state.project.id,
       getPrintableItems(state)
     ]))
 
     if (items.length) {
-      ipc.send('print', { ...prefs, project, items })
+      yield call(ipc.invoke, 'print', {
+        pdf,
+        landscape,
+        ...prefs,
+        project,
+        items
+      })
     }
   }
 }

src/common/spawn.js

@@ -3,6 +3,8 @@ import ChildProcess from 'child_process'
 
 export const execFile = promisify(ChildProcess.execFile)
 
+export const exec = promisify(ChildProcess.exec)
+
 export async function spawn(cmd, args) {
   try {
     let child = ChildProcess.spawn(cmd, args)

src/dialog.js

@@ -163,7 +163,6 @@ save.project = (opts) => save({
     name: t('dialog', 'filter', 'projects'),
     extensions: ['tpy']
   }],
-  properties: ['createDirectory'],
   ...opts
 })
 
@@ -173,7 +172,6 @@ save.csv = (opts) => save({
     name: t('dialog', 'filter', 'csv'),
     extensions: ['csv']
   }],
-  properties: ['createDirectory'],
   ...opts
 })
 
@@ -182,7 +180,6 @@ save.template = (opts) => save({
     name: t('dialog', 'filter', 'templates'),
     extensions: ['ttp']
   }],
-  properties: ['createDirectory'],
   ...opts
 })
 
@@ -191,7 +188,6 @@ save.items = (opts) => save({
     name: t('dialog', 'filter', 'jsonld'),
     extensions: ['json', 'jsonld']
   }],
-  properties: ['createDirectory'],
   ...opts
 })
 
@@ -200,7 +196,6 @@ save.image = (opts) => save({
     name: t('dialog', 'filter', 'images'),
     extensions: ['jpg', 'jpeg', 'png', 'webp']
   }],
-  properties: ['createDirectory'],
   ...opts
 })
 
@@ -209,7 +204,6 @@ save.vocab = (opts) => save({
     name: t('dialog', 'filter', 'rdf'),
     extensions: ['n3']
   }],
-  properties: ['createDirectory'],
   ...opts
 })
 
@@ -218,7 +212,6 @@ save.notes = (opts) => save({
     name: t('dialog', 'filter', 'notes'),
     extensions: ['json', 'jsonld', 'md', 'markdown', 'html', 'txt']
   }],
-  properties: ['createDirectory'],
   ...opts
 })