Skip to content

Commit 745d541

Browse files
removing dead code and comments
1 parent 4a0d45b commit 745d541

File tree

12 files changed

+49836
-283
lines changed

12 files changed

+49836
-283
lines changed

index.js

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ let g_online_data_url =
4343
const Enum = require('./enum')
4444
const helper = require('./helper')
4545
const sd_tab = require('./utility/tab/sd')
46-
// let g_sdapi_path = 'sdapi_py_re'
47-
// const sdapi = require(`./${g_sdapi_path}`)
46+
4847
const sdapi = require('./sdapi_py_re')
4948

5049
// const exportHelper = require('./export_png')
@@ -871,7 +870,6 @@ async function deleteTempInpaintMaskLayer() {
871870
}
872871
//REFACTOR: move to ui.js
873872
async function postModeSelection() {
874-
//
875873
try {
876874
if (g_sd_mode === generationMode['Inpaint']) {
877875
//check if the we already have created a mask layer
@@ -1214,34 +1212,6 @@ function selectTool() {
12141212
//rectanglemarquee
12151213
// await require('photoshop').core.executeAsModal(newNormalLayer);
12161214
}
1217-
//Refactor: Delete testServerPath() method
1218-
async function testServerPath() {
1219-
// const serverPath = "https://api.github.com/users/abdullah"
1220-
1221-
try {
1222-
// const serverPath = 'https://api.weather.gov/points/123.4,342.5'
1223-
// const serverPath = 'https://api.github.com/users/abdullah'
1224-
// const serverPath = "https://api.coindesk.com/v1/bpi/currentprice.json"
1225-
// const serverPath = "http://127.0.0.1:3000"
1226-
// const serverPath = "http://localhost:3000"
1227-
const serverPath = 'http://127.0.0.1:8000/txt2img/random%20prompt'
1228-
// const serverPath = "https://3330-37-106-100-102.eu.ngrok.io"
1229-
console.log('testServerPath function was called')
1230-
1231-
let response = await fetch(serverPath)
1232-
console.log('testServerPath finished fetch')
1233-
1234-
if (!response.ok) {
1235-
throw new Error(
1236-
`HTTP error fetching weather station; status: ${response.status}`
1237-
)
1238-
}
1239-
let stationJson = await response.json()
1240-
console.dir(stationJson)
1241-
} catch (err) {
1242-
console.error('testServerPath error: ' + err.message)
1243-
}
1244-
}
12451215

12461216
// User picks an image file
12471217
// open a explorer for user to select a image file
@@ -2465,7 +2435,7 @@ async function easyModeGenerate(mode) {
24652435

24662436
if (g_generation_session.isActive()) {
24672437
//active session
2468-
//
2438+
24692439
if (g_generation_session.mode !== mode) {
24702440
//active session but it's a new mode
24712441

@@ -2904,7 +2874,7 @@ async function progressRecursive() {
29042874
if (g_generation_session.sudo_timer_id) {
29052875
//for sudo timer update
29062876
//for controlnet only: disable the sudo timer when the real timer start
2907-
// debugger
2877+
//
29082878
if (progress_value > 1) {
29092879
//disable the sudo timer at the end of the generation
29102880
g_generation_session.sudo_timer_id = clearInterval(
@@ -4001,7 +3971,6 @@ async function deleteNoneSelected(viewer_objects) {
40013971
g_viewer_manager.pathToViewerImage = {}
40023972
g_viewer_manager.initImageLayersJson = {}
40033973
g_viewer_manager.outputImages = []
4004-
//
40053974

40063975
g_generation_session.image_paths_to_layers = {}
40073976
})

main/dist/all.bundle.js

Lines changed: 49816 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

outpaint.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,6 @@ async function outpaintExe(session_id) {
277277

278278
await psapi.reSelectMarqueeExe(selectionInfo)
279279

280-
// await psapi.silentSetInitImageMask(snapshotMaskGroup,session_id)
281-
282280
const mask_name = mask_info['name']
283281
const mask_path = `./server/python_server/init_images/${mask_name}`
284282
await psapi.reSelectMarqueeExe(selectionInfo)
@@ -332,7 +330,6 @@ async function outpaintExe(session_id) {
332330
}
333331

334332
async function inpaintFasterExe(session_id) {
335-
//
336333
//create a snapshot of canvas
337334
//select opaque pixel and create black fill layer
338335
//create a snapshot of mask
@@ -432,7 +429,7 @@ async function inpaintFasterExe(session_id) {
432429
// await psapi.selectLayers([snapshotGroup])
433430

434431
await psapi.selectLayers([maskGroup])
435-
// await psapi.silentSetInitImageMask(maskGroup,session_id)
432+
436433
const mask_info = await psapi.silentSetInitImageMask(
437434
maskGroup,
438435
session_id

psapi.js

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -906,96 +906,6 @@ async function silentSetInitImageMask(layer, session_id) {
906906
console.error(`psapi.js setInitImageMask error: `, e)
907907
}
908908
}
909-
async function setInitImage(layer, session_id) {
910-
try {
911-
const html_manip = require('./utility/html_manip')
912-
// const layer = await app.activeDocument.activeLayers[0]
913-
const old_name = layer.name
914-
915-
// image_name = await app.activeDocument.activeLayers[0].name
916-
917-
//convert layer name to a file name
918-
let image_name = layerNameToFileName(old_name, layer.id, session_id)
919-
image_name = `${image_name}.png`
920-
921-
//the width and height of the exported image
922-
const width = html_manip.getWidth()
923-
const height = html_manip.getHeight()
924-
const image_buffer = await newExportPng(
925-
layer,
926-
image_name,
927-
width,
928-
height
929-
)
930-
const base64_image = _arrayBufferToBase64(image_buffer) //convert the buffer to base64
931-
//send the base64 to the server to save the file in the desired directory
932-
await sdapi.requestSavePng(base64_image, image_name)
933-
934-
g_init_image_name = image_name
935-
console.log(image_name)
936-
937-
const image_src = await sdapi.getInitImage(g_init_image_name)
938-
let ini_image_element = document.getElementById('init_image')
939-
ini_image_element.src = image_src
940-
const path = `${g_init_images_dir}/${image_name}`
941-
942-
g_generation_session.base64initImages[path] = base64_image
943-
g_generation_session.activeBase64InitImage =
944-
g_generation_session.base64initImages[path]
945-
946-
const init_src = base64ToSrc(g_generation_session.activeBase64InitImage)
947-
html_manip.setInitImageSrc(init_src)
948-
949-
return (image_info = { name: image_name, base64: base64_image })
950-
} catch (e) {
951-
console.error(`psapi.js setInitImage error:, ${e}`)
952-
}
953-
}
954-
async function setInitImageMask(layer, session_id) {
955-
try {
956-
const html_manip = require('./utility/html_manip')
957-
958-
// const layer = await app.activeDocument.activeLayers[0]
959-
const old_name = layer.name
960-
961-
//get the active layer name
962-
// image_name = await app.activeDocument.activeLayers[0].name
963-
// image_name = layerNameToFileName(old_name,layer.id,random_session_id)
964-
image_name = layerNameToFileName(old_name, layer.id, session_id)
965-
image_name = `${image_name}.png`
966-
const width = html_manip.getWidth()
967-
const height = html_manip.getHeight()
968-
image_buffer = await newExportPng(layer, image_name, width, height)
969-
g_init_image_mask_name = image_name // this is the name we will send to the server
970-
// g_init_mask_layer = layer
971-
// g_mask_related_layers = {}
972-
973-
console.log(image_name)
974-
base64_image = _arrayBufferToBase64(image_buffer) //convert the buffer to base64
975-
//send the base64 to the server to save the file in the desired directory
976-
await sdapi.requestSavePng(base64_image, image_name)
977-
978-
const image_src = await sdapi.getInitImage(g_init_image_mask_name) // we should replace this with getInitImagePath which return path to local disk
979-
const ini_image_mask_element =
980-
document.getElementById('init_image_mask')
981-
ini_image_mask_element.src = image_src
982-
ini_image_mask_element.dataset.layer_id = layer.id
983-
984-
const path = `${g_init_images_dir}/${image_name}`
985-
g_generation_session.base64maskImage[path] = base64_image
986-
g_generation_session.activeBase64MaskImage =
987-
g_generation_session.base64maskImage[path]
988-
//create viewer init image obj
989-
{
990-
}
991-
// return image_name
992-
const mask_src = base64ToSrc(g_generation_session.activeBase64MaskImage)
993-
html_manip.setInitImageMaskSrc(mask_src)
994-
return (image_info = { name: image_name, base64: base64_image })
995-
} catch (e) {
996-
console.error(`psapi.js setInitImageMask error: `, e)
997-
}
998-
}
999909

1000910
// remove the generated mask related layers from the canvas and "layers" panel
1001911

@@ -1568,8 +1478,6 @@ module.exports = {
15681478
snapshot_layerExe,
15691479
fillAndGroupExe,
15701480
fastSnapshot,
1571-
setInitImage,
1572-
setInitImageMask,
15731481

15741482
layerToFileName,
15751483
layerNameToFileName,

0 commit comments

Comments
 (0)