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

Merge: Remove spacing from annotation regex, delete external annotation items

Browse source 
- `/Subtype` isn't necessarily preceded or followed by a space
- Annotation items with `isExternal: true` are for display only and should be
  deleted on merge

https://forums.zotero.org/discussion/105960/external-annotations-ignored-when-merging
This commit is contained in:
Abe Jellinek 2023-07-11 11:12:58 -04:00
parent a0cdf11096
commit 2aa34a6346
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/data/item.js
View file

@ -3974,7 +3974,7 @@ Zotero.Item.prototype.hasEmbeddedAnnotations = async function () {
let contents = await Zotero.File.getContentsAsync(path); let contents = await Zotero.File.getContentsAsync(path);
// Check for "markup" annotations per the PDF spec // Check for "markup" annotations per the PDF spec
// https://opensource.adobe.com/dc-acrobat-sdk-docs/pdfstandards/PDF32000_2008.pdf, p. 390 // https://opensource.adobe.com/dc-acrobat-sdk-docs/pdfstandards/PDF32000_2008.pdf, p. 390
let re = /\s\/Subtype\s+\/(Text|FreeText|Line|Square|Circle|Polygon|PolyLine|Highlight|Underline|Squiggly|StrikeOut|Stamp|Caret|Ink|FileAttachment|Sound|Redact)\s/; let re = /\/Subtype\s*\/(Text|FreeText|Line|Square|Circle|Polygon|PolyLine|Highlight|Underline|Squiggly|StrikeOut|Stamp|Caret|Ink|FileAttachment|Sound|Redact)/;
return re.test(contents); return re.test(contents);
}; };

20
chrome/content/zotero/xpcom/data/items.js
View file

@ -956,11 +956,24 @@ Zotero.Items = function() {
if (fromItem.isFileAttachment()) { if (fromItem.isFileAttachment()) {
let annotations = fromItem.getAnnotations(includeTrashed); let annotations = fromItem.getAnnotations(includeTrashed);
for (let annotation of annotations) { for (let annotation of annotations) {
if (annotation.annotationIsExternal) {
await annotation.erase();
continue;
}
annotation.parentItemID = toItem.id; annotation.parentItemID = toItem.id;
await annotation.save(); await annotation.save();
} }
} }
if (toItem.isFileAttachment()) {
let annotations = toItem.getAnnotations(includeTrashed);
for (let annotation of annotations) {
if (annotation.annotationIsExternal) {
await annotation.erase();
}
}
}
// TODO: Other things as necessary // TODO: Other things as necessary
}; };
@ -1129,16 +1142,15 @@ Zotero.Items = function() {
} }
// Check whether master and other have embedded annotations // Check whether master and other have embedded annotations
// Master yes, other yes -> keep both
// Master yes, other no -> keep master
// Master no, other yes -> keep other
if (await otherAttachment.hasEmbeddedAnnotations()) { if (await otherAttachment.hasEmbeddedAnnotations()) {
// Other yes, master yes -> keep both
if (await masterAttachment.hasEmbeddedAnnotations()) { if (await masterAttachment.hasEmbeddedAnnotations()) {
Zotero.debug(`Master attachment ${masterAttachment.key} matches ${otherAttachment.key}, ` Zotero.debug(`Master attachment ${masterAttachment.key} matches ${otherAttachment.key}, `
+ 'but both have embedded annotations - keeping both'); + 'but both have embedded annotations - keeping both');
otherAttachment.parentItemID = item.id; otherAttachment.parentItemID = item.id;
await otherAttachment.save(); await otherAttachment.save();
} }
// Other yes, master no -> keep other
else { else {
Zotero.debug(`Master attachment ${masterAttachment.key} matches ${otherAttachment.key}, ` Zotero.debug(`Master attachment ${masterAttachment.key} matches ${otherAttachment.key}, `
+ 'but other has embedded annotations - merging into other'); + 'but other has embedded annotations - merging into other');
@ -1148,6 +1160,8 @@ Zotero.Items = function() {
} }
continue; continue;
} }
// Other no, master yes -> keep master
// Other no, master no -> keep master
Zotero.debug(`Master attachment ${masterAttachment.key} matches ${otherAttachment.key} - merging into master`); Zotero.debug(`Master attachment ${masterAttachment.key} matches ${otherAttachment.key} - merging into master`);
await doMerge(otherAttachment, masterAttachment); await doMerge(otherAttachment, masterAttachment);