1
0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-05 10:22:31 +01:00

Window name patch + fix overlapping text in client patcher

This commit is contained in:
Madeline 2023-01-15 17:35:54 +11:00
parent c93f27f514
commit e0aae75757

View File

@ -65,6 +65,12 @@ const doPatch = (content) => {
//content = content.replaceAll(/DiscordTag/g, "FosscordTag"); //content = content.replaceAll(/DiscordTag/g, "FosscordTag");
content = content.replaceAll(/\*Discord\*/g, `*${INSTANCE_NAME}*`); content = content.replaceAll(/\*Discord\*/g, `*${INSTANCE_NAME}*`);
// Replace window title
content = content.replaceAll(
":c.base;",
`:(c.base == 'Discord' ? '${INSTANCE_NAME}' : c.base);`,
);
//server -> guild //server -> guild
const serverVariations = [ const serverVariations = [
['"Server"', '"Guild"'], ['"Server"', '"Guild"'],
@ -186,6 +192,12 @@ const processFile = async (name) => {
); );
}; };
const print = (x) => {
process.stdout.write(
`${x}${" ".repeat(process.stdout.columns - x.length)}\r`,
);
};
(async () => { (async () => {
const start = Date.now(); const start = Date.now();
@ -198,9 +210,7 @@ const processFile = async (name) => {
while (INDEX_SCRIPTS.length > 0) { while (INDEX_SCRIPTS.length > 0) {
const asset = INDEX_SCRIPTS.shift(); const asset = INDEX_SCRIPTS.shift();
process.stdout.write( print(`Scraping asset ${asset}. Remaining: ${INDEX_SCRIPTS.length}`);
`Scraping asset ${asset}. Remaining: ${INDEX_SCRIPTS.length} \r`,
);
const newAssets = await processFile(asset); const newAssets = await processFile(asset);
assets.push(...newAssets); assets.push(...newAssets);
@ -218,8 +228,8 @@ const processFile = async (name) => {
while (CACHE_MISSES.length > 0) { while (CACHE_MISSES.length > 0) {
const asset = CACHE_MISSES.shift(); const asset = CACHE_MISSES.shift();
process.stdout.write( print(
`Scraping cache misses ${asset}. Remaining: ${CACHE_MISSES.length} \r`, `Scraping cache misses ${asset}. Remaining: ${CACHE_MISSES.length}`,
); );
if (existsSync(path.join(CACHE_PATH, `${asset}`))) { if (existsSync(path.join(CACHE_PATH, `${asset}`))) {
@ -236,9 +246,7 @@ const processFile = async (name) => {
while (existing.length > 0) { while (existing.length > 0) {
var file = existing.shift(); var file = existing.shift();
process.stdout.write( print(`Patching existing ${file}. Remaining: ${existing.length}.`);
`Patching existing ${file}. Remaining: ${existing.length}. \r`,
);
var text = await fs.readFile(path.join(CACHE_PATH, file)); var text = await fs.readFile(path.join(CACHE_PATH, file));
if (file.includes(".js") || file.includes(".css")) { if (file.includes(".js") || file.includes(".css")) {
@ -273,7 +281,7 @@ const processFile = async (name) => {
: 1; : 1;
const finishTime = averageRate * (assets.length - i); const finishTime = averageRate * (assets.length - i);
process.stdout.write( print(
`Caching asset ${asset}. ` + `Caching asset ${asset}. ` +
`${i}/${assets.length - 1} = ${Math.floor( `${i}/${assets.length - 1} = ${Math.floor(
(i / (assets.length - 1)) * 100, (i / (assets.length - 1)) * 100,
@ -282,8 +290,6 @@ const processFile = async (name) => {
// Date.now() + finishTime, // Date.now() + finishTime,
// ).toLocaleTimeString()}`, // ).toLocaleTimeString()}`,
); );
//not adding to the previous mess, incase the finish time is added back or something
process.stdout.write(" \r");
promises.push(processFile(asset)); promises.push(processFile(asset));
// await processFile(asset); // await processFile(asset);