Don't copy lock files during project Save As.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15207

common/wildcards_and_files_ext.cpp

@@ -123,6 +123,8 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts )
 }
 
 const std::string BackupFileSuffix( "-bak" );
+const std::string LockFilePrefix( "~" );
+const std::string LockFileExtension( "lck" );
 
 const std::string KiCadSymbolLibFileExtension( "kicad_sym" );
 const std::string SchematicSymbolFileExtension( "sym" );

include/lockfile.h

@@ -35,6 +35,7 @@
 #include <wx/log.h>
 #include <wx/filename.h>
 #include <nlohmann/json.hpp>
+#include <wildcards_and_files_ext.h>
 
 #define LCK "KICAD_LOCKING"
 
@@ -50,8 +51,8 @@ public:
 
         wxLogTrace( LCK, "Trying to lock %s", filename );
         wxFileName fn( filename );
-        fn.SetName( "~" + fn.GetName() );
+        fn.SetName( LockFilePrefix + fn.GetName() );
-        fn.SetExt( fn.GetExt() + ".lck" );
+        fn.SetExt( fn.GetExt() + '.' + LockFileExtension );
 
         if( !fn.IsDirWritable() )
         {
@@ -193,7 +194,7 @@ public:
             catch( std::exception& e )
             {
                 wxLogError( "Got exception trying to override lock on %s: %s",
-                        m_lockFilename, e.what() );
+                            m_lockFilename, e.what() );
 
                 return false;
             }
@@ -253,8 +254,7 @@ private:
 
         if( !fileName.FileExists() )
         {
-            wxLogTrace
+            wxLogTrace( LCK, "File does not exist: %s", m_lockFilename );
-            ( LCK, "File does not exist: %s", m_lockFilename );
             return false;
         }
 
@@ -266,24 +266,23 @@ private:
                 wxString lock_info;
                 file.ReadAll( &lock_info );
                 nlohmann::json j = nlohmann::json::parse( std::string( lock_info.mb_str() ) );
+
                 if( m_username == wxString( j["username"].get<std::string>() )
                         && m_hostname == wxString( j["hostname"].get<std::string>() ) )
                 {
-                    wxLogTrace
+                    wxLogTrace( LCK, "User and host match for lock %s", m_lockFilename );
-                        ( LCK, "User and host match for lock %s", m_lockFilename );
                     return true;
                 }
             }
         }
         catch( std::exception &e )
         {
-            wxLogError
+            wxLogError( "Got exception trying to check user/host for lock on %s: %s",
-                ( "Got exception trying to check user/host for lock on %s: %s", m_lockFilename,
+                        m_lockFilename,
-                    e.what() );
+                        e.what() );
         }
 
-        wxLogTrace
+        wxLogTrace( LCK, "User and host DID NOT match for lock %s", m_lockFilename );
-            ( LCK, "User and host DID NOT match for lock %s", m_lockFilename );
         return false;
     }
 };

include/wildcards_and_files_ext.h

@@ -109,6 +109,8 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts );
 wxString formatWildcardExt( const wxString& aWildcard );
 
 extern const std::string BackupFileSuffix;
+extern const std::string LockFilePrefix;
+extern const std::string LockFileExtension;
 
 extern const std::string SchematicSymbolFileExtension;
 extern const std::string LegacySymbolLibFileExtension;

kicad/tools/kicad_manager_control.cpp

@@ -536,6 +536,10 @@ public:
             gerbview->SaveFileAs( m_projectDirPath, m_projectName, m_newProjectDirPath,
                                   m_newProjectName, aSrcFilePath, m_errors );
         }
+        else if(destFile.GetName().StartsWith( LockFilePrefix ) && ext == LockFileExtension )
+        {
+            // Ignore lock files
+        }
         else
         {
             // Everything we don't recognize just gets a straight copy.