Integrate actual images

This commit is contained in:
somebody
2022-12-26 22:54:51 -06:00
parent 2ee9ef8d23
commit 90bd7c8d71
2 changed files with 15 additions and 12 deletions

View File

@@ -9093,6 +9093,15 @@ def UI_2_set_commentator_image(commentator_id):
file.write(data)
return ":)"
@app.route("/image_db.json", methods=["GET"])
@logger.catch
def UI_2_get_image_db():
return send_file(os.path.join(koboldai_vars.save_paths.generated_images, "db.json"))
@app.route("/generated_images/<path:path>")
def UI_2_send_generated_images(path):
return send_from_directory(koboldai_vars.save_paths.generated_images, path)
@socketio.on("scratchpad_prompt")
@logger.catch
def UI_2_scratchpad_prompt(data):

View File

@@ -6932,7 +6932,7 @@ $el(".gametext").addEventListener("keydown", function(event) {
});
/* Screenshot */
(function() {
(async function() {
const screenshotTarget = $el("#screenshot-target");
const screenshotImagePicker = $el("#screenshot-image-picker");
const genImgToggle = $el("#sw-gen-img");
@@ -6947,19 +6947,13 @@ $el(".gametext").addEventListener("keydown", function(event) {
$(genImgToggle).bootstrapToggle();
function showScreenshotWizard() {
let imageUrls = [];
async function showScreenshotWizard() {
let imageData = await (await fetch("/image_db.json")).json();
for (let i=1;i<17;i++) {
let s = i.toString();
if (s.length === 1) s = "0"+s;
imageUrls.push(`/static/test/${s}.jpg`);
}
for (const imageSrc of imageUrls) {
for (const image of imageData) {
const imgContainer = $e("div", screenshotImagePicker, {classes: ["img-container"]});
const checkbox = $e("input", imgContainer, {type: "checkbox"});
const image = $e("img", imgContainer, {src: imageSrc, draggable: false});
const imageEl = $e("img", imgContainer, {src: `/generated_images/${image.fileName}`, draggable: false});
imgContainer.addEventListener("click", function(event) {
// TODO: Preventdefault if too many images selected and checked is false
@@ -7001,5 +6995,5 @@ $el(".gametext").addEventListener("keydown", function(event) {
}
$el("#sw-download").addEventListener("click", downloadScreenshot);
showScreenshotWizard();
await showScreenshotWizard();
})();