github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Changed WLDataModel to not delete project directories.

Browse source
This commit is contained in:
Winston Li 2014-11-19 18:40:34 +00:00
parent 071e0a87cc
commit 7d47514810
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStore.java
View file

@ -9,6 +9,7 @@ import uk.ac.ic.wlgitbridge.writelatex.filestore.GitDirectoryContents;
import uk.ac.ic.wlgitbridge.writelatex.filestore.node.WLDirectoryNode;
import uk.ac.ic.wlgitbridge.writelatex.model.Snapshot;
import uk.ac.ic.wlgitbridge.writelatex.model.WLProject;
import uk.ac.ic.wlgitbridge.writelatex.model.db.PersistentStoreAPI;
import java.io.File;
import java.io.IOException;
@ -26,11 +27,15 @@ public class WLFileStore {
public WLFileStore(File rootGitDirectory) {
fileStore = new HashMap<String, WLDirectoryNode>();
this.rootGitDirectory = rootGitDirectory;
deleteInDirectoryApartFrom(rootGitDirectory, ".wlgb");
attDirectory = new File(rootGitDirectory, ".wlgb/atts");
attDirectory.mkdirs();
}
public WLFileStore(File rootGitDirectory, PersistentStoreAPI persistentStoreAPI) {
this(rootGitDirectory);
}
public static void deleteInDirectory(File directory) {
deleteInDirectoryApartFrom(directory);
}

4
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
View file

@ -30,6 +30,10 @@ public class WLDataModel implements CandidateSnapshotCallback {
persistentStore = new WLGBPersistentStore(rootGitDirectory);
projectStore = persistentStore.loadProjectStore();
fileStore = persistentStore.loadFileStore();
List<String> excludedFromDeletion = projectStore.getProjectNames();
excludedFromDeletion.add(".wlgb");
System.out.println("Not deleting: " + excludedFromDeletion);
WLFileStore.deleteInDirectoryApartFrom(rootGitDirectory, excludedFromDeletion.toArray(new String[]{}));
}
public List<WritableRepositoryContents> updateProjectWithName(String name) throws FailedConnectionException, InvalidProjectException {

11
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStore.java
View file

@ -3,7 +3,9 @@ package uk.ac.ic.wlgitbridge.writelatex.model;
import uk.ac.ic.wlgitbridge.writelatex.model.db.PersistentStoreAPI;
import uk.ac.ic.wlgitbridge.writelatex.model.db.WLDatabaseSource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -17,6 +19,11 @@ public class WLProjectStore implements WLDatabaseSource {
projects = new HashMap<String, WLProject>();
}
public WLProjectStore(PersistentStoreAPI persistentStore) {
this();
initFromDatabase(persistentStore);
}
public WLProject getProjectWithName(String name) {
WLProject project;
if (projects.containsKey(name)) {
@ -28,6 +35,10 @@ public class WLProjectStore implements WLDatabaseSource {
return project;
}
public List<String> getProjectNames() {
return new ArrayList<String>(projects.keySet());
}
@Override
public void initFromDatabase(PersistentStoreAPI database) {

4
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStore.java
View file

@ -30,12 +30,12 @@ public class WLGBPersistentStore implements PersistentStoreAPI {
@Override
public WLProjectStore loadProjectStore() {
return new WLProjectStore();
return new WLProjectStore(this);
}
@Override
public WLFileStore loadFileStore() {
return new WLFileStore(rootGitDirectory);
return new WLFileStore(rootGitDirectory, this);
}
@Override