Skip to content

Improve the compatibility of setExtra #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jiaojiaodubai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve the compatibility of setExtra #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 48 additions & 12 deletions src/translation/translate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ Zotero.Translate.Sandbox = {
}

const allowedObjects = [
"setExtra",
"complete",
"attachments",
"creators",
Expand Down Expand Up @@ -333,14 +334,16 @@ Zotero.Translate.Sandbox = {
try {
item = item.wrappedJSObject ? item.wrappedJSObject : item;
if(arg1 == "itemDone") {
Object.defineProperty(
item,
"complete",
{
value: translate._sandboxZotero.Item.prototype.complete,
enumerable: false,
}
);
for (let methodName of ["setExtra", "complete"]) {
Object.defineProperty(
item,
methodName,
{
value: translate._sandboxZotero.Item.prototype[methodName],
enumerable: false,
}
);
}
}
arg2(obj, item);
} catch(e) {
Expand Down Expand Up @@ -1976,13 +1979,46 @@ Zotero.Translate.Base.prototype = {
}

setExtra(field, value) {
if (typeof value !== 'string' || value === '') {
return;
}
let lines = String(this.extra || '').split('\n');
let existingIndex = lines.findIndex(line => line.startsWith(field + ': '));
if (existingIndex !== -1) {
lines[existingIndex] = `${field}: ${value}`;
function normalize(str) {
return str
.replace(/^[a-z]/i, (m) => m.toUpperCase())
.replace(/(_|-)([a-z])/ig, (_, m) => m.toUpperCase())
.replace(/([^A-Z])([A-Z])/g, '$1 $2');
}
let normalizedField = normalize(field);

// Put CSL name fields at the top
if (Object.values(Zotero.Schema.CSL_NAME_MAPPINGS).some((creatorType) => {
return [normalize(creatorType), normalize(`original-${creatorType}`)].includes(normalizedField);
})) {
lines.unshift(`${field}: ${value}`);
}
else {
lines.push(`${field}: ${value}`);
let existingIndex = lines.findIndex((line) => {
const match = line.match(/^(.+?): /);
return match && match[1] && normalize(match[1]) == normalizedField
? true
: false;
});
if (existingIndex !== -1) {
lines[existingIndex] = `${field}: ${value}`;
}
else {
// Put CSL text fields and date fields at the top
if ([
...Zotero.Schema.CSL_TEXT_MAPPINGS,
...Zotero.Schema.CSL_DATE_MAPPINGS
].some(fieldName => normalize(fieldName) == normalizedField)) {
lines.unshift(`${field}: ${value}`);
}
else {
lines.push(`${field}: ${value}`);
}
}
}
this.extra = lines.join('\n');
}
Expand Down