simplify uuidIndex and setOrder
This commit is contained in:
tophf
parent
264518a5c4
commit
95869d0337
|
|
@ -26,6 +26,7 @@ const styleMan = (() => {
|
|||
Object.assign(styleUtil, {
|
||||
id2style,
|
||||
handleSave,
|
||||
uuid2style,
|
||||
});
|
||||
|
||||
//#region Declarations
|
||||
|
|
@ -66,16 +67,16 @@ const styleMan = (() => {
|
|||
const DELETE_IF_NULL = ['id', 'customName', 'md5Url', 'originalMd5'];
|
||||
const INJ_ORDER = 'injectionOrder';
|
||||
const order = {main: {}, prio: {}};
|
||||
const orderForDb = {
|
||||
const orderWrap = {
|
||||
id: INJ_ORDER,
|
||||
value: mapObj(order, () => []),
|
||||
_id: `${chrome.runtime.id}-${INJ_ORDER}`,
|
||||
get value() {
|
||||
return mapObj(order, group => sortObjectKeysByValue(group, id2uuid));
|
||||
},
|
||||
set value(val) {
|
||||
setOrderFromArray(val);
|
||||
},
|
||||
_rev: 0,
|
||||
};
|
||||
uuidIndex.custom = Object.defineProperty({}, INJ_ORDER, {
|
||||
get: () => orderWrap,
|
||||
set: setOrder,
|
||||
});
|
||||
/** @type {Promise|boolean} will be `true` to avoid wasting a microtask tick on each `await` */
|
||||
let ready = init();
|
||||
|
||||
|
|
@ -105,15 +106,21 @@ const styleMan = (() => {
|
|||
if (ready.then) await ready;
|
||||
const {style, appliesTo} = dataMap.get(id);
|
||||
const sync = reason !== 'sync';
|
||||
const uuid = style._id;
|
||||
db.styles.delete(id);
|
||||
if (sync) API.sync.delete(style._id, Date.now());
|
||||
if (sync) API.sync.delete(uuid, Date.now());
|
||||
for (const url of appliesTo) {
|
||||
const cache = cachedStyleForUrl.get(url);
|
||||
if (cache) delete cache.sections[id];
|
||||
}
|
||||
dataMap.delete(id);
|
||||
mapObj(order, val => delete val[id]);
|
||||
setOrder(orderForDb.value, {sync});
|
||||
uuidIndex.delete(uuid);
|
||||
mapObj(orderWrap.value, (group, type) => {
|
||||
delete order[type][id];
|
||||
const i = group.indexOf(uuid);
|
||||
if (i >= 0) group.splice(i, 1);
|
||||
});
|
||||
setOrder(orderWrap, {calc: false});
|
||||
if (style._usw && style._usw.token) {
|
||||
// Must be called after the style is deleted from dataMap
|
||||
API.usw.revoke(id);
|
||||
|
|
@ -155,7 +162,7 @@ const styleMan = (() => {
|
|||
/** @returns {Promise<Object<string,StyleObj[]>>}>} */
|
||||
async getAllOrdered() {
|
||||
if (ready.then) await ready;
|
||||
const res = mapObj(order, group => sortObjectKeysByValue(group, id2style));
|
||||
const res = mapObj(orderWrap.value, group => group.map(uuid2style));
|
||||
if (res.main.length + res.prio.length < dataMap.size) {
|
||||
for (const {style} of dataMap.values()) {
|
||||
if (!(style.id in order.main) && !(style.id in order.prio)) {
|
||||
|
|
@ -283,11 +290,9 @@ const styleMan = (() => {
|
|||
|
||||
save: saveStyle,
|
||||
|
||||
async setOrder(val) {
|
||||
async setOrder(value) {
|
||||
if (ready.then) await ready;
|
||||
return val &&
|
||||
!deepEqual(val, order) &&
|
||||
setOrder(val, {broadcast: true, sync: true});
|
||||
return setOrder({value}, {broadcast: true, sync: true});
|
||||
},
|
||||
|
||||
/** @returns {Promise<number>} style id */
|
||||
|
|
@ -331,8 +336,8 @@ const styleMan = (() => {
|
|||
}
|
||||
|
||||
/** @returns {?string} */
|
||||
function id2uuid(id) {
|
||||
return (id2style(id) || {})._id;
|
||||
function uuid2style(uuid) {
|
||||
return id2style(uuidIndex.get(uuid));
|
||||
}
|
||||
|
||||
/** @returns {StyleObj} */
|
||||
|
|
@ -505,12 +510,8 @@ const styleMan = (() => {
|
|||
if (updated.length) {
|
||||
await db.styles.putMany(updated);
|
||||
}
|
||||
setOrder(await orderPromise, {store: false});
|
||||
styles.forEach(storeInMap);
|
||||
Object.assign(orderForDb, await orderPromise);
|
||||
API.sync.registerDoc(orderForDb, doc => {
|
||||
Object.assign(orderForDb, doc);
|
||||
setOrder();
|
||||
});
|
||||
ready = true;
|
||||
bgReady._resolveStyles();
|
||||
}
|
||||
|
|
@ -718,29 +719,29 @@ const styleMan = (() => {
|
|||
return (num + 0x10000).toString(16).slice(-4) + (i >= 1 && i <= 4 ? '-' : '');
|
||||
}
|
||||
|
||||
async function setOrder(val, {broadcast, store = true, sync} = {}) {
|
||||
if (val) {
|
||||
setOrderFromArray(val);
|
||||
orderForDb._rev = Date.now();
|
||||
async function setOrder(data, {broadcast, calc = true, store = true, sync} = {}) {
|
||||
if (!data || !data.value || deepEqual(data.value, orderWrap.value)) {
|
||||
return;
|
||||
}
|
||||
Object.assign(orderWrap, data, sync && {_rev: Date.now()});
|
||||
if (calc) {
|
||||
for (const [type, group] of Object.entries(data.value)) {
|
||||
const dst = order[type] = {};
|
||||
group.forEach((uuid, i) => {
|
||||
const id = uuidIndex.get(uuid);
|
||||
if (id) dst[id] = i;
|
||||
});
|
||||
}
|
||||
}
|
||||
if (broadcast) {
|
||||
msg.broadcast({method: 'styleSort', order});
|
||||
}
|
||||
if (store) {
|
||||
await db.open(prefs.STORAGE_KEY).put(orderWrap);
|
||||
}
|
||||
if (sync) {
|
||||
API.sync.putDoc(orderWrap);
|
||||
}
|
||||
if (broadcast) msg.broadcast({method: 'styleSort', order});
|
||||
if (store) await db.open(prefs.STORAGE_KEY).put(orderForDb);
|
||||
if (sync) API.sync.putDoc(orderForDb);
|
||||
}
|
||||
|
||||
function setOrderFromArray(newOrder) {
|
||||
mapObj(order, (_, type) => {
|
||||
const res = order[type] = {};
|
||||
(newOrder && newOrder[type] || []).forEach((uid, i) => {
|
||||
const id = uuidIndex.get(uid);
|
||||
if (id) res[id] = i;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/** Since JS object's numeric keys are sorted in ascending order, we have to re-sort by value */
|
||||
function sortObjectKeysByValue(obj, map) {
|
||||
return Object.entries(obj).sort((a, b) => a[1] - b[1]).map(e => map(e[0]));
|
||||
}
|
||||
|
||||
//#endregion
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* global API msg */// msg.js
|
||||
/* global uuidIndex */// common.js
|
||||
/* global bgReady uuidIndex */// common.js
|
||||
/* global chromeLocal chromeSync */// storage-util.js
|
||||
/* global db */
|
||||
/* global iconMan */
|
||||
|
|
@ -30,13 +30,12 @@ const syncMan = (() => {
|
|||
errorMessage: null,
|
||||
login: false,
|
||||
};
|
||||
const customDocs = {};
|
||||
const compareRevision = (rev1, rev2) => rev1 - rev2;
|
||||
let lastError = null;
|
||||
let ctrl;
|
||||
let currentDrive;
|
||||
/** @type {Promise|boolean} will be `true` to avoid wasting a microtask tick on each `await` */
|
||||
let ready = prefs.ready.then(() => {
|
||||
let ready = bgReady.styles.then(() => {
|
||||
ready = true;
|
||||
prefs.subscribe('sync.enabled',
|
||||
(_, val) => val === 'none'
|
||||
|
|
@ -58,7 +57,6 @@ const syncMan = (() => {
|
|||
|
||||
async delete(_id, rev) {
|
||||
if (ready.then) await ready;
|
||||
uuidIndex.delete(_id);
|
||||
if (!currentDrive) return;
|
||||
schedule();
|
||||
return ctrl.delete(_id, rev);
|
||||
|
|
@ -84,22 +82,13 @@ const syncMan = (() => {
|
|||
}
|
||||
},
|
||||
|
||||
async putDoc({id, _id, _rev}) {
|
||||
async putDoc({_id, _rev}) {
|
||||
if (ready.then) await ready;
|
||||
uuidIndex.set(_id, id);
|
||||
if (!currentDrive) return;
|
||||
schedule();
|
||||
return ctrl.put(_id, _rev);
|
||||
},
|
||||
|
||||
registerDoc(doc, setter) {
|
||||
uuidIndex.set(doc._id, doc.id);
|
||||
Object.defineProperty(customDocs, doc.id, {
|
||||
get: () => doc,
|
||||
set: setter,
|
||||
});
|
||||
},
|
||||
|
||||
async setDriveOptions(driveName, options) {
|
||||
const key = `secure/sync/driveOptions/${driveName}`;
|
||||
await chromeSync.setValue(key, options);
|
||||
|
|
@ -192,19 +181,17 @@ const syncMan = (() => {
|
|||
async function initController() {
|
||||
await require(['/vendor/db-to-cloud/db-to-cloud.min']); /* global dbToCloud */
|
||||
ctrl = dbToCloud.dbToCloud({
|
||||
onGet(uuid) {
|
||||
return styleUtil.id2style(uuidIndex.get(uuid));
|
||||
},
|
||||
onGet: styleUtil.uuid2style,
|
||||
async onPut(doc) {
|
||||
const id = uuidIndex.get(doc._id);
|
||||
const oldCust = customDocs[id];
|
||||
const oldCust = uuidIndex.custom[id];
|
||||
const oldDoc = oldCust || styleUtil.id2style(id);
|
||||
const diff = oldDoc ? compareRevision(oldDoc._rev, doc._rev) : -1;
|
||||
if (!diff) return;
|
||||
if (diff > 0) {
|
||||
syncMan.putDoc(oldDoc);
|
||||
} else if (oldCust) {
|
||||
customDocs[id] = doc;
|
||||
uuidIndex.custom[id] = doc;
|
||||
} else {
|
||||
delete doc.id;
|
||||
if (id) doc.id = id;
|
||||
|
|
@ -215,13 +202,12 @@ const syncMan = (() => {
|
|||
onDelete(_id, rev) {
|
||||
const id = uuidIndex.get(_id);
|
||||
const oldDoc = styleUtil.id2style(id);
|
||||
if (oldDoc && compareRevision(oldDoc._rev, rev) <= 0) {
|
||||
uuidIndex.delete(id);
|
||||
return API.styles.delete(id, 'sync');
|
||||
}
|
||||
return oldDoc &&
|
||||
compareRevision(oldDoc._rev, rev) <= 0 &&
|
||||
API.styles.delete(id, 'sync');
|
||||
},
|
||||
async onFirstSync() {
|
||||
for (const i of Object.values(customDocs).concat(await API.styles.getAll())) {
|
||||
for (const i of Object.values(uuidIndex.custom).concat(await API.styles.getAll())) {
|
||||
ctrl.put(i._id, i._rev);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user