rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add display version #280

Browse Source
This commit is contained in:
SillyLossy
2023-05-12 11:30:30 +03:00
parent afa7035632
commit d963d79d44
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.html
View File

@@ -1440,7 +1440,10 @@
<div class="drawer-icon fa-solid fa-face-smile closedIcon" title="User Settings"></div> <div class="drawer-icon fa-solid fa-face-smile closedIcon" title="User Settings"></div>
</div> </div>
<div id="user-settings-block" class="drawer-content closedDrawer"> <div id="user-settings-block" class="drawer-content closedDrawer">
<div class="flex-container wide100p alignitemscenter spaceBetween">
<h3>User Settings</h3> <h3>User Settings</h3>
<div id="version_display"></div>
</div>
<div class="flex-container spaceEvenly"> <div class="flex-container spaceEvenly">
<div name="UI Customization" class="flex-container drawer25pWidth"> <div name="UI Customization" class="flex-container drawer25pWidth">
<div class="ui-settings"> <div class="ui-settings">

10
public/script.js
View File

@@ -386,7 +386,15 @@ $(document).ajaxError(function myErrorHandler(_, xhr) {
async function getClientVersion() { async function getClientVersion() {
try { try {
const response = await fetch('/version'); const response = await fetch('/version');
CLIENT_VERSION = await response.text(); const data = await response.json();
CLIENT_VERSION = data.agent;
let displayVersion = `SillyTavern ${data.pkgVersion}`;
if (data.gitRevision && data.gitBranch) {
displayVersion += ` '${data.gitBranch}' (${data.gitRevision})`;
}
$('#version_display').text(displayVersion);
} catch (err) { } catch (err) {
console.log("Couldn't get client version", err); console.log("Couldn't get client version", err);
} }

9
public/style.css
View File

@@ -191,6 +191,11 @@ code {
transition: background-image 0.5s ease-in-out; transition: background-image 0.5s ease-in-out;
} }
#version_display {
padding: 5px;
opacity: 0.8;
}
#bg1 { #bg1 {
background-image: url('backgrounds/tavern day.jpg'); background-image: url('backgrounds/tavern day.jpg');
z-index: -2; z-index: -2;
@@ -3517,6 +3522,10 @@ toolcool-color-picker {
justify-content: space-evenly; justify-content: space-evenly;
} }
.spaceBetween {
justify-content: space-between;
}
.widthNatural { .widthNatural {
width: unset !important; width: unset !important;
min-width: unset !important; min-width: unset !important;

9
server.js
View File

@@ -308,7 +308,7 @@ app.get('/deviceinfo', function (request, response) {
return response.send(deviceInfo); return response.send(deviceInfo);
}); });
app.get('/version', function (_, response) { app.get('/version', function (_, response) {
let pkgVersion, gitRevision; let pkgVersion, gitRevision, gitBranch;
try { try {
const pkgJson = require('./package.json'); const pkgJson = require('./package.json');
pkgVersion = pkgJson.version; pkgVersion = pkgJson.version;
@@ -316,13 +316,18 @@ app.get('/version', function (_, response) {
gitRevision = require('child_process') gitRevision = require('child_process')
.execSync('git rev-parse --short HEAD', { cwd: __dirname }) .execSync('git rev-parse --short HEAD', { cwd: __dirname })
.toString().trim(); .toString().trim();
gitBranch = require('child_process')
.execSync('git rev-parse --abbrev-ref HEAD', { cwd: __dirname })
.toString().trim();
} }
} }
catch { catch {
// suppress exception // suppress exception
} }
finally { finally {
response.send(`SillyTavern:${gitRevision || pkgVersion}:Cohee#1207`) const agent = `SillyTavern:${gitRevision || pkgVersion}:Cohee#1207`;
response.send({ agent, pkgVersion, gitRevision, gitBranch });
} }
}) })