agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-27 19:11:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32776 from overleaf/bg-record-file-source-in-filenames

Browse Source 
record upload type in temporary filenames

GitOrigin-RevId: 83232be85ad58e03b1ce9da4bb7de54f7a7cfdb0
This commit is contained in:
Brian Gough
2026-04-14 11:41:07 +01:00
committed by Copybot
parent 3bf3264cfe
commit e9b50b08bf
8 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/web/app/src/Features/History/RestoreManager.mjs
View File

@@ -437,13 +437,16 @@ const RestoreManager = {
const url = `${
Settings.apis.project_history.url
}/project/${projectId}/version/${version}/${encodeURIComponent(pathname)}`
return await FileWriter.promises.writeUrlToDisk(projectId, url)
return await FileWriter.promises.writeUrlToDisk(
projectId + '_restore-manager-version',
url
)
},
async _writeSnapshotFileToDisk(historyId, file) {
if (file.isEditable()) {
return await FileWriter.promises.writeContentToDisk(
historyId,
historyId + '_restore-manager-editable',
file.getContent()
)
} else {
@@ -452,7 +455,10 @@ const RestoreManager = {
historyId,
hash
)
return await FileWriter.promises.writeStreamToDisk(historyId, stream)
return await FileWriter.promises.writeStreamToDisk(
historyId + '_restore-manager-blob',
stream
)
}
},
}

4
services/web/app/src/Features/LinkedFiles/LinkedFilesHandler.mjs
View File

@@ -60,7 +60,7 @@ const LinkedFilesHandler = {
userId
) {
const fsPath = await FileWriter.promises.writeStreamToDisk(
projectId,
projectId + '_linked-files-handler-stream',
readStream
)
@@ -88,7 +88,7 @@ const LinkedFilesHandler = {
userId
) {
const fsPath = await FileWriter.promises.writeContentToDisk(
projectId,
projectId + '_linked-files-handler-content',
content
)

2
services/web/app/src/Features/Templates/TemplatesManager.mjs
View File

@@ -47,7 +47,7 @@ const TemplatesManager = {
})
const projectName = ProjectDetailsHandler.fixProjectName(templateName)
const dumpPath = `${settings.path.dumpFolder}/${crypto.randomUUID()}`
const dumpPath = `${settings.path.dumpFolder}/${crypto.randomUUID()}_templates-manager`
const writeStream = fs.createWriteStream(dumpPath)
try {
const attributes = {

2
services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.mjs
View File

@@ -27,7 +27,7 @@ async function mergeUpdate(userId, projectId, path, updateRequest, source) {
async function writeUpdateToDisk(projectId, updateStream) {
const fsPath = `${
Settings.path.dumpFolder
}/${projectId}_${crypto.randomUUID()}`
}/${projectId}_${crypto.randomUUID()}_update-merger`
const writeStream = fs.createWriteStream(fsPath)
try {
await pipeline(updateStream, writeStream)

2
services/web/app/src/Features/Uploads/DocumentConversionManager.mjs
View File

@@ -26,7 +26,7 @@ async function convertDocxToLaTeXZipArchive(path, userId) {
'sending docx to CLSI for conversion'
)
const outputFileName = crypto.randomUUID() + '.zip'
const outputFileName = crypto.randomUUID() + '_document-conversion' + '.zip'
const outputPath = Path.join(Settings.path.dumpFolder, outputFileName)
let outputStream
const abortController = new AbortController()

2
services/web/test/unit/src/Templates/TemplatesManager.test.mjs
View File

@@ -18,7 +18,7 @@ describe('TemplatesManager', function () {
ctx.user_id = 'user-id'
ctx.dumpFolder = 'dump/path'
ctx.uuid = '1234'
ctx.dumpPath = `${ctx.dumpFolder}/${ctx.uuid}`
ctx.dumpPath = `${ctx.dumpFolder}/${ctx.uuid}_templates-manager`
ctx.callback = sinon.stub()
ctx.pipeline = sinon.stub().callsFake(async (stream, res) => {
if (res.callback) res.callback()

2
services/web/test/unit/src/ThirdPartyDataStore/UpdateMerger.test.mjs
View File

@@ -26,7 +26,7 @@ describe('UpdateMerger :', function () {
ctx.existingDocs = [{ path: '/main.tex' }, { path: '/folder/other.tex' }]
ctx.existingFiles = [{ path: '/figure.pdf' }, { path: '/folder/fig1.pdf' }]
ctx.fsPath = `${ctx.dumpPath}/${ctx.projectId}_${ctx.randomUUID}`
ctx.fsPath = `${ctx.dumpPath}/${ctx.projectId}_${ctx.randomUUID}_update-merger`
ctx.fileContents = `\\documentclass{article}
\\usepackage[utf8]{inputenc}

8
services/web/test/unit/src/Uploads/DocumentConversionManager.test.mjs
View File

@@ -131,7 +131,7 @@ describe('DocumentConversionManager', function () {
it('should return a path to the output file', function (ctx) {
expect(ctx.result).to.match(
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.zip/
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}_document-conversion\.zip/
)
})
})
@@ -157,7 +157,7 @@ describe('DocumentConversionManager', function () {
sinon.assert.calledWith(
ctx.fsPromises.unlink,
sinon.match(
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.zip/
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}_document-conversion\.zip/
)
)
})
@@ -210,7 +210,7 @@ describe('DocumentConversionManager', function () {
sinon.assert.calledWith(
ctx.fsPromises.unlink,
sinon.match(
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.zip/
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}_document-conversion\.zip/
)
)
})
@@ -248,7 +248,7 @@ describe('DocumentConversionManager', function () {
sinon.assert.calledWith(
ctx.fsPromises.unlink,
sinon.match(
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.zip/
/\/path\/to\/dump\/folder\/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}_document-conversion\.zip/
)
)
})