haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better template handling of include/excluded files 

Reject all hidden folders and files when copying the template files, only allow '.gitignore', '.gitattributes' files as these are likely intended.  Do not copy `.lck`, `autosave` or `backup` files
This commit is contained in:
Jan Wichmann 2024-02-07 01:36:34 +00:00 committed by Seth Hillbrand
parent 65c0a0a629
commit 2a0a41f149
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kicad/project_template.cpp
View File

@ -82,31 +82,49 @@ public:
virtual wxDirTraverseResult OnFile( const wxString& filename ) override
{
wxFileName fn( filename );
wxString path( fn.GetPathWithSep() );
bool exclude = filename.StartsWith( m_exclude ) || fn.GetName().StartsWith( wxS( "." ) );
bool exclude = fn.GetName().Contains( "fp-info-cache" )
|| fn.GetName().StartsWith( "_autosave-" ) || fn.GetExt().Contains( "lck" );
if( !exclude )
m_files.emplace_back( wxFileName( filename ) );
if( path != m_oldPath )
{
const wxString gitfiles[] = { wxT( ".gitignore" ), wxT( ".gitattributes" ) };
for( auto file : gitfiles )
{
if( wxFileExists( path + file ) )
m_files.emplace_back( wxFileName( path + file ) );
}
m_oldPath = path;
}
return wxDIR_CONTINUE;
}
virtual wxDirTraverseResult OnDir( const wxString& dirname ) override
{
wxFileName fn( dirname, wxEmptyString );
wxArrayString dirs = fn.GetDirs();
wxString lastDir = dirs[ fn.GetDirCount() - 1 ];
bool exclude = dirname.StartsWith( m_exclude ) || lastDir.StartsWith( wxS( "." ) );
wxDirTraverseResult result = wxDIR_IGNORE;
bool exclude = dirname.StartsWith( m_exclude ) || dirname.EndsWith( "-backups" );
if( !exclude )
{
m_files.emplace_back( wxFileName::DirName( dirname ) );
result = wxDIR_CONTINUE;
}
return wxDIR_CONTINUE;
return result;
}
private:
std::vector<wxFileName>& m_files;
wxString m_exclude;
wxString m_oldPath;
};
@ -116,7 +134,7 @@ std::vector<wxFileName> PROJECT_TEMPLATE::GetFileList()
FILE_TRAVERSER sink( files, m_metaPath.GetPath() );
wxDir dir( m_basePath.GetPath() );
dir.Traverse( sink );
dir.Traverse( sink, wxEmptyString, ( wxDIR_FILES | wxDIR_DIRS ) );
return files;
}