Merge pull request #18397 from overleaf/em-revert-download-all-link

Revert "Merge pull request #18190 from overleaf/ar-add-download-all-l…

GitOrigin-RevId: 681eb2734636d76558e682dc85083bfcaa6b7d2d
This commit is contained in:
Christopher Hoskin
2024-05-16 18:39:31 +01:00
committed by Copybot
parent d7f0c66d86
commit 3342d672c2
10 changed files with 50 additions and 175 deletions

View File

@@ -208,7 +208,7 @@ async function doCompile(request) {
Metrics.inc('compiles-timeout', 1, request.metricsOpts)
}
const { outputFiles, allEntries, buildId } = await _saveOutputFiles({
const { outputFiles, allEntries } = await _saveOutputFiles({
request,
compileDir,
resourceList,
@@ -216,7 +216,7 @@ async function doCompile(request) {
timings,
})
error.outputFiles = outputFiles // return output files so user can check logs
error.buildId = buildId
// Clear project if this compile was abruptly terminated
if (error.terminated || error.timedout) {
await clearProjectWithListing(
@@ -280,7 +280,7 @@ async function doCompile(request) {
// Emit compile time.
timings.compile = ts
const { outputFiles, buildId } = await _saveOutputFiles({
const { outputFiles } = await _saveOutputFiles({
request,
compileDir,
resourceList,
@@ -296,7 +296,7 @@ async function doCompile(request) {
emitPdfStats(stats, timings, request)
}
return { outputFiles, stats, timings, buildId }
return { outputFiles, stats, timings }
}
async function _saveOutputFiles({
@@ -316,24 +316,20 @@ async function _saveOutputFiles({
let { outputFiles, allEntries } =
await OutputFileFinder.promises.findOutputFiles(resourceList, compileDir)
let buildId
try {
const saveResult = await OutputCacheManager.promises.saveOutputFiles(
outputFiles = await OutputCacheManager.promises.saveOutputFiles(
{ request, stats, timings },
outputFiles,
compileDir,
outputDir
)
buildId = saveResult.buildId
outputFiles = saveResult.outputFiles
} catch (err) {
const { project_id: projectId, user_id: userId } = request
logger.err({ projectId, userId, err }, 'failed to save output files')
}
timings.output = timer.done()
return { outputFiles, allEntries, buildId }
return { outputFiles, allEntries }
}
async function stopCompile(projectId, userId) {