also migrate titled documents

rstudio · Jan 13, 2012 · 6927f15 · 6927f15
1 parent fe69a9c
commit 6927f15
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/cpp/session/SessionSourceDatabaseSupervisor.cpp b/src/cpp/session/SessionSourceDatabaseSupervisor.cpp
@@ -57,6 +57,14 @@ FilePath persistentTitledDir()
    return sourceDatabaseRoot().complete("per/t");
 }
 
+FilePath oldPersistentTitledDir()
+{
+   FilePath oldPath = module_context::oldScopedScratchPath();
+   if (oldPath.exists())
+      return oldPath.complete("source_database_v2/persistent/titled");
+   else
+      return FilePath();
+}
 
 FilePath persistentUntitledDir()
 {
@@ -206,6 +214,10 @@ Error createSessionDirFromPersistent(FilePath* pSessionDir)
    if (persistentTitledDir().exists())
       attemptToMoveSourceDbFiles(persistentTitledDir(), *pSessionDir);
 
+   // get legacy titled docs if they exist
+   if (oldPersistentTitledDir().exists())
+      attemptToMoveSourceDbFiles(oldPersistentTitledDir(), *pSessionDir);
+
    // move persistent untitled files
    if (persistentUntitledDir().exists())
       attemptToMoveSourceDbFiles(persistentUntitledDir(), *pSessionDir);