From ebfbedf7a7f33fecb45b0872ac0a9662d6ad2186 Mon Sep 17 00:00:00 2001 From: Graham Keeth Date: Sun, 22 Dec 2024 19:30:19 +0000 Subject: [PATCH] Rename design block file extension constant Also add design blocks to the project archiver include list. --- common/design_block_io.cpp | 14 +++++++------- common/project/project_archiver.cpp | 1 + common/wildcards_and_files_ext.cpp | 12 ++++++------ eeschema/design_block_utils.cpp | 2 +- include/wildcards_and_files_ext.h | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/common/design_block_io.cpp b/common/design_block_io.cpp index 7941c3f8aa..3643f78373 100644 --- a/common/design_block_io.cpp +++ b/common/design_block_io.cpp @@ -152,8 +152,8 @@ long long DESIGN_BLOCK_IO::GetLibraryTimestamp( const wxString& aLibraryPath ) c { wxFileName blockDir( aLibraryPath, filename ); - // Check if the directory ends with ".block", if so hash all the files in it - if( blockDir.GetFullName().EndsWith( FILEEXT::KiCadDesignBlockPathExtension ) ) + // Check if the directory ends with ".kicad_block", if so hash all the files in it + if( blockDir.GetFullName().EndsWith( FILEEXT::KiCadDesignBlockFileExtension ) ) ts += TimestampDir( blockDir.GetFullPath(), wxT( "*" ) ); hasMoreFiles = libDir.GetNext( &filename ); @@ -260,14 +260,14 @@ void DESIGN_BLOCK_IO::DesignBlockEnumerate( wxArrayString& aDesignBlockNames, const wxString& aLibraryPath, bool aBestEfforts, const std::map* aProperties ) { - // From the starting directory, look for all directories ending in the .block extension + // From the starting directory, look for all directories ending in the .kicad_block extension wxDir dir( aLibraryPath ); if( !dir.IsOpened() ) return; wxString dirname; - wxString fileSpec = wxT( "*." ) + wxString( FILEEXT::KiCadDesignBlockPathExtension ); + wxString fileSpec = wxT( "*." ) + wxString( FILEEXT::KiCadDesignBlockFileExtension ); bool cont = dir.GetFirst( &dirname, fileSpec, wxDIR_DIRS ); while( cont ) @@ -283,7 +283,7 @@ DESIGN_BLOCK* DESIGN_BLOCK_IO::DesignBlockLoad( const wxString& aLibraryPath, const std::map* aProperties ) { wxString dbPath = aLibraryPath + wxFileName::GetPathSeparator() + - aDesignBlockName + wxT( "." ) + FILEEXT::KiCadDesignBlockPathExtension + wxFileName::GetPathSeparator(); + aDesignBlockName + wxT( "." ) + FILEEXT::KiCadDesignBlockFileExtension + wxFileName::GetPathSeparator(); wxString dbSchPath = dbPath + aDesignBlockName + wxT( "." ) + FILEEXT::KiCadSchematicFileExtension; wxString dbMetadataPath = dbPath + aDesignBlockName + wxT( "." ) + FILEEXT::JsonFileExtension; @@ -360,7 +360,7 @@ void DESIGN_BLOCK_IO::DesignBlockSave( const wxString& aLibra // Create the design block folder wxFileName dbFolder( aLibraryPath + wxFileName::GetPathSeparator() + aDesignBlock->GetLibId().GetLibItemName() + wxT( "." ) - + FILEEXT::KiCadDesignBlockPathExtension + + FILEEXT::KiCadDesignBlockFileExtension + wxFileName::GetPathSeparator() ); if( !dbFolder.DirExists() ) @@ -427,7 +427,7 @@ void DESIGN_BLOCK_IO::DesignBlockDelete( const wxString& aLibPath, const wxStrin const std::map* aProperties ) { wxFileName dbDir = wxFileName( aLibPath + wxFileName::GetPathSeparator() + aDesignBlockName - + wxT( "." ) + FILEEXT::KiCadDesignBlockPathExtension ); + + wxT( "." ) + FILEEXT::KiCadDesignBlockFileExtension ); if( !dbDir.DirExists() ) { diff --git a/common/project/project_archiver.cpp b/common/project/project_archiver.cpp index a7173aa705..4961d8147f 100644 --- a/common/project/project_archiver.cpp +++ b/common/project/project_archiver.cpp @@ -155,6 +155,7 @@ bool PROJECT_ARCHIVER::Archive( const wxString& aSrcDir, const wxString& aDestFi wxT( "*.kicad_dru" ), wxT( "*.kicad_wks" ), wxT( "*.kicad_jobset" ), + wxT( "*.kicad_block" ), wxT( "*.wbk" ), wxT( "fp-lib-table" ), wxT( "sym-lib-table" ) diff --git a/common/wildcards_and_files_ext.cpp b/common/wildcards_and_files_ext.cpp index 68fcfc34ad..d28dad3892 100644 --- a/common/wildcards_and_files_ext.cpp +++ b/common/wildcards_and_files_ext.cpp @@ -187,8 +187,8 @@ const std::string FILEEXT::IpcD356FileExtension( "d356" ); const std::string FILEEXT::Ipc2581FileExtension( "xml" ); const std::string FILEEXT::WorkbookFileExtension( "wbk" ); -const std::string FILEEXT::KiCadDesignBlockLibPathExtension( "blocks" ); // this is a directory -const std::string FILEEXT::KiCadDesignBlockPathExtension( "block" ); // this is a directory +const std::string FILEEXT::KiCadDesignBlockLibPathExtension( "kicad_blocks" ); // this is a directory +const std::string FILEEXT::KiCadDesignBlockFileExtension( "kicad_block" ); // this is a directory const std::string FILEEXT::PngFileExtension( "png" ); const std::string FILEEXT::JpegFileExtension( "jpg" ); @@ -343,10 +343,10 @@ wxString FILEEXT::KiCadFootprintLibPathWildcard() } -wxString FILEEXT::KiCadDesignBlockPathWildcard() +wxString FILEEXT::KiCadDesignBlockFileWildcard() { - return _( "KiCad design block path" ) - + AddFileExtListToFilter( { KiCadDesignBlockPathExtension } ); + return _( "KiCad design block files" ) + + AddFileExtListToFilter( { KiCadDesignBlockFileExtension } ); } @@ -555,4 +555,4 @@ wxString FILEEXT::HotkeyFileWildcard() wxString FILEEXT::JobsetFileWildcard() { return _( "KiCad jobset files" ) + AddFileExtListToFilter( { KiCadJobSetFileExtension } ); -} \ No newline at end of file +} diff --git a/eeschema/design_block_utils.cpp b/eeschema/design_block_utils.cpp index 93f1e68761..2d3bd1c29c 100644 --- a/eeschema/design_block_utils.cpp +++ b/eeschema/design_block_utils.cpp @@ -247,7 +247,7 @@ bool SCH_EDIT_FRAME::AddDesignBlockLibrary( const wxString& aFilename, wxString type = DESIGN_BLOCK_IO_MGR::ShowType( lib_type ); - // KiCad lib is our default guess. So it might not have the .blocks extension + // KiCad lib is our default guess. So it might not have the .kicad_blocks extension // In this case, the extension is part of the library name if( lib_type == DESIGN_BLOCK_IO_MGR::KICAD_SEXP && fn.GetExt() != FILEEXT::KiCadDesignBlockLibPathExtension ) diff --git a/include/wildcards_and_files_ext.h b/include/wildcards_and_files_ext.h index 173b07b708..fa26a1b037 100644 --- a/include/wildcards_and_files_ext.h +++ b/include/wildcards_and_files_ext.h @@ -177,7 +177,7 @@ public: static const std::string WorkbookFileExtension; static const std::string KiCadDesignBlockLibPathExtension; - static const std::string KiCadDesignBlockPathExtension; + static const std::string KiCadDesignBlockFileExtension; static const std::string PngFileExtension; static const std::string JpegFileExtension; @@ -254,7 +254,7 @@ public: static wxString KiCadFootprintLibFileWildcard(); static wxString KiCadFootprintLibPathWildcard(); static wxString KiCadDesignBlockLibPathWildcard(); - static wxString KiCadDesignBlockPathWildcard(); + static wxString KiCadDesignBlockFileWildcard(); static wxString TextFileWildcard(); static wxString ModLegacyExportFileWildcard(); static wxString ErcFileWildcard();