Fix integration

- Don't use sourceCode as "temporary" value as it's being used as legit value(consider that we delete it after it's non longer needed).
- Wrap the metadata into a `try {}` as some styles doesn't have any metadata.
This commit is contained in:
Gusted 2021-07-07 00:06:52 +02:00
parent 44b08dc089
commit bea5c7c7d8
No known key found for this signature in database
GPG Key ID: FD821B732837125F
2 changed files with 11 additions and 4 deletions

View File

@ -378,12 +378,18 @@ const styleMan = (() => {
for (const {style: someStyle} of dataMap.values()) {
if (someStyle._id === style._id) {
someStyle._isUswLinked = true;
someStyle.sourceCode = style.sourceCode;
const {metadata} = await API.worker.parseUsercssMeta(style.sourceCode);
someStyle.originialValue = style.sourceCode;
let metadata = {};
try {
const {metadata: tmpMetadata} = await API.worker.parseUsercssMeta(style.sourceCode);
metadata = tmpMetadata;
} catch (err) {
console.log(err);
}
someStyle.metadata = metadata;
} else {
delete someStyle._isUswLinked;
delete someStyle.sourceCode;
delete someStyle.originialValue;
delete someStyle.metadata;
}
handleSave(await saveStyle(someStyle), null, null, false);
@ -393,7 +399,7 @@ const styleMan = (() => {
};
delete style._isUswLinked;
delete style.sourceCode;
delete style.originialValue;
delete style.metadata;
for (const [k, v] of Object.entries(await retrieveStyleInformation(style._usw.token))) {
style._usw[k] = v;

View File

@ -19,6 +19,7 @@
if (location.pathname === '/api/oauth/style/new') {
API.styles.find({_isUswLinked: true}).then(style => {
style.sourceCode = style.originialValue;
sendPostMessage({type: 'usw-fill-new-style', data: style});
});
}