From 69e47e8cf243063d3d7f2749ede3283cbd022d6f Mon Sep 17 00:00:00 2001 From: Abdullah Alfaraj Date: Wed, 15 Mar 2023 06:14:04 +0300 Subject: [PATCH] refactor getHistoryMetadata --- index.js | 32 +++----------------------------- utility/tab/history_tab.js | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 utility/tab/history_tab.js diff --git a/index.js b/index.js index ff3b51a..44098a4 100644 --- a/index.js +++ b/index.js @@ -46,6 +46,8 @@ const note = require('./utility/notification') const sampler_data = require('./utility/sampler') const settings_tab = require('./utility/tab/settings') const control_net = require('./utility/tab/control_net') +//load tabs +const history_tab = require('./utility/tab/history_tab') let g_horde_generator = new horde_native.hordeGenerator() let g_automatic_status = Enum.AutomaticStatusEnum['Offline'] @@ -3875,7 +3877,7 @@ document img_container, 'svg_sp_btn', 'copy metadata to settings', - getHistoryMetadata, + history_tab.getHistoryMetadata, img ) thumbnail.Thumbnail.addSPButtonToContainer( @@ -3892,35 +3894,7 @@ document console.warn(`loadHistory warning: ${e}`) } }) -//REFACTOR: move to document.js -function getHistoryMetadata(img) { - //auto fill the ui with metadata - const metadata_json = JSON.parse(img.dataset.metadata_json_string) - console.log('metadata_json: ', metadata_json) - // document.querySelector('#tiSeed').value = metadata_json.Seed - //extract auto_metadata into the preset metadata - function convertAutoMetadataToPresset(metadata_json) { - metadata_json['seed'] = metadata_json?.auto_metadata?.Seed - } - convertAutoMetadataToPresset(metadata_json) - - const b_use_original_prompt = settings_tab.getUseOriginalPrompt() - if (b_use_original_prompt) { - metadata_json['prompt'] = metadata_json?.original_prompt - ? metadata_json['original_prompt'] - : metadata_json['prompt'] - - metadata_json['negative_prompt'] = - metadata_json?.original_negative_prompt - ? metadata_json['original_negative_prompt'] - : metadata_json['negative_prompt'] - } - document.querySelector('#historySeedLabel').textContent = - metadata_json?.seed - - g_ui_settings_object.autoFillInSettings(metadata_json) -} //REFACTOR: move to document.js async function moveHistoryImageToLayer(img) { let image_path = img.dataset.path diff --git a/utility/tab/history_tab.js b/utility/tab/history_tab.js new file mode 100644 index 0000000..2687980 --- /dev/null +++ b/utility/tab/history_tab.js @@ -0,0 +1,35 @@ +const settings_tab = require('./utility/tab/settings') + +//REFACTORED: moved to history_tab.js +function getHistoryMetadata(img) { + //auto fill the ui with metadata + const metadata_json = JSON.parse(img.dataset.metadata_json_string) + console.log('metadata_json: ', metadata_json) + // document.querySelector('#tiSeed').value = metadata_json.Seed + + //extract auto_metadata into the preset metadata + function convertAutoMetadataToPresset(metadata_json) { + metadata_json['seed'] = metadata_json?.auto_metadata?.Seed + } + convertAutoMetadataToPresset(metadata_json) + + const b_use_original_prompt = settings_tab.getUseOriginalPrompt() + if (b_use_original_prompt) { + metadata_json['prompt'] = metadata_json?.original_prompt + ? metadata_json['original_prompt'] + : metadata_json['prompt'] + + metadata_json['negative_prompt'] = + metadata_json?.original_negative_prompt + ? metadata_json['original_negative_prompt'] + : metadata_json['negative_prompt'] + } + document.querySelector('#historySeedLabel').textContent = + metadata_json?.seed + + g_ui_settings_object.autoFillInSettings(metadata_json) +} + +module.exports = { + getHistoryMetadata, +}