mirror of
				https://gitlab.com/MrFry/mrfrys-node-server
				synced 2025-04-01 20:24:18 +02:00 
			
		
		
		
	Fixes of invalid merging
This commit is contained in:
		
							
								
								
									
										2
									
								
								stat.js
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								stat.js
									
									
									
									
									
								
							@@ -84,7 +84,7 @@ function AddVisitStat(name) {
 | 
			
		||||
		("0" + (m.getMonth() + 1)).slice(-2) + "/" +
 | 
			
		||||
		("0" + m.getDate()).slice(-2);
 | 
			
		||||
	if (vData[now] == undefined)
 | 
			
		||||
		vData[now] = [];
 | 
			
		||||
		vData[now] = {};
 | 
			
		||||
	if (vData[now][name] == undefined)
 | 
			
		||||
		vData[now][name] = 0;
 | 
			
		||||
	vData[now][name]++;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										15
									
								
								utils.js
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								utils.js
									
									
									
									
									
								
							@@ -14,10 +14,10 @@ var fs = require('fs');
 | 
			
		||||
var logger = require('./logger.js');
 | 
			
		||||
 | 
			
		||||
const recievedFile = "stats/recieved";
 | 
			
		||||
const publicFile = "public/data/public";
 | 
			
		||||
const staticFile = "public/data/static";
 | 
			
		||||
const manFile = "public/man.html";
 | 
			
		||||
const logFile = "stats/logs";
 | 
			
		||||
const dataFile = "public/data.json";
 | 
			
		||||
 | 
			
		||||
function ReadFile(name) {
 | 
			
		||||
	if (!FileExists(name))
 | 
			
		||||
@@ -80,18 +80,9 @@ function Beep() {
 | 
			
		||||
 | 
			
		||||
function WriteBackup() {
 | 
			
		||||
	try {
 | 
			
		||||
		WriteFileAsync(ReadFile(recievedFile), 'public/backs/recieved_' + new Date().toString());
 | 
			
		||||
		//logger.Log('[SAVE]: New questions backup wrote');
 | 
			
		||||
 | 
			
		||||
		WriteFileAsync(ReadFile(dataFile), 'public/backs/data_' + new Date().toString());
 | 
			
		||||
	} catch (e) {
 | 
			
		||||
		logger.Log("[ERR ]: Error backing up recieved file!", logger.GetColor("redbg"));
 | 
			
		||||
		console.log(e);
 | 
			
		||||
	}
 | 
			
		||||
	try {
 | 
			
		||||
		WriteFileAsync(ReadFile(publicFile), 'public/backs/public_' + new Date().toString());
 | 
			
		||||
		//logger.Log('[SAVE]: Public questions backup wrote');
 | 
			
		||||
	} catch (e) {
 | 
			
		||||
		logger.Log("[ERR ]: Error backing up public file!", logger.GetColor("redbg"), true);
 | 
			
		||||
		logger.Log("[ERR ]: Error backing up data json file!", logger.GetColor("redbg"));
 | 
			
		||||
		console.log(e);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user