Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-01 11:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow to abort FileSystem::filesGetInPath and FileSystem::filesInfoGetInPath.

Browse Source 
Allow FileSystemModel root node to fetch asynchronously.
Performance improvements in FileSystemModel.
Added Model::hasChilds() to improve performance in models that need IO calls for Model::rowCount(), this is specially useful for FileSystemModel.
When opening a file from file browser focus the opened file in the file tree view.
All these fixes should allow ecode to open a single file in a directory with a large number of files and not hang the renderer thread due to root file directory fetching / listing its files in main/renderer thread, fix for SpartanJ/ecode#357.
This commit is contained in:
Martín Lucas Golini
2024-11-17 00:20:37 -03:00
parent 0a84052d23
commit 103ec3a894
11 changed files with 198 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tools/ecode/ecode.cpp
View File

@@ -869,6 +869,7 @@ static void fsRemoveAll( const std::string& fpath ) {
}
App::~App() {
mDestroyingApp = true;
if ( mProjectBuildManager )
mProjectBuildManager.reset();
@@ -1323,12 +1324,13 @@ void App::syncProjectTreeWithEditor( UICodeEditor* editor ) {
!editor->getDocument().getLoadingFilePath().empty() ) ) {
std::string loadingPath( editor->getDocument().getLoadingFilePath() );
std::string path = !loadingPath.empty() ? loadingPath : editor->getDocument().getFilePath();
if ( path.size() >= mCurrentProject.size() ) {
path = path.substr( mCurrentProject.size() );
mProjectTreeView->setFocusOnSelection( false );
mProjectTreeView->selectRowWithPath( path );
mProjectTreeView->setFocusOnSelection( true );
mProjectTreeView->setFocusOnSelection( false );
if ( !mCurrentProject.empty() && String::startsWith( path, mCurrentProject ) ) {
mProjectTreeView->selectRowWithPath( path.substr( mCurrentProject.size() ) );
} else {
mProjectTreeView->selectRowWithPath( FileSystem::fileNameFromPath( path ) );
}
mProjectTreeView->setFocusOnSelection( true );
}
}
@@ -2681,7 +2683,7 @@ void App::toggleHiddenFiles() {
[this]( const std::string& filePath ) -> bool {
return isFileVisibleInTreeView( filePath );
} },
&mUISceneNode->getTranslator() );
&mUISceneNode->getTranslator(), mThreadPool );
if ( mProjectTreeView )
mProjectTreeView->setModel( mFileSystemModel );
if ( mFileSystemListener )
@@ -2935,7 +2937,7 @@ void App::initProjectTreeView( std::string path, bool openClean ) {
[this]( const std::string& filePath ) -> bool {
return isFileVisibleInTreeView( filePath );
} },
&mUISceneNode->getTranslator() );
&mUISceneNode->getTranslator(), mThreadPool );
mProjectTreeView->setModel( mFileSystemModel );
mProjectViewEmptyCont->setVisible( false );
@@ -2944,11 +2946,17 @@ void App::initProjectTreeView( std::string path, bool openClean ) {
mFileSystemListener->setFileSystemModel( mFileSystemModel );
auto forcePosition = getForcePositionFn( initialPosition );
auto onLoaded = [this, forcePosition]( UICodeEditor* codeEditor,
const std::string& path ) {
if ( forcePosition )
forcePosition( codeEditor, path );
syncProjectTreeWithEditor( mSplitter->getCurEditor() );
};
if ( FileSystem::fileExists( rpath ) ) {
loadFileFromPath( rpath, false, nullptr, forcePosition );
loadFileFromPath( rpath, false, nullptr, onLoaded );
} else if ( FileSystem::fileWrite( path, "" ) ) {
loadFileFromPath( path, false, nullptr, forcePosition );
loadFileFromPath( path, false, nullptr, onLoaded );
}
mSettings->updateProjectSettingsMenu();
@@ -2988,7 +2996,8 @@ void App::initImageView() {
}
bool App::isFileVisibleInTreeView( const std::string& filePath ) {
if ( !mFileSystemMatcher || !mFileSystemMatcher->matcherReady() )
if ( !appInstance || mDestroyingApp || !mFileSystemMatcher ||
!mFileSystemMatcher->matcherReady() )
return true;
auto fpath( filePath );
FileSystem::filePathRemoveBasePath( mCurrentProject, fpath );
@@ -3115,7 +3124,7 @@ void App::loadFolder( std::string path ) {
[this]( const std::string& filePath ) -> bool {
return isFileVisibleInTreeView( filePath );
} },
&mUISceneNode->getTranslator() );
&mUISceneNode->getTranslator(), mThreadPool );
if ( mProjectTreeView )
mProjectTreeView->setModel( mFileSystemModel );