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

Fix up duplicate filenames during resync (#5742)

Browse Source 
* Fix up duplicate filenames during resync

* Unit test for project history resync with duplicate paths

* Decaf cleanup: unnecessary returns

* Decaf cleanup: remove initClass()

* Decaf cleanup: unused variables

* Decaf cleanup: camel case variables

* Support duplicate folder names when traversing project folders

We have some broken projects that contain duplicate folder names. In
order to fix them, we need to be able to find them in the project. The
use of an object to store folders by path meant that only one of the
duplicate folders would be found.

* Keep docupdater up to date when renaming during a resync

Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: bf3dcdc4c1d4f5418ff9f5e68b255438620349ca
This commit is contained in:
Brian Gough
2021-11-11 15:10:46 +00:00
committed by Copybot
parent 1d75a0c562
commit ec0ff484f1
4 changed files with 252 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Project/ProjectEntityHandler.js
+6 -22
View File
@@ -20,15 +20,11 @@ const ProjectEntityHandler = {
}
ProjectEntityHandler._getAllFolders(projectId, (error, folders) => {
if (folders == null) {
folders = {}
}
if (error != null) {
return callback(error)
}
const docs = {}
for (const folderPath in folders) {
const folder = folders[folderPath]
for (const { path: folderPath, folder } of folders) {
for (const doc of folder.docs || []) {
const content = docContents[doc._id.toString()]
if (content != null) {
@@ -49,15 +45,11 @@ const ProjectEntityHandler = {
getAllFiles(projectId, callback) {
ProjectEntityHandler._getAllFolders(projectId, (err, folders) => {
if (folders == null) {
folders = {}
}
if (err != null) {
return callback(err)
}
const files = {}
for (const folderPath in folders) {
const folder = folders[folderPath]
for (const { path: folderPath, folder } of folders) {
for (const file of folder.fileRefs || []) {
if (file != null) {
files[path.join(folderPath, file.name)] = file
@@ -83,16 +75,12 @@ const ProjectEntityHandler = {
getAllEntitiesFromProject(project, callback) {
ProjectEntityHandler._getAllFoldersFromProject(project, (err, folders) => {
if (folders == null) {
folders = {}
}
if (err != null) {
return callback(err)
}
const docs = []
const files = []
for (const folderPath in folders) {
const folder = folders[folderPath]
for (const { path: folderPath, folder } of folders) {
for (const doc of folder.docs || []) {
if (doc != null) {
docs.push({ path: path.join(folderPath, doc.name), doc })
@@ -122,15 +110,11 @@ const ProjectEntityHandler = {
getAllDocPathsFromProject(project, callback) {
ProjectEntityHandler._getAllFoldersFromProject(project, (err, folders) => {
if (folders == null) {
folders = {}
}
if (err != null) {
return callback(err)
}
const docPath = {}
for (const folderPath in folders) {
const folder = folders[folderPath]
for (const { path: folderPath, folder } of folders) {
for (const doc of folder.docs || []) {
docPath[doc._id] = path.join(folderPath, doc.name)
}
@@ -226,9 +210,9 @@ const ProjectEntityHandler = {
},
_getAllFoldersFromProject(project, callback) {
const folders = {}
const folders = []
function processFolder(basePath, folder) {
folders[basePath] = folder
folders.push({ path: basePath, folder })
for (const childFolder of folder.folders || []) {
if (childFolder.name != null) {
processFolder(path.join(basePath, childFolder.name), childFolder)