UniqueSoft
/
DweebUI
mirror of https://github.com/lllllllillllllillll/DweebUI
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added alerts for duplicate templates or apps

This commit is contained in:
lllllllillllllillll 2024-05-15 18:47:58 -07:00
parent eda852b89e
commit 2d08e9fa3b
4 changed files with 51 additions and 5942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
controllers/apps.js
View File

@ -1,4 +1,4 @@
import { readFileSync, readdirSync, renameSync, mkdirSync, unlinkSync, read } from 'fs';
import { readFileSync, readdirSync, renameSync, mkdirSync, unlinkSync, read, existsSync } from 'fs';
import { parse } from 'yaml';
import multer from 'multer';
import AdmZip from 'adm-zip';
@ -468,6 +468,15 @@ export const Upload = (req, res) => {
</div>
<a class="btn-close" data-bs-dismiss="alert" aria-label="close" style="padding-top: 0.5rem;"></a>
</div>`;
let exists_alert = `<div class="alert alert-danger alert-dismissible mb-0 py-2" role="alert">
<div class="d-flex">
<div><svg xmlns="http://www.w3.org/2000/svg" class="icon alert-icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M5 12l5 5l10 -10"></path></svg> </div>
<div>Template already exists</div>
</div>
<a class="btn-close" data-bs-dismiss="alert" aria-label="close" style="padding-top: 0.5rem;"></a>
</div>`;
let files = readdirSync('templates/tmp/');
@ -477,21 +486,39 @@ export const Upload = (req, res) => {
zip.extractAllTo('templates/compose', true);
unlinkSync(`templates/tmp/${files[i]}`);
} else if (files[i].endsWith('.json')) {
if (existsSync(`templates/json/${files[i]}`)) {
unlinkSync(`templates/tmp/${files[i]}`);
alert = exists_alert;
res.redirect('/apps');
return;
}
renameSync(`templates/tmp/${files[i]}`, `templates/json/${files[i]}`);
} else if (files[i].endsWith('.yml')) {
let compose = readFileSync(`templates/tmp/${files[i]}`, 'utf8');
let compose_data = parse(compose);
let service_name = Object.keys(compose_data.services)
let service_name = Object.keys(compose_data.services);
if (existsSync(`templates/compose/${service_name}`)) {
unlinkSync(`templates/tmp/${files[i]}`);
alert = exists_alert;
res.redirect('/apps');
return;
}
mkdirSync(`templates/compose/${service_name}`);
renameSync(`templates/tmp/${files[i]}`, `templates/compose/${service_name}/compose.yaml`);
} else if (files[i].endsWith('.yaml')) {
let compose = readFileSync(`templates/tmp/${files[i]}`, 'utf8');
let compose_data = parse(compose);
let service_name = Object.keys(compose_data.services)
let service_name = Object.keys(compose_data.services);
if (existsSync(`templates/compose/${service_name}`)) {
unlinkSync(`templates/tmp/${files[i]}`);
alert = exists_alert;
res.redirect('/apps');
return;
}
mkdirSync(`templates/compose/${service_name}`);
renameSync(`templates/tmp/${files[i]}`, `templates/compose/${service_name}/compose.yaml`);
} else {
console.log('Unsupported file type');
// unsupported file type
unlinkSync(`templates/tmp/${files[i]}`);
}
}

5930
templates/json/templates-bak.json
View File

File diff suppressed because it is too large Load Diff

26
utils/install.js
View File

@ -1,4 +1,4 @@
import { writeFileSync, mkdirSync, readFileSync } from "fs";
import { writeFileSync, mkdirSync, readFileSync, readdirSync } from "fs";
import yaml from 'js-yaml';
import { execSync } from "child_process";
import { docker } from "../server.js";
@ -10,12 +10,23 @@ import { addAlert } from "../controllers/dashboard.js";
export const Install = async (req, res) => {
let data = req.body;
let name = data.name;
let containers = await docker.listContainers({ all: true });
for (let i = 0; i < containers.length; i++) {
if (containers[i].Names[0].includes(name)) {
addAlert(req.session, 'danger', `App ${name} already exists. Please remove it first.`);
res.redirect('/');
return;
}
}
if (req.body.compose) {
let app = req.body.app;
writeFileSync(`./templates/compose/${app}/compose.yaml`, req.body.compose, function (err) { console.log(err) });
let compose = new DockerodeCompose(docker, `./templates/compose/${app}/compose.yaml`, `${app}`);
addAlert(req.session, 'success', `Installing ${app}. It should appear on the dashboard shortly.`);
writeFileSync(`./templates/compose/${name}/compose.yaml`, req.body.compose, function (err) { console.log(err) });
let compose = new DockerodeCompose(docker, `./templates/compose/${name}/compose.yaml`, `${name}`);
addAlert(req.session, 'success', `Installing ${name}. It should appear on the dashboard shortly.`);
try {
(async () => {
await compose.pull();
@ -40,7 +51,7 @@ export const Install = async (req, res) => {
}
} else {
let { service_name, name, image, command_check, command, net_mode, restart_policy } = data;
let { service_name, image, command_check, command, net_mode, restart_policy } = data;
let { port0, port1, port2, port3, port4, port5 } = data;
let { volume0, volume1, volume2, volume3, volume4, volume5 } = data;
let { env0, env1, env2, env3, env4, env5, env6, env7, env8, env9, env10, env11 } = data;
@ -196,8 +207,9 @@ export const Install = async (req, res) => {
}
}
try {
mkdirSync(`./appdata/${name}`, { recursive: true });
writeFileSync(`./appdata/${name}/docker-compose.yml`, compose_file, function (err) { console.log(err) });
var compose = new DockerodeCompose(docker, `./appdata/${name}/docker-compose.yml`, `${name}`);

2
views/modals/compose.html
View File

@ -13,7 +13,7 @@
<form action="/install" name="FormId_install" id="FormId_install" method="POST">
<input type="hidden" name="app" value="AppName"/>
<input type="hidden" name="name" value="AppName"/>
<textarea class="form-control" name="compose" rows="30" placeholder="Content..">COMPOSE_CONTENT</textarea>
</form>