mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-22 01:34:21 +00:00
Code Activity

Projucer: Only updated saved state on content change

Browse source
This commit is contained in:
Tom Poole 2020-04-20 15:08:59 +01:00
parent 0b4089c951
commit a5aea2006d
4 changed files with 59 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

79
extras/Projucer/Source/Project/jucer_Project.cpp
View file

@ -39,18 +39,15 @@ void Project::ProjectFileModificationPoller::reset()
void Project::ProjectFileModificationPoller::timerCallback()
{
if (project.hasProjectBeenModified())
if (project.updateCachedFileState() && ! showingWarning)
{
if (! showingWarning)
{
project.addProjectMessage (ProjectMessages::Ids::jucerFileModified,
{ { "Keep", [this] { keepProject(); } },
{ "Re-load from disk", [this] { reloadProjectFromDisk(); } },
{ "Ignore", [this] { reset(); } } });
project.addProjectMessage (ProjectMessages::Ids::jucerFileModified,
{ { "Save current state", [this] { resaveProject(); } },
{ "Re-load from disk", [this] { reloadProjectFromDisk(); } },
{ "Ignore", [this] { reset(); } } });
stopTimer();
showingWarning = true;
}
stopTimer();
showingWarning = true;
}
}
@ -73,7 +70,7 @@ void Project::ProjectFileModificationPoller::reloadProjectFromDisk()
});
}
void Project::ProjectFileModificationPoller::keepProject()
void Project::ProjectFileModificationPoller::resaveProject()
{
project.saveProject();
reset();
@ -95,7 +92,7 @@ Project::Project (const File& f)
initialiseAudioPluginValues();
setChangedFlag (false);
modificationTime = getFile().getLastModificationTime();
updateCachedFileState();
auto& app = ProjucerApplication::getApp();
@ -166,7 +163,6 @@ void Project::updateCompanyNameDependencies()
void Project::updateProjectSettings()
{
projectRoot.setProperty (Ids::jucerVersion, ProjectInfo::versionString, nullptr);
projectRoot.setProperty (Ids::name, getDocumentTitle(), nullptr);
}
@ -952,7 +948,7 @@ void Project::saveAndMoveTemporaryProject (bool openInIDE)
auto newDirectory = newParentDirectory.getChildFile (tempDirectory.getFileName());
auto oldJucerFileName = getFile().getFileName();
saveProjectRootToFile();
writeProjectFile();
tempDirectory.copyDirectoryTo (newDirectory);
tempDirectory.deleteRecursively();
@ -973,19 +969,6 @@ void Project::saveAndMoveTemporaryProject (bool openInIDE)
}
}
bool Project::saveProjectRootToFile()
{
if (auto xml = projectRoot.createXml())
{
MemoryOutputStream mo;
xml->writeTo (mo, {});
return build_tools::overwriteFileWithNewDataIfDifferent (getFile(), mo);
}
jassertfalse;
return false;
}
//==============================================================================
void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& property)
{
@ -1058,12 +1041,46 @@ void Project::valueTreeChildOrderChanged (ValueTree&, int, int)
}
//==============================================================================
bool Project::hasProjectBeenModified()
String Project::serialiseProjectXml (std::unique_ptr<XmlElement> xml) const
{
auto oldModificationTime = modificationTime;
modificationTime = getFile().getLastModificationTime();
if (xml == nullptr)
return {};
return (modificationTime.toMilliseconds() > (oldModificationTime.toMilliseconds() + 1000LL));
XmlElement::TextFormat format;
format.newLineChars = getProjectLineFeed().toRawUTF8();
return xml->toString (format);
}
bool Project::updateCachedFileState()
{
auto lastModificationTime = getFile().getLastModificationTime();
if (lastModificationTime <= cachedFileState.first)
return false;
cachedFileState.first = lastModificationTime;
auto serialisedFileContent = serialiseProjectXml (XmlDocument (getFile()).getDocumentElement());
if (serialisedFileContent == cachedFileState.second)
return false;
cachedFileState.second = serialisedFileContent;
return true;
}
void Project::writeProjectFile()
{
updateCachedFileState();
auto newSerialisedXml = serialiseProjectXml (getProjectRoot().createXml());
jassert (newSerialisedXml.isNotEmpty());
if (newSerialisedXml != cachedFileState.second)
{
getFile().replaceWithText (newSerialisedXml);
cachedFileState = { getFile().getLastModificationTime(), newSerialisedXml };
}
}
//==============================================================================