create path refactor, removed debug log

This commit is contained in:
mrfry 2023-05-01 10:56:26 +02:00
parent 4bb8059986
commit 1a3c806e66
19 changed files with 57 additions and 209 deletions

View file

@ -153,10 +153,6 @@ function getForumData(
const forumPath = forumDir + '/' + safeForumName
const contentFilePath = forumPath + '/' + forumContentsFileName
if (!utils.FileExists(forumPath)) {
utils.CreatePath(forumPath, true)
}
if (!utils.FileExists(contentFilePath)) {
utils.WriteFile('{}', contentFilePath)
}
@ -191,7 +187,7 @@ function setup(data: SubmoduleData): void {
const forumFiles = publicDir + 'forumFiles'
if (!utils.FileExists(forumDir)) {
utils.CreatePath(forumDir, true)
utils.CreatePath(forumDir)
}
app.get('/forumEntries', (req: Request, res) => {

View file

@ -171,7 +171,6 @@ function searchInDbs(
})
.then((taskResult: WorkerResult) => {
try {
logger.DebugLog(taskResult, 'ask', 2)
resolve({
question: question,
result: taskResult.result as SearchResultQuestion[],
@ -211,11 +210,6 @@ function getResult(data: {
searchInDbs(question, subj, searchIn, testUrl).then(
(res: DbSearchResult) => {
if (res.result.length === 0) {
logger.DebugLog(
`No result while searching specific question db ${testUrl}`,
'ask',
1
)
const searchInMore = getDbIndexesToSearchIn(
testUrl,
questionDbs,
@ -296,7 +290,7 @@ function saveQuestion(
const subjPath = `${savedQuestionsDir}/${subject}`
const savedSubjQuestionsFilePath = `${subjPath}/${constants.savedQuestionsFileName}`
utils.CreatePath(subjPath, true)
utils.CreatePath(subjPath)
if (!utils.FileExists(savedSubjQuestionsFilePath)) {
utils.WriteFile('[]', savedSubjQuestionsFilePath)
}
@ -809,12 +803,6 @@ function setup(data: SubmoduleData): Submodule {
uid: uid,
loginDate: date,
}
} else {
logger.DebugLog(
`cid: ${cid}, uid: ${uid} tried to register multiple times`,
'register',
1
)
}
}

View file

@ -23,7 +23,7 @@ import fs from 'fs'
import logger from '../../../utils/logger'
import utils from '../../../utils/utils'
import { Request, SubmoduleData, User } from '../../../types/basicTypes'
import { publicDir } from '../../../utils/files'
import { paths, publicDir } from '../../../utils/files'
const dataFileName = '.data.json'
@ -99,7 +99,7 @@ function setup(data: SubmoduleData): void {
const dir = x[2]
const fname = x.pop()
const dataFilePath =
userFilesDir + '/' + dir + '/' + dataFileName
paths.userFilesDir + '/' + dir + '/' + dataFileName
const data = utils.ReadJSON(dataFilePath)
@ -122,28 +122,19 @@ function setup(data: SubmoduleData): void {
next()
})
const userFilesDir = publicDir + 'userFiles'
if (!utils.FileExists(userFilesDir)) {
utils.CreatePath(userFilesDir, true)
}
app.get('/listUserDir', (req: Request, res) => {
logger.LogReq(req)
if (!utils.FileExists(userFilesDir)) {
utils.CreatePath(userFilesDir, true)
}
const subdir: string = req.query.subdir
if (subdir) {
const result = listDir(subdir, userFilesDir)
const result = listDir(subdir, paths.userFilesDir)
res.json(result)
} else {
res.json({
success: true,
dirs: utils.ReadDir(userFilesDir).reduce((acc, file) => {
const stat = fs.lstatSync(userFilesDir + '/' + file)
dirs: utils.ReadDir(paths.userFilesDir).reduce((acc, file) => {
const stat = fs.lstatSync(paths.userFilesDir + '/' + file)
if (!stat.isDirectory()) {
return acc
@ -152,7 +143,8 @@ function setup(data: SubmoduleData): void {
acc.push({
name: file,
date: stat.mtime.getTime(),
size: utils.ReadDir(userFilesDir + '/' + file).length,
size: utils.ReadDir(paths.userFilesDir + '/' + file)
.length,
})
return acc
}, []),
@ -175,7 +167,8 @@ function setup(data: SubmoduleData): void {
}
const safeDir = dir.replace(/\.+/g, '').replace(/\/+/g, '')
const safeFname = fname.replace(/\.+/g, '.').replace(/\/+/g, '')
const filePath = userFilesDir + '/' + safeDir + '/' + safeFname
const filePath =
paths.userFilesDir + '/' + safeDir + '/' + safeFname
if (!utils.FileExists(filePath)) {
res.json({
@ -185,7 +178,8 @@ function setup(data: SubmoduleData): void {
return
}
utils.deleteFile(filePath)
const usersFile = userFilesDir + '/' + safeDir + '/' + dataFileName
const usersFile =
paths.userFilesDir + '/' + safeDir + '/' + dataFileName
const users = utils.ReadJSON(usersFile)
delete users[safeFname]
utils.WriteFile(JSON.stringify(users), usersFile)
@ -209,14 +203,14 @@ function setup(data: SubmoduleData): void {
}
const safeName = name.replace(/\.+/g, '').replace(/\/+/g, '')
if (utils.FileExists(userFilesDir + '/' + safeName)) {
if (utils.FileExists(paths.userFilesDir + '/' + safeName)) {
res.json({
success: false,
msg: `Dir ${name} already exists`,
})
return
}
utils.CreatePath(userFilesDir + '/' + safeName, true)
utils.CreatePath(paths.userFilesDir + '/' + safeName)
res.json({
success: true,
@ -236,7 +230,7 @@ function setup(data: SubmoduleData): void {
return
}
const safeDir = dir.replace(/\.+/g, '.').replace(/\/+/g, '/')
if (!utils.FileExists(userFilesDir + '/' + safeDir)) {
if (!utils.FileExists(paths.userFilesDir + '/' + safeDir)) {
res.json({
success: false,
msg: `dir '${dir}' does not exists!`,
@ -245,7 +239,7 @@ function setup(data: SubmoduleData): void {
}
utils
.uploadFile(req, userFilesDir + '/' + safeDir)
.uploadFile(req, paths.userFilesDir + '/' + safeDir)
.then((body) => {
logger.Log(
`Successfull upload ${body.filePath}`,
@ -253,7 +247,7 @@ function setup(data: SubmoduleData): void {
)
const usersFile =
userFilesDir + '/' + safeDir + '/' + dataFileName
paths.userFilesDir + '/' + safeDir + '/' + dataFileName
const users = utils.ReadJSON(usersFile)
users[body.fileName] = { uid: user.id }
utils.WriteFile(JSON.stringify(users), usersFile)
@ -276,7 +270,7 @@ function setup(data: SubmoduleData): void {
const x = safePath.split('/')
const dir = x[1]
const fname = x.pop()
const dataFilePath = userFilesDir + '/' + dir + '/' + dataFileName
const dataFilePath = paths.userFilesDir + '/' + dir + '/' + dataFileName
const data = utils.ReadJSON(dataFilePath)
@ -314,7 +308,7 @@ function setup(data: SubmoduleData): void {
utils.WriteFile(JSON.stringify(data), dataFilePath)
}
const result = listDir(dir, userFilesDir)
const result = listDir(dir, paths.userFilesDir)
res.json(result)
})
@ -324,17 +318,16 @@ function setup(data: SubmoduleData): void {
const safeName = name.replace(/\.+/g, '').replace(/\/+/g, '')
if (!utils.FileExists(userFilesDir + '/' + safeName)) {
if (!utils.FileExists(paths.userFilesDir + '/' + safeName)) {
res.json({
success: false,
msg: `Dir ${name} does not exist!`,
})
return
}
utils.CreatePath(userFilesDir + '/' + safeName, true)
const result = listDir(name, userFilesDir)
const result = listDir(name, paths.userFilesDir)
if (result.files.length === 0) {
utils.deleteDir(userFilesDir + '/' + safeName)
utils.deleteDir(paths.userFilesDir + '/' + safeName)
} else {
res.json({ succes: false, msg: `Dir ${name} is not empty!` })
return

View file

@ -49,7 +49,7 @@ interface Session {
function BackupDB(usersDbBackupPath: string, userDB: Database) {
logger.Log('Backing up auth DB ...')
utils.CreatePath(usersDbBackupPath, true)
utils.CreatePath(usersDbBackupPath)
userDB
.backup(
`${usersDbBackupPath}/users.${utils