mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update pdf-reader and note-editor, use specific prebuilds, tweak code

Browse source
This commit is contained in:
Martynas Bagdonas 2022-06-17 16:47:53 +03:00 committed by Dan Stillman
parent 3ff650f046
commit 4de31ebb85
5 changed files with 59 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
note-editor

@ -1 +1 @@
Subproject commit fb3daf6c7e1d7a91992deeea52889cb9c95972f7
Subproject commit 3c75eb213b23da239b5b0c69b9e61ff54a2f2a4c

2
pdf-reader

@ -1 +1 @@
Subproject commit ac7cae37ae8ba5ea8fc5e0b2a3faebd2d432e65a
Subproject commit f147bbaeafd00023bfbd3058a6d7697570da509e

32
scripts/note-editor.js
View file

@ -1,6 +1,7 @@
'use strict';
const fs = require('fs-extra');
const path = require('path');
const util = require('util');
const exec = util.promisify(require('child_process').exec);
const { getSignatures, writeSignatures, onSuccess, onError } = require('./utils');
@ -9,28 +10,35 @@ const { buildsURL } = require('./config');
async function getZoteroNoteEditor(signatures) {
const t1 = Date.now();
const { stdout } = await exec('git rev-parse HEAD', { cwd: './note-editor' });
const modulePath = path.join(__dirname, '..', 'note-editor');
const { stdout } = await exec('git rev-parse HEAD', { cwd: modulePath });
const hash = stdout.trim();
if (!('note-editor' in signatures) || signatures['note-editor'].hash !== hash) {
const targetDir = 'build/resource/note-editor/';
const targetDir = path.join(__dirname, '..', 'build', 'resource', 'note-editor');
try {
const filename = hash + '.zip';
const tmpDir = 'tmp/builds/note-editor/';
const tmpDir = path.join(__dirname, '..', 'tmp', 'builds', 'note-editor');
const url = buildsURL + 'client-note-editor/' + filename;
await fs.remove(targetDir);
await fs.ensureDir(targetDir);
await fs.ensureDir(tmpDir);
await exec(
`mkdir -p ${tmpDir}`
+ `&& cd ${tmpDir}`
+ `&& (test -f ${filename} || curl -f ${url} -o ${filename})`
+ `&& rm -rf ../../../${targetDir}`
+ `&& mkdir -p ../../../${targetDir}`
+ `&& unzip -o ${filename} -d ../../../${targetDir}`
`cd ${tmpDir}`
+ ` && (test -f ${filename} || curl -f ${url} -o ${filename})`
+ ` && unzip ${filename} zotero/* -d ${targetDir}`
+ ` && mv ${path.join(targetDir, 'zotero', '*')} ${targetDir}`
);
await fs.remove(path.join(targetDir, 'zotero'));
}
catch (e) {
await exec('npm ci', { cwd: 'note-editor' });
await exec('npm run build', { cwd: 'note-editor' });
await fs.copy('note-editor/build/zotero', targetDir);
await exec('npm ci', { cwd: modulePath });
await exec('npm run build', { cwd: modulePath });
await fs.copy(path.join(modulePath, 'build', 'zotero'), targetDir);
}
signatures['note-editor'] = { hash };
}

32
scripts/pdf-reader.js
View file

@ -1,6 +1,7 @@
'use strict';
const fs = require('fs-extra');
const path = require('path');
const util = require('util');
const exec = util.promisify(require('child_process').exec);
const { getSignatures, writeSignatures, onSuccess, onError } = require('./utils');
@ -8,29 +9,36 @@ const { buildsURL } = require('./config');
async function getPDFReader(signatures) {
const t1 = Date.now();
const modulePath = path.join(__dirname, '..', 'pdf-reader');
const { stdout } = await exec('git rev-parse HEAD', { cwd: './pdf-reader' });
const { stdout } = await exec('git rev-parse HEAD', { cwd: modulePath });
const hash = stdout.trim();
if (!('pdf-reader' in signatures) || signatures['pdf-reader'].hash !== hash) {
const targetDir = 'build/resource/pdf-reader/';
const targetDir = path.join(__dirname, '..', 'build', 'resource', 'pdf-reader');
try {
const filename = hash + '.zip';
const tmpDir = 'tmp/builds/pdf-reader/';
const tmpDir = path.join(__dirname, '..', 'tmp', 'builds', 'pdf-reader');
const url = buildsURL + 'client-pdf-reader/' + filename;
await fs.remove(targetDir);
await fs.ensureDir(targetDir);
await fs.ensureDir(tmpDir);
await exec(
`mkdir -p ${tmpDir}`
+ `&& cd ${tmpDir}`
+ `&& (test -f ${filename} || curl -f ${url} -o ${filename})`
+ `&& rm -rf ../../../${targetDir}`
+ `&& mkdir -p ../../../${targetDir}`
+ `&& unzip -o ${filename} -d ../../../${targetDir}`
`cd ${tmpDir}`
+ ` && (test -f ${filename} || curl -f ${url} -o ${filename})`
+ ` && unzip ${filename} zotero/* -d ${targetDir}`
+ ` && mv ${path.join(targetDir, 'zotero', '*')} ${targetDir}`
);
await fs.remove(path.join(targetDir, 'zotero'));
}
catch (e) {
await exec('npm ci', { cwd: 'pdf-reader' });
await exec('npm run build', { cwd: 'pdf-reader' });
await fs.copy('pdf-reader/build/zotero', targetDir);
await exec('npm ci', { cwd: modulePath });
await exec('npm run build', { cwd: modulePath });
await fs.copy(path.join(modulePath, 'build', 'zotero'), targetDir);
}
signatures['pdf-reader'] = { hash };
}

28
scripts/pdf-worker.js
View file

@ -1,6 +1,7 @@
'use strict';
const fs = require('fs-extra');
const path = require('path');
const util = require('util');
const exec = util.promisify(require('child_process').exec);
const { getSignatures, writeSignatures, onSuccess, onError } = require('./utils');
@ -9,27 +10,32 @@ const { buildsURL } = require('./config');
async function getPDFWorker(signatures) {
const t1 = Date.now();
const { stdout } = await exec('git rev-parse HEAD', { cwd: 'pdf-worker' });
const modulePath = path.join(__dirname, '..', 'pdf-worker');
const { stdout } = await exec('git rev-parse HEAD', { cwd: modulePath });
const hash = stdout.trim();
if (!('pdf-worker' in signatures) || signatures['pdf-worker'].hash !== hash) {
const targetDir = 'build/chrome/content/zotero/xpcom/pdfWorker/';
const targetDir = path.join(__dirname, '..', 'build', 'chrome', 'content', 'zotero', 'xpcom', 'pdfWorker');
try {
const filename = hash + '.zip';
const tmpDir = 'tmp/builds/pdf-worker';
const tmpDir = path.join(__dirname, '..', 'tmp', 'builds', 'pdf-worker');
const url = buildsURL + 'client-pdf-worker/' + filename;
await fs.remove(targetDir);
await fs.ensureDir(targetDir);
await fs.ensureDir(tmpDir);
await exec(
`mkdir -p ${tmpDir}`
+ `&& cd ${tmpDir}`
+ `&& (test -f ${filename} || curl -f ${url} -o ${filename})`
+ `&& mkdir -p ../../../${targetDir}`
+ `&& unzip -o ${filename} -d ../../../${targetDir}`
`cd ${tmpDir}`
+ ` && (test -f ${filename} || curl -f ${url} -o ${filename})`
+ ` && unzip -o ${filename} -d ${targetDir}`
);
}
catch (e) {
await exec('npm ci', { cwd: 'pdf-worker' });
await exec('npm run build', { cwd: 'pdf-worker' });
await fs.copy('pdf-worker/build/worker.js', targetDir + 'worker.js');
await exec('npm ci', { cwd: modulePath });
await exec('npm run build', { cwd: modulePath });
await fs.copy(path.join(modulePath, 'build', 'worker.js'), path.join(targetDir, 'worker.js'));
}
signatures['pdf-worker'] = { hash };
}