open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import/export order

Browse Source
This commit is contained in:
tophf 2022-01-24 04:03:37 +03:00
parent 7858fb06aa
commit 53b59c8920
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
background/style-manager.js
View File

@ -173,6 +173,8 @@ const styleMan = (() => {
return res; return res;
}, },
getOrder: () => orderWrap.value,
/** @returns {Promise<StyleSectionsToApply>} */ /** @returns {Promise<StyleSectionsToApply>} */
async getSectionsByUrl(url, id, isInitialApply) { async getSectionsByUrl(url, id, isInitialApply) {
if (ready.then) await ready; if (ready.then) await ready;

19
manage/import-export.js
View File

@ -105,6 +105,7 @@ async function importFromString(jsonString) {
const oldStyles = Array.isArray(json) && json.length ? await API.styles.getAll() : []; const oldStyles = Array.isArray(json) && json.length ? await API.styles.getAll() : [];
const oldStylesById = new Map(oldStyles.map(style => [style.id, style])); const oldStylesById = new Map(oldStyles.map(style => [style.id, style]));
const oldStylesByName = new Map(oldStyles.map(style => [style.name.trim(), style])); const oldStylesByName = new Map(oldStyles.map(style => [style.name.trim(), style]));
const oldOrder = await API.styles.getOrder();
const items = []; const items = [];
const infos = []; const infos = [];
const stats = { const stats = {
@ -116,11 +117,14 @@ async function importFromString(jsonString) {
codeOnly: {names: [], ids: [], legend: 'importReportLegendUpdatedCode', dirty: true}, codeOnly: {names: [], ids: [], legend: 'importReportLegendUpdatedCode', dirty: true},
invalid: {names: [], legend: 'importReportLegendInvalid'}, invalid: {names: [], legend: 'importReportLegendInvalid'},
}; };
let order;
await Promise.all(json.map(analyze)); await Promise.all(json.map(analyze));
changeQueue.length = 0; changeQueue.length = 0;
changeQueue.time = performance.now(); changeQueue.time = performance.now();
(await API.styles.importMany(items)) (await API.styles.importMany(items))
.forEach((style, i) => updateStats(style, infos[i])); .forEach((style, i) => updateStats(style, infos[i]));
// TODO: set each style's order during import on-the-fly
await API.styles.setOrder(order);
return done(); return done();
function analyze(item, index) { function analyze(item, index) {
@ -168,6 +172,8 @@ async function importFromString(jsonString) {
async function analyzeStorage(storage) { async function analyzeStorage(storage) {
analyzePrefs(storage[prefs.STORAGE_KEY], prefs.knownKeys, prefs.values, true); analyzePrefs(storage[prefs.STORAGE_KEY], prefs.knownKeys, prefs.values, true);
delete storage[prefs.STORAGE_KEY]; delete storage[prefs.STORAGE_KEY];
order = storage.order;
delete storage.order;
if (!isEmptyObj(storage)) { if (!isEmptyObj(storage)) {
analyzePrefs(storage, Object.values(chromeSync.LZ_KEY), await chromeSync.getLZValues()); analyzePrefs(storage, Object.values(chromeSync.LZ_KEY), await chromeSync.getLZValues());
} }
@ -285,7 +291,7 @@ async function importFromString(jsonString) {
}; };
} }
function undo() { async function undo() {
const newIds = [ const newIds = [
...stats.metaAndCode.ids, ...stats.metaAndCode.ids,
...stats.metaOnly.ids, ...stats.metaOnly.ids,
@ -293,6 +299,8 @@ async function importFromString(jsonString) {
...stats.added.ids, ...stats.added.ids,
]; ];
let tasks = Promise.resolve(); let tasks = Promise.resolve();
// TODO: delete all deletable at once
// TODO: import all importable at once
for (const id of newIds) { for (const id of newIds) {
tasks = tasks.then(() => API.styles.delete(id)); tasks = tasks.then(() => API.styles.delete(id));
const oldStyle = oldStylesById.get(id); const oldStyle = oldStylesById.get(id);
@ -300,13 +308,13 @@ async function importFromString(jsonString) {
tasks = tasks.then(() => API.styles.importMany([oldStyle])); tasks = tasks.then(() => API.styles.importMany([oldStyle]));
} }
} }
// taskUI is superfast and updates style list only in this page, await tasks;
// which should account for 99.99999999% of cases, supposedly await API.styles.setOrder(oldOrder);
return tasks.then(() => messageBoxProxy.show({ await messageBoxProxy.show({
title: t('importReportUndoneTitle'), title: t('importReportUndoneTitle'),
contents: newIds.length + ' ' + t('importReportUndone'), contents: newIds.length + ' ' + t('importReportUndone'),
buttons: [t('confirmClose')], buttons: [t('confirmClose')],
})); });
} }
function bindClick() { function bindClick() {
@ -344,6 +352,7 @@ async function exportToFile(e) {
const data = [ const data = [
Object.assign({ Object.assign({
[prefs.STORAGE_KEY]: prefs.values, [prefs.STORAGE_KEY]: prefs.values,
order: await API.styles.getOrder(),
}, await chromeSync.getLZValues()), }, await chromeSync.getLZValues()),
...(await API.styles.getAll()).map(cleanupStyle), ...(await API.styles.getAll()).map(cleanupStyle),
]; ];