Profile controller refactor (#825)

* Add refresh function

* Create new ProfileController class
This commit is contained in:
toasted-nutbread 2020-09-13 18:42:37 -04:00 committed by GitHub
parent d7c3c87d99
commit 8b033a1650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 263 additions and 178 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019-2020 Yomichan Authors * Copyright (C) 2020 Yomichan Authors
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -18,44 +18,203 @@
/* global /* global
* ProfileConditionsUI * ProfileConditionsUI
* api * api
* utilBackgroundIsolate
*/ */
class ProfileController { class ProfileController {
constructor(settingsController) { constructor(settingsController) {
this._settingsController = settingsController; this._settingsController = settingsController;
this._profileConditionsUI = new ProfileConditionsUI(settingsController); this._profileConditionsUI = new ProfileConditionsUI(settingsController);
this._profileActiveSelect = null;
this._profileTargetSelect = null;
this._profileCopySourceSelect = null;
this._profileNameInput = null;
this._removeProfileNameElement = null;
this._profileRemoveButton = null;
this._profileCopyButton = null;
this._profileMoveUpButton = null;
this._profileMoveDownButton = null;
this._profileRemoveModal = null;
this._profileCopyModal = null;
this._optionsFull = null;
} }
async prepare() { async prepare() {
const {platform: {os}} = await api.getEnvironmentInfo(); const {platform: {os}} = await api.getEnvironmentInfo();
this._profileConditionsUI.os = os; this._profileConditionsUI.os = os;
$('#profile-target').change(this._onTargetProfileChanged.bind(this)); this._profileActiveSelect = document.querySelector('#profile-active');
$('#profile-name').change(this._onNameChanged.bind(this)); this._profileTargetSelect = document.querySelector('#profile-target');
$('#profile-add').click(this._onAdd.bind(this)); this._profileCopySourceSelect = document.querySelector('#profile-copy-source');
$('#profile-remove').click(this._onRemove.bind(this)); this._profileNameInput = document.querySelector('#profile-name');
$('#profile-remove-confirm').click(this._onRemoveConfirm.bind(this)); this._removeProfileNameElement = document.querySelector('#profile-remove-modal-profile-name');
$('#profile-copy').click(this._onCopy.bind(this)); this._profileRemoveButton = document.querySelector('#profile-remove');
$('#profile-copy-confirm').click(this._onCopyConfirm.bind(this)); this._profileCopyButton = document.querySelector('#profile-copy');
$('#profile-move-up').click(() => this._onMove(-1)); this._profileMoveUpButton = document.querySelector('#profile-move-up');
$('#profile-move-down').click(() => this._onMove(1)); this._profileMoveDownButton = document.querySelector('#profile-move-down');
$('.profile-form').find('input, select, textarea').not('.profile-form-manual').change(this._onInputChanged.bind(this)); this._profileRemoveModal = document.querySelector('#profile-remove-modal');
this._profileCopyModal = document.querySelector('#profile-copy-modal');
this._profileActiveSelect.addEventListener('change', this._onProfileActiveChange.bind(this), false);
this._profileTargetSelect.addEventListener('change', this._onProfileTargetChange.bind(this), false);
this._profileNameInput.addEventListener('change', this._onNameChanged.bind(this), false);
document.querySelector('#profile-add').addEventListener('click', this._onAdd.bind(this), false);
this._profileRemoveButton.addEventListener('click', this._onRemove.bind(this), false);
document.querySelector('#profile-remove-confirm').addEventListener('click', this._onRemoveConfirm.bind(this), false);
this._profileCopyButton.addEventListener('click', this._onCopy.bind(this), false);
document.querySelector('#profile-copy-confirm').addEventListener('click', this._onCopyConfirm.bind(this), false);
this._profileMoveUpButton.addEventListener('click', this._onMove.bind(this, -1), false);
this._profileMoveDownButton.addEventListener('click', this._onMove.bind(this, 1), false);
this._settingsController.on('optionsChanged', this._onOptionsChanged.bind(this)); this._settingsController.on('optionsChanged', this._onOptionsChanged.bind(this));
this._onOptionsChanged(); this._onOptionsChanged();
} }
// Private // Private
async _onOptionsChanged() { async _onOptionsChanged() {
const optionsFull = await this._settingsController.getOptionsFullMutable(); this._optionsFull = await this._settingsController.getOptionsFull();
this._formWrite(optionsFull);
this._profileConditionsUI.cleanup();
const {profiles, profileCurrent} = this._optionsFull;
const profileIndex = this._settingsController.profileIndex;
this._updateSelectOptions(this._profileActiveSelect);
this._updateSelectOptions(this._profileTargetSelect);
this._updateSelectOptions(this._profileCopySourceSelect, [profileIndex]);
this._profileActiveSelect.value = `${profileCurrent}`;
this._profileTargetSelect.value = `${profileIndex}`;
this._profileRemoveButton.disabled = (profiles.length <= 1);
this._profileCopyButton.disabled = (profiles.length <= 1);
this._profileMoveUpButton.disabled = (profileIndex <= 0);
this._profileMoveDownButton.disabled = (profileIndex >= profiles.length - 1);
if (profileIndex >= 0 && profileIndex < profiles.length) {
const currentProfile = profiles[profileIndex];
this._profileNameInput.value = currentProfile.name;
const {conditionGroups} = currentProfile;
this._profileConditionsUI.prepare(conditionGroups);
}
} }
_tryGetIntegerValue(selector, min, max) { _onProfileActiveChange(e) {
const value = parseInt($(selector).val(), 10); const max = this._optionsFull.profiles.length;
const value = this._tryGetIntegerValue(e.currentTarget.value, 0, max);
if (value === null) { return; }
this._settingsController.setGlobalSetting('profileCurrent', value);
}
_onProfileTargetChange(e) {
const max = this._optionsFull.profiles.length;
const value = this._tryGetIntegerValue(e.currentTarget.value, 0, max);
if (value === null) { return; }
this._settingsController.profileIndex = value;
}
_onNameChanged(e) {
const value = e.currentTarget.value;
const profileIndex = this._settingsController.profileIndex;
this._settingsController.setGlobalSetting(`profiles[${profileIndex}].name`, value);
this._updateSelectName(profileIndex, value);
}
_onAdd() {
this._addProfile();
}
_onRemove(e) {
if (e.shiftKey) {
return this._onRemoveConfirm();
}
if (this._optionsFull.profiles.length <= 1) { return; }
const profileIndex = this._settingsController.profileIndex;
const profile = this._optionsFull.profiles[profileIndex];
this._removeProfileNameElement.textContent = profile.name;
this._setModalVisible(this._profileRemoveModal, true);
}
_onRemoveConfirm() {
this._setModalVisible(this._profileRemoveModal, false);
if (this._optionsFull.profiles.length <= 1) { return; }
const profileIndex = this._settingsController.profileIndex;
this._removeProfile(profileIndex);
}
_onCopy() {
if (this._optionsFull.profiles.length <= 1) { return; }
const {profiles, profileCurrent} = this._optionsFull;
const profileIndex = this._settingsController.profileIndex;
let copyFromIndex = profileCurrent;
if (copyFromIndex === profileIndex) {
if (profileIndex !== 0) {
copyFromIndex = 0;
} else if (profiles.length > 1) {
copyFromIndex = 1;
}
}
this._profileCopySourceSelect.value = `${copyFromIndex}`;
this._setModalVisible(this._profileCopyModal, true);
}
_onCopyConfirm() {
this._setModalVisible(this._profileCopyModal, false);
const profileIndex = this._settingsController.profileIndex;
const max = this._optionsFull.profiles.length;
const index = this._tryGetIntegerValue('#profile-copy-source', 0, max);
if (index === null || index === profileIndex) { return; }
this._copyProfile(profileIndex, index);
}
_onMove(offset) {
const profileIndex = this._settingsController.profileIndex;
const max = this._optionsFull.profiles.length;
const profileIndexNew = Math.max(0, Math.min(max - 1, profileIndex + offset));
if (profileIndex === profileIndexNew) { return; }
this._swapProfiles(profileIndex, profileIndexNew);
}
_updateSelectOptions(select, disabled) {
const {profiles} = this._optionsFull;
const fragment = document.createDocumentFragment();
for (let i = 0; i < profiles.length; ++i) {
const profile = profiles[i];
const option = document.createElement('option');
option.value = `${i}`;
option.textContent = profile.name;
option.disabled = (Array.isArray(disabled) && disabled.includes(i));
fragment.appendChild(option);
}
select.textContent = '';
select.appendChild(fragment);
}
_updateSelectName(index, name) {
const selects = [
this._profileActiveSelect,
this._profileTargetSelect,
this._profileCopySourceSelect
];
const optionValue = `${index}`;
for (const select of selects) {
for (const option of select.querySelectorAll('option')) {
if (option.value === optionValue) {
option.textContent = name;
}
}
}
}
_tryGetIntegerValue(value, min, max) {
value = parseInt(value, 10);
return ( return (
typeof value === 'number' && typeof value === 'number' &&
Number.isFinite(value) && Number.isFinite(value) &&
@ -65,61 +224,6 @@ class ProfileController {
) ? value : null; ) ? value : null;
} }
async _formRead(optionsFull) {
const currentProfileIndex = this._settingsController.profileIndex;
const profile = optionsFull.profiles[currentProfileIndex];
// Current profile
const index = this._tryGetIntegerValue('#profile-active', 0, optionsFull.profiles.length);
if (index !== null) {
optionsFull.profileCurrent = index;
}
// Profile name
profile.name = $('#profile-name').val();
}
_formWrite(optionsFull) {
const currentProfileIndex = this._settingsController.profileIndex;
const profile = optionsFull.profiles[currentProfileIndex];
this._populateSelect($('#profile-active'), optionsFull.profiles, optionsFull.profileCurrent, null);
this._populateSelect($('#profile-target'), optionsFull.profiles, currentProfileIndex, null);
$('#profile-remove').prop('disabled', optionsFull.profiles.length <= 1);
$('#profile-copy').prop('disabled', optionsFull.profiles.length <= 1);
$('#profile-move-up').prop('disabled', currentProfileIndex <= 0);
$('#profile-move-down').prop('disabled', currentProfileIndex >= optionsFull.profiles.length - 1);
$('#profile-name').val(profile.name);
this._refreshProfileConditions(optionsFull);
}
_refreshProfileConditions(optionsFull) {
this._profileConditionsUI.cleanup();
const profileIndex = this._settingsController.profileIndex;
if (profileIndex < 0 || profileIndex >= optionsFull.profiles.length) { return; }
const {conditionGroups} = optionsFull.profiles[profileIndex];
this._profileConditionsUI.prepare(conditionGroups);
}
_populateSelect(select, profiles, currentValue, ignoreIndices) {
select.empty();
for (let i = 0; i < profiles.length; ++i) {
if (ignoreIndices !== null && ignoreIndices.indexOf(i) >= 0) {
continue;
}
const profile = profiles[i];
select.append($(`<option value="${i}">${profile.name}</option>`));
}
select.val(`${currentValue}`);
}
_createCopyName(name, profiles, maxUniqueAttempts) { _createCopyName(name, profiles, maxUniqueAttempts) {
let space, index, prefix, suffix; let space, index, prefix, suffix;
const match = /^([\w\W]*\(Copy)((\s+)(\d+))?(\)\s*)$/.exec(name); const match = /^([\w\W]*\(Copy)((\s+)(\d+))?(\)\s*)$/.exec(name);
@ -155,128 +259,105 @@ class ProfileController {
} }
} }
async _onInputChanged(e) { _getSwappedValue(currentValue, value1, value2) {
if (!e.originalEvent && !e.isTrigger) { if (currentValue === value1) { return value2; }
return; if (currentValue === value2) { return value1; }
return null;
} }
const optionsFull = await this._settingsController.getOptionsFullMutable(); _setModalVisible(node, visible) {
await this._formRead(optionsFull); $(node).modal(visible ? 'show' : 'hide');
await this._settingsController.save();
} }
async _onTargetProfileChanged() { async _addProfile() {
const optionsFull = await this._settingsController.getOptionsFullMutable(); const profileIndex = this._settingsController.profileIndex;
const currentProfileIndex = this._settingsController.profileIndex; const profiles = this._optionsFull.profiles;
const index = this._tryGetIntegerValue('#profile-target', 0, optionsFull.profiles.length); const profile = profiles[profileIndex];
if (index === null || currentProfileIndex === index) { const newProfile = clone(profile);
return; newProfile.name = this._createCopyName(profile.name, profiles, 100);
}
const index = profiles.length;
await this._settingsController.modifyGlobalSettings([{
action: 'splice',
path: 'profiles',
start: index,
deleteCount: 0,
items: [newProfile]
}]);
this._settingsController.profileIndex = index; this._settingsController.profileIndex = index;
} }
async _onAdd() { async _removeProfile(index) {
const optionsFull = await this._settingsController.getOptionsFullMutable(); const {profiles, profileCurrent} = this._optionsFull;
const currentProfileIndex = this._settingsController.profileIndex; let newProfileCurrent = profileCurrent;
const profile = utilBackgroundIsolate(optionsFull.profiles[currentProfileIndex]); const modifications = [{
profile.name = this._createCopyName(profile.name, optionsFull.profiles, 100); action: 'splice',
optionsFull.profiles.push(profile); path: 'profiles',
start: index,
deleteCount: 1,
items: []
}];
this._settingsController.profileIndex = optionsFull.profiles.length - 1; if (profileCurrent >= index) {
newProfileCurrent = Math.min(newProfileCurrent - 1, profiles.length - 1);
await this._settingsController.save(); modifications.push({
action: 'set',
path: 'profileCurrent',
value: newProfileCurrent
});
} }
async _onRemove(e) { const profileIndex = this._settingsController.profileIndex;
if (e.shiftKey) {
return await this._onRemoveConfirm();
}
const optionsFull = await this._settingsController.getOptionsFull(); await this._settingsController.modifyGlobalSettings(modifications);
if (optionsFull.profiles.length <= 1) {
return;
}
const currentProfileIndex = this._settingsController.profileIndex; if (profileIndex === index) {
const profile = optionsFull.profiles[currentProfileIndex]; this._settingsController.profileIndex = newProfileCurrent;
} else {
$('#profile-remove-modal-profile-name').text(profile.name); await this._onOptionsChanged();
$('#profile-remove-modal').modal('show'); }
} }
async _onRemoveConfirm() { async _swapProfiles(index1, index2) {
$('#profile-remove-modal').modal('hide'); const {profileCurrent} = this._optionsFull;
const optionsFull = await this._settingsController.getOptionsFullMutable(); const modifications = [{
if (optionsFull.profiles.length <= 1) { action: 'swap',
return; path1: `profiles[${index1}]`,
} path2: `profiles[${index2}]`
}];
const currentProfileIndex = this._settingsController.profileIndex;
optionsFull.profiles.splice(currentProfileIndex, 1); const newProfileCurrent = this._getSwappedValue(profileCurrent, index1, index2);
if (newProfileCurrent !== profileCurrent) {
if (currentProfileIndex >= optionsFull.profiles.length) { modifications.push({
this._settingsController.profileIndex = optionsFull.profiles.length - 1; action: 'set',
} path: 'profileCurrent',
value: newProfileCurrent
if (optionsFull.profileCurrent >= optionsFull.profiles.length) { });
optionsFull.profileCurrent = optionsFull.profiles.length - 1; }
}
const profileIndex = this._settingsController.profileIndex;
await this._settingsController.save(); const newProfileIndex = this._getSwappedValue(profileIndex, index1, index2);
}
await this._settingsController.modifyGlobalSettings(modifications);
_onNameChanged() {
const currentProfileIndex = this._settingsController.profileIndex; if (profileIndex !== newProfileIndex) {
$('#profile-active, #profile-target').find(`[value="${currentProfileIndex}"]`).text(this.value); this._settingsController.profileIndex = newProfileIndex;
} }
}
async _onMove(offset) {
const optionsFull = await this._settingsController.getOptionsFullMutable(); async _copyProfile(index, copyFromIndex) {
const currentProfileIndex = this._settingsController.profileIndex; const profiles = this._optionsFull.profiles;
const index = currentProfileIndex + offset; const copyFromProfile = profiles[copyFromIndex];
if (index < 0 || index >= optionsFull.profiles.length) { const options = clone(copyFromProfile.options);
return;
} await this._settingsController.modifyGlobalSettings([{
action: 'set',
const profile = optionsFull.profiles[currentProfileIndex]; path: `profiles[${index}].options`,
optionsFull.profiles.splice(currentProfileIndex, 1); value: options
optionsFull.profiles.splice(index, 0, profile); }]);
if (optionsFull.profileCurrent === currentProfileIndex) { await this._settingsController.refresh();
optionsFull.profileCurrent = index;
}
this._settingsController.profileIndex = index;
await this._settingsController.save();
}
async _onCopy() {
const optionsFull = await this._settingsController.getOptionsFullMutable();
if (optionsFull.profiles.length <= 1) {
return;
}
const currentProfileIndex = this._settingsController.profileIndex;
this._populateSelect($('#profile-copy-source'), optionsFull.profiles, currentProfileIndex === 0 ? 1 : 0, [currentProfileIndex]);
$('#profile-copy-modal').modal('show');
}
async _onCopyConfirm() {
$('#profile-copy-modal').modal('hide');
const optionsFull = await this._settingsController.getOptionsFullMutable();
const index = this._tryGetIntegerValue('#profile-copy-source', 0, optionsFull.profiles.length);
const currentProfileIndex = this._settingsController.profileIndex;
if (index === null || index === currentProfileIndex) {
return;
}
const profileOptions = utilBackgroundIsolate(optionsFull.profiles[index].options);
optionsFull.profiles[currentProfileIndex].options = profileOptions;
await this._settingsController.save();
} }
} }

View File

@ -47,6 +47,10 @@ class SettingsController extends EventDispatcher {
yomichan.on('optionsUpdated', this._onOptionsUpdated.bind(this)); yomichan.on('optionsUpdated', this._onOptionsUpdated.bind(this));
} }
async refresh() {
await this._onOptionsUpdatedInternal();
}
async save() { async save() {
await api.optionsSave(this._source); await api.optionsSave(this._source);
} }