anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Centralize the generation of the emergency and autosave filenames.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35825 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-10-25 12:31:22 +00:00
parent 5cd48620f1
commit 375db69d99
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Buffer.cpp
View File

@ -3220,6 +3220,18 @@ int AutoSaveBuffer::generateChild()
} // namespace anon
FileName Buffer::getEmergencyFileName() const
{
return getEmergencyFileNameFor(d->filename);
}
FileName Buffer::getEmergencyFileNameFor(FileName const & fn) const
{
return FileName(fn.absFileName() + ".emergency");
}
FileName Buffer::getAutosaveFileName() const
{
// if the document is unnamed try to save in the backup dir, else
@ -3232,8 +3244,15 @@ FileName Buffer::getAutosaveFileName() const
if (!isUnnamed() || fpath.empty() || !FileName(fpath).exists())
fpath = filePath();
string const fname = "#" + d->filename.onlyFileName() + "#";
return makeAbsPath(fname, fpath);
string const fname = d->filename.onlyFileName();
return getAutosaveFileNameFor(makeAbsPath(fname, fpath));
}
FileName Buffer::getAutosaveFileNameFor(FileName const & fn) const
{
string const fname = "#" + onlyFileName(fn.absFileName()) + "#";
return FileName(onlyPath(fn.absFileName()) + fname);
}
@ -3605,20 +3624,18 @@ Buffer::ReadStatus Buffer::readFromVC(FileName const & fn)
Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
{
FileName const emergencyFile(fn.absFileName() + ".emergency");
FileName const emergencyFile = getEmergencyFileNameFor(fn);
if (!emergencyFile.exists()
|| emergencyFile.lastModified() <= fn.lastModified())
return ReadFileNotFound;
docstring const file = makeDisplayPath(fn.absFileName(), 20);
docstring const text =
bformat(_("An emergency save of the document "
"%1$s exists.\n\n"
"Recover emergency save?"), file);
docstring const text = bformat(_("An emergency save of the document "
"%1$s exists.\n\nRecover emergency save?"), file);
int const ret = Alert::prompt(_("Load emergency save?"), text,
0, 2, _("&Recover"), _("&Load Original"), _("&Cancel"));
switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
_("&Recover"), _("&Load Original"),
_("&Cancel")))
switch (ret)
{
case 0: {
// the file is not saved if we load the emergency file.
@ -3649,9 +3666,8 @@ Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
return ReadOriginal;
default:
return ReadCancel;
break;
}
// suppress warning
return ReadCancel;
}
@ -3659,19 +3675,18 @@ Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
Buffer::ReadStatus Buffer::readAutosave(FileName const & fn)
{
// Now check if autosave file is newer.
FileName const autosaveFile(onlyPath(fn.absFileName())
+ '#' + onlyFileName(fn.absFileName()) + '#');
FileName autosaveFile = getAutosaveFileNameFor(fn);
if (!autosaveFile.exists()
|| autosaveFile.lastModified() <= fn.lastModified())
return ReadFileNotFound;
docstring const file = makeDisplayPath(fn.absFileName(), 20);
docstring const text =
bformat(_("The backup of the document %1$s is newer.\n\n"
"Load the backup instead?"), file);
switch (Alert::prompt(_("Load backup?"), text, 0, 2,
_("&Load backup"), _("Load &original"),
_("&Cancel") ))
docstring const text = bformat(_("The backup of the document %1$s
"is newer.\n\nLoad the backup instead?"), file);
int const ret = Alert::prompt(_("Load backup?"), text, 0, 2,
_("&Load backup"), _("Load &original"), _("&Cancel"));
switch (ret)
{
case 0: {
bool success = readFile(autosaveFile);
@ -3687,9 +3702,8 @@ Buffer::ReadStatus Buffer::readAutosave(FileName const & fn)
autosaveFile.removeFile();
return ReadOriginal;
default:
return ReadCancel;
break;
}
// suppress warning
return ReadCancel;
}