Let LyX remember what documents 'needauth' converters have been authorized to run...

[lyx.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 6cdf1f724842558011503954a8b084eba43299f5..310aa74c9b90760af8af76071c2cf5d471801c75 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -34,6 +34,7 @@ string const sec_bookmarks = "[bookmarks]";
 string const sec_session = "[session info]";
 string const sec_toolbars = "[toolbars]";
 string const sec_lastcommands = "[last commands]";
+string const sec_authfiles = "[auth files]";
 
 } // anon namespace
 
@@ -150,6 +151,16 @@ void LastOpenedSection::write(ostream & os) const
 void LastOpenedSection::add(FileName const & file, bool active)
 {
        LastOpenedFile lof(file, active);
+       // check if file is already recorded (this can happen
+       // with multiple buffer views). We do only record each
+       // file once, since we cannot restore multiple views
+       // currently, we even crash in some cases (see #9483).
+       // FIXME: Add session support for multiple views of
+       //        the same buffer (split-view etc.).
+       for (size_t i = 0; i < lastopened.size(); ++i) {
+               if (lastopened[i].file_name == file)
+                       return;
+       }
        lastopened.push_back(lof);
 }
 
@@ -409,6 +420,8 @@ void Session::readFile()
                        bookmarks().read(is);
                else if (tmp == sec_lastcommands)
                        lastCommands().read(is);
+               else if (tmp == sec_authfiles)
+                       authFiles().read(is);
 
                else
                        LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
@@ -428,9 +441,43 @@ void Session::writeFile() const
                lastFilePos().write(os);
                lastCommands().write(os);
                bookmarks().write(os);
+               authFiles().write(os);
        } else
                LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "
                       << session_file);
 }
 
+
+AuthFilesSection::AuthFilesSection() {  }
+
+
+void AuthFilesSection::read(istream & is)
+{
+       string tmp;
+       do {
+               char c = is.peek();
+               if (c == '[')
+                       break;
+               getline(is, tmp);
+               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
+                       continue;
+
+               // read lastfiles
+               FileName const file(tmp);
+               if (file.exists() && !file.isDirectory())
+                       auth_files_.insert(tmp);
+               else
+                       LYXERR(Debug::INIT, "LyX: Warning: Ignore auth file: " << tmp);
+       } while (is.good());
+}
+
+
+void AuthFilesSection::write(ostream & os) const
+{
+       os << '\n' << sec_authfiles << '\n';
+       copy(auth_files_.begin(), auth_files_.end(),
+            ostream_iterator<std::string>(os, "\n"));
+}
+
+
 }