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

Temporarily disable folder import #2862

Browse source
This commit is contained in:
Tom Najdek 2023-03-22 11:49:00 +01:00
parent fc572ba2a6
commit 01611cbb07
No known key found for this signature in database
GPG key ID: EEC61A7B4C667D77
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
chrome/content/zotero/import/folderImport.js
View file

@ -40,20 +40,9 @@ const findCollection = (libraryID, parentCollectionID, collectionName) => {
return collections.find(c => c.name === collectionName);
};
// @TODO
const findItemByHash = async (libraryID, hash) => {
let items = (await Zotero.Relations.getByPredicateAndObject('item', 'zotero:attachmentHash', hash))
.filter(item => item.libraryID == libraryID && !item.deleted && item.isTopLevelItem());
if (!items.length) {
items = (await Zotero.Relations.getByPredicateAndObject('item', 'zotero:fileHash', hash))
.filter(item => item.libraryID == libraryID && !item.deleted && item.isTopLevelItem());
}
if (!items.length) {
return null;
}
return items[0];
return null;
};
class Zotero_Import_Folder { // eslint-disable-line camelcase,no-unused-vars
@ -92,6 +81,8 @@ class Zotero_Import_Folder { // eslint-disable-line camelcase,no-unused-vars
}
async translate({ collections = [], linkFiles = false } = {}) {
// https://github.com/zotero/zotero/pull/2862#discussion_r1141324302
throw new Error('Folder import is not supported yet');
const libraryID = this.libraryID || Zotero.Libraries.userLibraryID;
const files = await collectFilesRecursive(this.folder);
@ -201,7 +192,7 @@ class Zotero_Import_Folder { // eslint-disable-line camelcase,no-unused-vars
}
if (attachmentItem && !Zotero.RecognizePDF.canRecognize(attachmentItem)) {
attachmentItem.setRelations({ 'zotero:fileHash': hash });
// @TODO: store hash of an item that cannot be recognized
await attachmentItem.saveTx({ skipSelect: true });
attachmentItem = null;
}
@ -225,13 +216,13 @@ class Zotero_Import_Folder { // eslint-disable-line camelcase,no-unused-vars
if (status === Zotero.ProgressQueue.ROW_SUCCEEDED) {
const recognizedItem = updatedItem.parentItem;
if (recognizedItem && id in attachmentItemHashLookup) {
recognizedItem.setRelations({ 'zotero:attachmentHash': attachmentItemHashLookup[id] });
// @TODO: Store hash of an attachment (attachmentItemHashLookup[id]) for this recognized item
itemsToSavePostRecognize.push(recognizedItem);
}
}
if (status === Zotero.ProgressQueue.ROW_FAILED) {
if (updatedItem && id in attachmentItemHashLookup) {
updatedItem.setRelations({ 'zotero:fileHash': attachmentItemHashLookup[id] });
// @TODO: Store hash of a file that failed to be recognized (attachmentItemHashLookup[id])
itemsToSavePostRecognize.push(updatedItem);
}
}

4
chrome/content/zotero/import/importWizard.xhtml
View file

@ -18,7 +18,9 @@
<wizardpage pageid="page-start" data-header-label-id="import-where-from">
<radiogroup id="import-source-group" align="start">
<radio value="file" data-l10n-id="import-source-file" />
<radio value="folder" data-l10n-id="import-source-folder" />
<!-- @TODO
<radio value="folder" data-l10n-id="import-source-folder" />
-->
<radio value="mendeleyOnline" data-l10n-id="import-source-online"
data-l10n-args='{"targetApp": "Mendeley Reference Manager"}' />
</radiogroup>

4
test/tests/folderImportTest.js
View file

@ -45,6 +45,8 @@ describe('Zotero_Import_Folder', function () {
describe('#import', () => {
it('should import PDFs from a folder and recreate structure without creating duplicates', async function () {
// @TODO: re-enable when folder import is ready
this.skip();
this.timeout(30000);
if (Zotero.automatedTest) {
this.skip();
@ -104,6 +106,8 @@ describe('Zotero_Import_Folder', function () {
});
it('should only import specified file types from a folder', async function () {
// @TODO: re-enable when folder import is ready
this.skip();
this.timeout(30000);
if (Zotero.automatedTest) {
this.skip();