2015-12-08 07:31:57 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
2020-12-21 00:14:00 +00:00
|
|
|
* Copyright (C) 2015-2020 Cirilo Bernardo <cirilo.bernardo@gmail.com>
|
2015-12-08 07:31:57 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, you may find one here:
|
|
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <fstream>
|
2020-01-15 23:42:16 +00:00
|
|
|
#include <mutex>
|
2016-01-15 00:28:28 +00:00
|
|
|
#include <sstream>
|
2020-01-15 23:42:16 +00:00
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
#include <wx/filename.h>
|
2016-02-23 03:33:24 +00:00
|
|
|
#include <wx/log.h>
|
2016-01-15 00:28:28 +00:00
|
|
|
#include <wx/msgdlg.h>
|
2016-04-17 22:35:32 +00:00
|
|
|
#include <pgm_base.h>
|
2018-05-21 10:09:49 +00:00
|
|
|
#include <trace_helpers.h>
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
#include "common.h"
|
2018-03-07 13:05:12 +00:00
|
|
|
#include "filename_resolver.h"
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-01-19 21:36:26 +00:00
|
|
|
// configuration file version
|
|
|
|
#define CFGFILE_VERSION 1
|
2018-03-07 13:05:12 +00:00
|
|
|
#define RESOLVER_CONFIG wxT( "3Dresolver.cfg" )
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
// flag bits used to track different one-off messages to users
|
2016-01-19 00:05:40 +00:00
|
|
|
#define ERRFLG_ALIAS (1)
|
2016-01-15 00:28:28 +00:00
|
|
|
#define ERRFLG_RELPATH (2)
|
2016-01-19 00:05:40 +00:00
|
|
|
#define ERRFLG_ENVPATH (4)
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-02-23 03:33:24 +00:00
|
|
|
#define MASK_3D_RESOLVER "3D_RESOLVER"
|
|
|
|
|
2020-01-15 23:42:16 +00:00
|
|
|
static std::mutex mutex_resolver;
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& aResult );
|
|
|
|
|
|
|
|
|
2020-04-05 19:51:48 +00:00
|
|
|
FILENAME_RESOLVER::FILENAME_RESOLVER() :
|
|
|
|
m_pgm( nullptr ),
|
|
|
|
m_project( nullptr )
|
2016-01-15 00:28:28 +00:00
|
|
|
{
|
|
|
|
m_errflags = 0;
|
|
|
|
}
|
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::Set3DConfigDir( const wxString& aConfigDir )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
|
|
|
if( aConfigDir.empty() )
|
|
|
|
return false;
|
|
|
|
|
2020-04-05 19:51:48 +00:00
|
|
|
wxFileName cfgdir( ExpandEnvVarSubstitutions( aConfigDir, m_project ), "" );
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
cfgdir.Normalize();
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
if( !cfgdir.DirExists() )
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
m_configDir = cfgdir.GetPath();
|
2015-12-08 07:31:57 +00:00
|
|
|
createPathList();
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-04-05 19:51:48 +00:00
|
|
|
bool FILENAME_RESOLVER::SetProject( PROJECT* aProject, bool* flgChanged )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-04-05 19:51:48 +00:00
|
|
|
m_project = aProject;
|
|
|
|
|
|
|
|
if( !aProject )
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
|
2020-04-05 19:51:48 +00:00
|
|
|
wxFileName projdir( ExpandEnvVarSubstitutions( aProject->GetProjectPath(), aProject ), "" );
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
projdir.Normalize();
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
if( !projdir.DirExists() )
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
|
2016-04-17 22:35:32 +00:00
|
|
|
m_curProjDir = projdir.GetPath();
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
if( flgChanged )
|
|
|
|
*flgChanged = false;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_paths.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2018-03-07 13:05:12 +00:00
|
|
|
SEARCH_PATH al;
|
2020-11-16 11:16:44 +00:00
|
|
|
al.m_Alias = "${KIPRJMOD}";
|
|
|
|
al.m_Pathvar = "${KIPRJMOD}";
|
|
|
|
al.m_Pathexp = m_curProjDir;
|
|
|
|
m_paths.push_back( al );
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
if( flgChanged )
|
|
|
|
*flgChanged = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_paths.front().m_Pathexp.Cmp( m_curProjDir ) )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
m_paths.front().m_Pathexp = m_curProjDir;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
if( flgChanged )
|
|
|
|
*flgChanged = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2020-04-05 19:51:48 +00:00
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
|
|
|
ostr << " * [INFO] changed project dir to ";
|
2020-11-16 11:16:44 +00:00
|
|
|
ostr << m_paths.front().m_Pathexp.ToUTF8();
|
2016-02-23 03:33:24 +00:00
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2020-04-05 19:51:48 +00:00
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
wxString FILENAME_RESOLVER::GetProjectDir()
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-04-17 22:35:32 +00:00
|
|
|
return m_curProjDir;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
void FILENAME_RESOLVER::SetProgramBase( PGM_BASE* aBase )
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
|
|
|
m_pgm = aBase;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !m_pgm || m_paths.empty() )
|
2016-04-17 22:35:32 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
// recreate the path list
|
2020-11-16 11:16:44 +00:00
|
|
|
m_paths.clear();
|
2016-04-17 22:35:32 +00:00
|
|
|
createPathList();
|
2015-12-08 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::createPathList()
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !m_paths.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
return true;
|
|
|
|
|
|
|
|
wxString kmod;
|
|
|
|
|
2016-02-25 03:31:59 +00:00
|
|
|
// add an entry for the default search path; at this point
|
|
|
|
// we cannot set a sensible default so we use an empty string.
|
2015-12-08 07:31:57 +00:00
|
|
|
// the user may change this later with a call to SetProjectDir()
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
SEARCH_PATH lpath;
|
2020-11-16 11:16:44 +00:00
|
|
|
lpath.m_Alias = "${KIPRJMOD}";
|
|
|
|
lpath.m_Pathvar = "${KIPRJMOD}";
|
|
|
|
lpath.m_Pathexp = m_curProjDir;
|
|
|
|
m_paths.push_back( lpath );
|
2016-04-17 22:35:32 +00:00
|
|
|
wxFileName fndummy;
|
|
|
|
wxUniChar psep = fndummy.GetPathSeparator();
|
2016-06-12 22:46:00 +00:00
|
|
|
std::list< wxString > epaths;
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2016-06-12 22:46:00 +00:00
|
|
|
if( GetKicadPaths( epaths ) )
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
2020-01-07 12:35:37 +00:00
|
|
|
for( const wxString& curr_path : epaths )
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
2020-04-05 19:51:48 +00:00
|
|
|
wxString pathVal = ExpandEnvVarSubstitutions( curr_path, m_project );
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2016-06-12 22:46:00 +00:00
|
|
|
if( pathVal.empty() )
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
lpath.m_Pathexp.clear();
|
2016-04-17 22:35:32 +00:00
|
|
|
}
|
2016-06-12 22:46:00 +00:00
|
|
|
else
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
2016-06-12 22:46:00 +00:00
|
|
|
fndummy.Assign( pathVal, "" );
|
|
|
|
fndummy.Normalize();
|
2020-11-16 11:16:44 +00:00
|
|
|
lpath.m_Pathexp = fndummy.GetFullPath();
|
2016-04-17 22:35:32 +00:00
|
|
|
}
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
lpath.m_Alias = curr_path;
|
|
|
|
lpath.m_Pathvar = curr_path;
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
|
|
|
|
lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
m_paths.push_back( lpath );
|
2016-04-17 22:35:32 +00:00
|
|
|
}
|
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !m_configDir.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
readPathList();
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_paths.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2016-02-23 03:33:24 +00:00
|
|
|
wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" );
|
2020-11-16 11:16:44 +00:00
|
|
|
std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
while( sPL != m_paths.end() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
wxLogTrace( MASK_3D_RESOLVER, " + %s : '%s'\n", (*sPL).m_Alias.GetData(),
|
|
|
|
(*sPL).m_Pathexp.GetData() );
|
2015-12-08 07:31:57 +00:00
|
|
|
++sPL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::UpdatePathList( std::vector< SEARCH_PATH >& aPathList )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-04-17 22:35:32 +00:00
|
|
|
wxUniChar envMarker( '$' );
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
while( !m_paths.empty() && envMarker != *m_paths.back().m_Alias.rbegin() )
|
|
|
|
m_paths.pop_back();
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
size_t nI = aPathList.size();
|
|
|
|
|
|
|
|
for( size_t i = 0; i < nI; ++i )
|
|
|
|
addPath( aPathList[i] );
|
|
|
|
|
|
|
|
return writePathList();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-01-15 23:42:16 +00:00
|
|
|
std::lock_guard<std::mutex> lock( mutex_resolver );
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
if( aFileName.empty() )
|
|
|
|
return wxEmptyString;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_paths.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
createPathList();
|
|
|
|
|
|
|
|
// first attempt to use the name as specified:
|
2016-01-15 00:28:28 +00:00
|
|
|
wxString tname = aFileName;
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
// translate from KiCad's internal UNIX-like path to MSWin paths
|
|
|
|
tname.Replace( wxT( "/" ), wxT( "\\" ) );
|
|
|
|
#endif
|
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// Note: variable expansion must be performed using a threadsafe
|
|
|
|
// wrapper for the getenv() system call. If we allow the
|
|
|
|
// wxFileName::Normalize() routine to perform expansion then
|
|
|
|
// we will have a race condition since wxWidgets does not assure
|
|
|
|
// a threadsafe wrapper for getenv().
|
2020-04-05 19:51:48 +00:00
|
|
|
tname = ExpandEnvVarSubstitutions( tname, m_project );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
wxFileName tmpFN( tname );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// in the case of absolute filenames we don't store a map item
|
|
|
|
if( !aFileName.StartsWith( "${" ) && !aFileName.StartsWith( "$(" )
|
|
|
|
&& !aFileName.StartsWith( ":" ) && tmpFN.IsAbsolute() )
|
|
|
|
{
|
|
|
|
tmpFN.Normalize();
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
if( tmpFN.FileExists() )
|
|
|
|
return tmpFN.GetFullPath();
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
return wxEmptyString;
|
|
|
|
}
|
2015-12-19 06:53:07 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// this case covers full paths, leading expanded vars, and paths
|
|
|
|
// relative to the current working directory (which is not necessarily
|
|
|
|
// the current project directory)
|
|
|
|
if( tmpFN.FileExists() )
|
2015-12-19 06:53:07 +00:00
|
|
|
{
|
2016-06-09 05:48:49 +00:00
|
|
|
tmpFN.Normalize();
|
|
|
|
tname = tmpFN.GetFullPath();
|
2015-12-19 06:53:07 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// special case: if a path begins with ${ENV_VAR} but is not in the
|
2016-06-12 22:46:00 +00:00
|
|
|
// resolver's path list then add it.
|
2016-06-09 05:48:49 +00:00
|
|
|
if( aFileName.StartsWith( "${" ) || aFileName.StartsWith( "$(" ) )
|
|
|
|
checkEnvVarPath( aFileName );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
return tname;
|
|
|
|
}
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2018-05-21 10:09:49 +00:00
|
|
|
// if a path begins with ${ENV_VAR}/$(ENV_VAR) and is not resolved then the
|
|
|
|
// file either does not exist or the ENV_VAR is not defined
|
|
|
|
if( aFileName.StartsWith( "${" ) || aFileName.StartsWith( "$(" ) )
|
|
|
|
{
|
|
|
|
if( !( m_errflags & ERRFLG_ENVPATH ) )
|
|
|
|
{
|
|
|
|
m_errflags |= ERRFLG_ENVPATH;
|
|
|
|
wxString errmsg = "[3D File Resolver] No such path; ensure the environment var is defined";
|
|
|
|
errmsg.append( "\n" );
|
|
|
|
errmsg.append( tname );
|
|
|
|
errmsg.append( "\n" );
|
|
|
|
wxLogTrace( tracePathsAndFiles, errmsg );
|
|
|
|
}
|
|
|
|
|
|
|
|
return wxEmptyString;
|
|
|
|
}
|
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// at this point aFileName is:
|
|
|
|
// a. an aliased shortened name or
|
|
|
|
// b. cannot be determined
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
|
|
|
|
std::list< SEARCH_PATH >::const_iterator ePL = m_paths.end();
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-01-15 03:01:21 +00:00
|
|
|
// check the path relative to the current project directory;
|
|
|
|
// note: this is not necessarily the same as the current working
|
2016-04-17 22:35:32 +00:00
|
|
|
// directory, which has already been checked. This case accounts
|
|
|
|
// for partial paths which do not contain ${KIPRJMOD}.
|
2016-06-09 05:48:49 +00:00
|
|
|
// This check is performed before checking the path relative to
|
2020-12-31 21:22:44 +00:00
|
|
|
// ${KICAD6_3DMODEL_DIR} so that users can potentially override a model
|
|
|
|
// within ${KICAD6_3DMODEL_DIR}
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !sPL->m_Pathexp.empty() && !tname.StartsWith( ":" ) )
|
2015-12-19 06:53:07 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
tmpFN.Assign( sPL->m_Pathexp, "" );
|
2016-06-09 05:48:49 +00:00
|
|
|
wxString fullPath = tmpFN.GetPathWithSep() + tname;
|
|
|
|
|
2020-04-05 19:51:48 +00:00
|
|
|
fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
if( wxFileName::FileExists( fullPath ) )
|
|
|
|
{
|
2016-06-09 05:48:49 +00:00
|
|
|
tmpFN.Assign( fullPath );
|
|
|
|
tmpFN.Normalize();
|
|
|
|
tname = tmpFN.GetFullPath();
|
2016-01-15 00:28:28 +00:00
|
|
|
return tname;
|
|
|
|
}
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2016-02-25 03:31:59 +00:00
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-12-31 21:22:44 +00:00
|
|
|
// check the partial path relative to ${KICAD6_3DMODEL_DIR} (legacy behavior)
|
2016-06-09 05:48:49 +00:00
|
|
|
if( !tname.StartsWith( ":" ) )
|
2016-01-18 23:30:20 +00:00
|
|
|
{
|
2016-06-09 05:48:49 +00:00
|
|
|
wxFileName fpath;
|
2020-12-31 21:22:44 +00:00
|
|
|
wxString fullPath( "${KICAD6_3DMODEL_DIR}" );
|
2016-06-09 05:48:49 +00:00
|
|
|
fullPath.Append( fpath.GetPathSeparator() );
|
|
|
|
fullPath.Append( tname );
|
2020-04-05 19:51:48 +00:00
|
|
|
fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
|
2016-06-09 05:48:49 +00:00
|
|
|
fpath.Assign( fullPath );
|
|
|
|
|
|
|
|
if( fpath.Normalize() && fpath.FileExists() )
|
2016-01-18 23:30:20 +00:00
|
|
|
{
|
2016-06-09 05:48:49 +00:00
|
|
|
tname = fpath.GetFullPath();
|
|
|
|
return tname;
|
2016-01-18 23:30:20 +00:00
|
|
|
}
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2016-01-18 23:30:20 +00:00
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// ${ENV_VAR} paths have already been checked; skip them
|
2020-11-16 11:16:44 +00:00
|
|
|
while( sPL != ePL && ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
|
2016-06-09 05:48:49 +00:00
|
|
|
++sPL;
|
|
|
|
|
2016-04-17 22:35:32 +00:00
|
|
|
// at this point the filename must contain an alias or else it is invalid
|
2016-01-15 00:28:28 +00:00
|
|
|
wxString alias; // the alias portion of the short filename
|
|
|
|
wxString relpath; // the path relative to the alias
|
|
|
|
|
2016-01-18 23:30:20 +00:00
|
|
|
if( !SplitAlias( tname, alias, relpath ) )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-01-19 00:05:40 +00:00
|
|
|
if( !( m_errflags & ERRFLG_RELPATH ) )
|
|
|
|
{
|
2016-04-17 22:35:32 +00:00
|
|
|
// this can happen if the file was intended to be relative to
|
2020-12-31 21:22:44 +00:00
|
|
|
// ${KICAD6_3DMODEL_DIR} but ${KICAD6_3DMODEL_DIR} not set or incorrect.
|
2016-01-19 00:05:40 +00:00
|
|
|
m_errflags |= ERRFLG_RELPATH;
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "[3D File Resolver] No such path";
|
2016-01-19 00:05:40 +00:00
|
|
|
errmsg.append( "\n" );
|
|
|
|
errmsg.append( tname );
|
2018-05-21 10:09:49 +00:00
|
|
|
errmsg.append( "\n" );
|
|
|
|
wxLogTrace( tracePathsAndFiles, errmsg );
|
2016-01-19 00:05:40 +00:00
|
|
|
}
|
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
return wxEmptyString;
|
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
while( sPL != ePL )
|
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !sPL->m_Alias.Cmp( alias ) && !sPL->m_Pathexp.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
wxFileName fpath( wxFileName::DirName( sPL->m_Pathexp ) );
|
2016-01-15 00:28:28 +00:00
|
|
|
wxString fullPath = fpath.GetPathWithSep() + relpath;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-04-05 19:51:48 +00:00
|
|
|
fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
if( wxFileName::FileExists( fullPath ) )
|
|
|
|
{
|
|
|
|
wxFileName tmp( fullPath );
|
|
|
|
|
|
|
|
if( tmp.Normalize() )
|
|
|
|
tname = tmp.GetFullPath();
|
|
|
|
|
|
|
|
return tname;
|
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
++sPL;
|
|
|
|
}
|
|
|
|
|
2016-01-19 00:05:40 +00:00
|
|
|
if( !( m_errflags & ERRFLG_ALIAS ) )
|
|
|
|
{
|
|
|
|
m_errflags |= ERRFLG_ALIAS;
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined";
|
2016-01-19 00:05:40 +00:00
|
|
|
errmsg.append( "\n" );
|
2016-01-23 05:09:42 +00:00
|
|
|
errmsg.append( tname.substr( 1 ) );
|
2018-05-21 10:09:49 +00:00
|
|
|
errmsg.append( "\n" );
|
|
|
|
wxLogTrace( tracePathsAndFiles, errmsg );
|
2016-01-19 00:05:40 +00:00
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
return wxEmptyString;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( aPath.m_Alias.empty() || aPath.m_Pathvar.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
|
2020-01-15 23:42:16 +00:00
|
|
|
std::lock_guard<std::mutex> lock( mutex_resolver );
|
2016-04-11 03:03:39 +00:00
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
SEARCH_PATH tpath = aPath;
|
2016-01-19 21:36:26 +00:00
|
|
|
|
|
|
|
#ifdef _WIN32
|
2020-11-16 11:16:44 +00:00
|
|
|
while( tpath.m_Pathvar.EndsWith( wxT( "\\" ) ) )
|
2020-11-17 17:35:27 +00:00
|
|
|
tpath.m_Pathvar.erase( tpath.m_Pathvar.length() - 1 );
|
2016-01-19 21:36:26 +00:00
|
|
|
#else
|
2020-11-16 11:16:44 +00:00
|
|
|
while( tpath.m_Pathvar.EndsWith( wxT( "/" ) ) && tpath.m_Pathvar.length() > 1 )
|
|
|
|
tpath.m_Pathvar.erase( tpath.m_Pathvar.length() - 1 );
|
2016-01-19 21:36:26 +00:00
|
|
|
#endif
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
wxFileName path( ExpandEnvVarSubstitutions( tpath.m_Pathvar, m_project ), "" );
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2016-01-19 21:36:26 +00:00
|
|
|
path.Normalize();
|
2016-01-12 06:09:04 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
if( !path.DirExists() )
|
2016-01-19 21:36:26 +00:00
|
|
|
{
|
2016-02-03 00:44:48 +00:00
|
|
|
// suppress the message if the missing pathvar is the
|
2020-12-31 21:22:44 +00:00
|
|
|
// legacy KICAD6_3DMODEL_DIR variable
|
|
|
|
if( aPath.m_Pathvar.compare( wxT( "${KICAD6_3DMODEL_DIR}" ) ) )
|
2016-02-03 00:44:48 +00:00
|
|
|
{
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString msg = _( "The given path does not exist" );
|
2016-02-03 00:44:48 +00:00
|
|
|
msg.append( wxT( "\n" ) );
|
2020-11-16 11:16:44 +00:00
|
|
|
msg.append( tpath.m_Pathvar );
|
2016-04-21 07:19:08 +00:00
|
|
|
wxMessageBox( msg, _( "3D model search path" ) );
|
2016-02-03 00:44:48 +00:00
|
|
|
}
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
tpath.m_Pathexp.clear();
|
2016-01-19 21:36:26 +00:00
|
|
|
}
|
2016-01-15 00:28:28 +00:00
|
|
|
else
|
2016-01-19 21:36:26 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
tpath.m_Pathexp = path.GetFullPath();
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
while( tpath.m_Pathexp.EndsWith( wxT( "\\" ) ) )
|
|
|
|
tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
|
|
|
|
#else
|
|
|
|
while( tpath.m_Pathexp.EndsWith( wxT( "/" ) ) && tpath.m_Pathexp.length() > 1 )
|
|
|
|
tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
|
|
|
|
#endif
|
2016-01-19 21:36:26 +00:00
|
|
|
}
|
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
wxString pname = path.GetPath();
|
2020-11-16 11:16:44 +00:00
|
|
|
std::list< SEARCH_PATH >::iterator sPL = m_paths.begin();
|
|
|
|
std::list< SEARCH_PATH >::iterator ePL = m_paths.end();
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
while( sPL != ePL )
|
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !tpath.m_Alias.Cmp( sPL->m_Alias ) )
|
2016-01-15 00:28:28 +00:00
|
|
|
{
|
2016-01-19 00:05:40 +00:00
|
|
|
wxString msg = _( "Alias: " );
|
2020-11-16 11:16:44 +00:00
|
|
|
msg.append( tpath.m_Alias );
|
2016-01-15 00:28:28 +00:00
|
|
|
msg.append( wxT( "\n" ) );
|
2020-11-10 20:31:52 +00:00
|
|
|
msg.append( _( "This path:" ) + wxS( " " ) );
|
2020-11-16 11:16:44 +00:00
|
|
|
msg.append( tpath.m_Pathvar );
|
2016-01-15 00:28:28 +00:00
|
|
|
msg.append( wxT( "\n" ) );
|
2020-11-10 20:31:52 +00:00
|
|
|
msg.append( _( "Existing path:" ) + wxS( " " ) );
|
2020-11-16 11:16:44 +00:00
|
|
|
msg.append( sPL->m_Pathvar );
|
2016-01-19 00:05:40 +00:00
|
|
|
wxMessageBox( msg, _( "Bad alias (duplicate name)" ) );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
++sPL;
|
|
|
|
}
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
m_paths.push_back( tpath );
|
2015-12-08 07:31:57 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::readPathList()
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_configDir.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "3D configuration directory is unknown";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8();
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
wxFileName cfgpath( m_configDir, RESOLVER_CONFIG );
|
2015-12-08 07:31:57 +00:00
|
|
|
cfgpath.Normalize();
|
|
|
|
wxString cfgname = cfgpath.GetFullPath();
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
size_t nitems = m_paths.size();
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
std::ifstream cfgFile;
|
|
|
|
std::string cfgLine;
|
|
|
|
|
|
|
|
if( !wxFileName::Exists( cfgname ) )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "no 3D configuration file";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << " '";
|
|
|
|
ostr << cfgname.ToUTF8() << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
cfgFile.open( cfgname.ToUTF8() );
|
|
|
|
|
|
|
|
if( !cfgFile.is_open() )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "Could not open configuration file";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << " '" << cfgname.ToUTF8() << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int lineno = 0;
|
2018-03-07 13:05:12 +00:00
|
|
|
SEARCH_PATH al;
|
2016-01-15 00:28:28 +00:00
|
|
|
size_t idx;
|
2016-01-19 21:36:26 +00:00
|
|
|
int vnum = 0; // version number
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
while( cfgFile.good() )
|
|
|
|
{
|
|
|
|
cfgLine.clear();
|
|
|
|
std::getline( cfgFile, cfgLine );
|
|
|
|
++lineno;
|
|
|
|
|
|
|
|
if( cfgLine.empty() )
|
|
|
|
{
|
|
|
|
if( cfgFile.eof() )
|
|
|
|
break;
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-04-05 10:32:22 +00:00
|
|
|
if( 1 == lineno && cfgLine.compare( 0, 2, "#V" ) == 0 )
|
2016-01-19 21:36:26 +00:00
|
|
|
{
|
|
|
|
// extract the version number and parse accordingly
|
|
|
|
if( cfgLine.size() > 2 )
|
|
|
|
{
|
|
|
|
std::istringstream istr;
|
|
|
|
istr.str( cfgLine.substr( 2 ) );
|
|
|
|
istr >> vnum;
|
|
|
|
}
|
2016-01-19 22:07:09 +00:00
|
|
|
|
|
|
|
continue;
|
2016-01-19 21:36:26 +00:00
|
|
|
}
|
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
idx = 0;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !getHollerith( cfgLine, idx, al.m_Alias ) )
|
2016-01-15 00:28:28 +00:00
|
|
|
continue;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-12-31 21:22:44 +00:00
|
|
|
// never add on KICAD6_3DMODEL_DIR from a config file
|
|
|
|
if( !al.m_Alias.Cmp( wxT( "KICAD6_3DMODEL_DIR" ) ) )
|
2016-01-18 08:53:35 +00:00
|
|
|
continue;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !getHollerith( cfgLine, idx, al.m_Pathvar ) )
|
2016-01-15 00:28:28 +00:00
|
|
|
continue;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !getHollerith( cfgLine, idx, al.m_Description ) )
|
2016-01-15 00:28:28 +00:00
|
|
|
continue;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
addPath( al );
|
2015-12-08 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
cfgFile.close();
|
|
|
|
|
2016-01-19 21:36:26 +00:00
|
|
|
if( vnum < CFGFILE_VERSION )
|
|
|
|
writePathList();
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
return( m_paths.size() != nitems );
|
2015-12-08 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::writePathList()
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_configDir.empty() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-01-12 06:09:04 +00:00
|
|
|
wxString errmsg = _( "3D configuration directory is unknown" );
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8();
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-19 00:05:40 +00:00
|
|
|
wxMessageBox( errmsg, _( "Write 3D search path list" ) );
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
return false;
|
2016-01-18 08:53:35 +00:00
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-04-17 22:35:32 +00:00
|
|
|
// skip all ${ENV_VAR} alias names
|
2020-11-16 11:16:44 +00:00
|
|
|
std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
while( sPL != m_paths.end() &&
|
|
|
|
( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
|
2016-04-17 22:35:32 +00:00
|
|
|
++sPL;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
wxFileName cfgpath( m_configDir, RESOLVER_CONFIG );
|
2015-12-14 07:41:15 +00:00
|
|
|
wxString cfgname = cfgpath.GetFullPath();
|
2015-12-08 07:31:57 +00:00
|
|
|
std::ofstream cfgFile;
|
|
|
|
|
|
|
|
cfgFile.open( cfgname.ToUTF8(), std::ios_base::trunc );
|
|
|
|
|
|
|
|
if( !cfgFile.is_open() )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-08 12:11:05 +00:00
|
|
|
wxString errmsg = _( "Could not open configuration file" );
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << " '" << cfgname.ToUTF8() << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-04-08 12:11:05 +00:00
|
|
|
wxMessageBox( errmsg, _( "Write 3D search path list" ) );
|
2016-01-18 08:53:35 +00:00
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-01-19 21:36:26 +00:00
|
|
|
cfgFile << "#V" << CFGFILE_VERSION << "\n";
|
2016-01-15 00:28:28 +00:00
|
|
|
std::string tstr;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
while( sPL != m_paths.end() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
tstr = sPL->m_Alias.ToUTF8();
|
2016-01-15 00:28:28 +00:00
|
|
|
cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
|
2020-11-16 11:16:44 +00:00
|
|
|
tstr = sPL->m_Pathvar.ToUTF8();
|
2016-01-15 00:28:28 +00:00
|
|
|
cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
|
2020-11-16 11:16:44 +00:00
|
|
|
tstr = sPL->m_Description.ToUTF8();
|
2016-01-15 00:28:28 +00:00
|
|
|
cfgFile << "\"" << tstr.size() << ":" << tstr << "\"\n";
|
2015-12-08 07:31:57 +00:00
|
|
|
++sPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool bad = cfgFile.bad();
|
|
|
|
cfgFile.close();
|
|
|
|
|
|
|
|
if( bad )
|
2016-01-18 08:53:35 +00:00
|
|
|
{
|
2016-01-19 00:05:40 +00:00
|
|
|
wxMessageBox( _( "Problems writing configuration file" ),
|
|
|
|
_( "Write 3D search path list" ) );
|
2016-01-18 08:53:35 +00:00
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
return false;
|
2016-01-18 08:53:35 +00:00
|
|
|
}
|
2015-12-08 07:31:57 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
void FILENAME_RESOLVER::checkEnvVarPath( const wxString& aPath )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-06-09 05:48:49 +00:00
|
|
|
bool useParen = false;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
if( aPath.StartsWith( "$(" ) )
|
|
|
|
useParen = true;
|
|
|
|
else if( !aPath.StartsWith( "${" ) )
|
|
|
|
return;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
size_t pEnd;
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
if( useParen )
|
|
|
|
pEnd = aPath.find( ")" );
|
|
|
|
else
|
|
|
|
pEnd = aPath.find( "}" );
|
|
|
|
|
|
|
|
if( pEnd == wxString::npos )
|
|
|
|
return;
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
wxString envar = aPath.substr( 0, pEnd + 1 );
|
2016-04-17 22:35:32 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// check if the alias exists; if not then add it to the end of the
|
|
|
|
// env var section of the path list
|
2020-11-16 11:16:44 +00:00
|
|
|
auto sPL = m_paths.begin();
|
|
|
|
auto ePL = m_paths.end();
|
2016-04-17 22:35:32 +00:00
|
|
|
|
|
|
|
while( sPL != ePL )
|
2016-01-15 00:28:28 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
if( sPL->m_Alias == envar )
|
2016-06-09 05:48:49 +00:00
|
|
|
return;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !sPL->m_Alias.StartsWith( "${" ) )
|
2016-06-09 05:48:49 +00:00
|
|
|
break;
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
++sPL;
|
|
|
|
}
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
SEARCH_PATH lpath;
|
2020-11-16 11:16:44 +00:00
|
|
|
lpath.m_Alias = envar;
|
|
|
|
lpath.m_Pathvar = lpath.m_Alias;
|
|
|
|
wxFileName tmpFN( ExpandEnvVarSubstitutions( lpath.m_Alias, m_project ), "" );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
wxUniChar psep = tmpFN.GetPathSeparator();
|
|
|
|
tmpFN.Normalize();
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
if( !tmpFN.DirExists() )
|
|
|
|
return;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
lpath.m_Pathexp = tmpFN.GetFullPath();
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
|
|
|
|
lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
|
2016-06-09 05:48:49 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( lpath.m_Pathexp.empty() )
|
2016-06-09 05:48:49 +00:00
|
|
|
return;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
m_paths.insert( sPL, lpath );
|
2016-04-17 22:35:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
|
|
|
wxString fname = aFullPathName;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( m_paths.empty() )
|
2016-04-17 22:35:32 +00:00
|
|
|
createPathList();
|
|
|
|
|
2020-01-15 23:42:16 +00:00
|
|
|
std::lock_guard<std::mutex> lock( mutex_resolver );
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
std::list< SEARCH_PATH >::const_iterator sL = m_paths.begin();
|
2016-04-17 22:35:32 +00:00
|
|
|
size_t idx;
|
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
while( sL != m_paths.end() )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2016-04-17 22:35:32 +00:00
|
|
|
// undefined paths do not participate in the
|
|
|
|
// file name shortening procedure
|
2020-11-16 11:16:44 +00:00
|
|
|
if( sL->m_Pathexp.empty() )
|
2016-01-15 00:28:28 +00:00
|
|
|
{
|
|
|
|
++sL;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-06-12 22:46:00 +00:00
|
|
|
wxFileName fpath;
|
|
|
|
|
|
|
|
// in the case of aliases, ensure that we use the most recent definition
|
2020-11-16 11:16:44 +00:00
|
|
|
if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
|
2016-06-12 22:46:00 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
wxString tpath = ExpandEnvVarSubstitutions( sL->m_Alias, m_project );
|
2016-06-12 22:46:00 +00:00
|
|
|
|
|
|
|
if( tpath.empty() )
|
|
|
|
{
|
|
|
|
++sL;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
fpath.Assign( tpath, wxT( "" ) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
fpath.Assign( sL->m_Pathexp, wxT( "" ) );
|
2016-06-12 22:46:00 +00:00
|
|
|
}
|
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
wxString fps = fpath.GetPathWithSep();
|
2016-01-15 00:28:28 +00:00
|
|
|
wxString tname;
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
idx = fname.find( fps );
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
if( idx == 0 )
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
|
|
|
fname = fname.substr( fps.size() );
|
|
|
|
|
2016-01-15 00:28:28 +00:00
|
|
|
#ifdef _WIN32
|
|
|
|
// ensure only the '/' separator is used in the internal name
|
2015-12-08 07:31:57 +00:00
|
|
|
fname.Replace( wxT( "\\" ), wxT( "/" ) );
|
2016-01-15 00:28:28 +00:00
|
|
|
#endif
|
2015-12-08 07:31:57 +00:00
|
|
|
|
2020-11-16 11:16:44 +00:00
|
|
|
if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
|
2016-04-17 22:35:32 +00:00
|
|
|
{
|
|
|
|
// old style ENV_VAR
|
2020-11-16 11:16:44 +00:00
|
|
|
tname = sL->m_Alias;
|
2016-04-17 22:35:32 +00:00
|
|
|
tname.Append( "/" );
|
|
|
|
tname.append( fname );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// new style alias
|
|
|
|
tname = ":";
|
2020-11-16 11:16:44 +00:00
|
|
|
tname.append( sL->m_Alias );
|
2016-04-17 22:35:32 +00:00
|
|
|
tname.append( ":" );
|
|
|
|
tname.append( fname );
|
|
|
|
}
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return tname;
|
2015-12-08 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
++sL;
|
|
|
|
}
|
|
|
|
|
2016-01-11 05:24:51 +00:00
|
|
|
#ifdef _WIN32
|
|
|
|
// it is strange to convert an MSWin full path to use the
|
|
|
|
// UNIX separator but this is done for consistency and can
|
|
|
|
// be helpful even when transferring project files from
|
|
|
|
// MSWin to *NIX.
|
|
|
|
fname.Replace( wxT( "\\" ), wxT( "/" ) );
|
|
|
|
#endif
|
|
|
|
|
2015-12-08 07:31:57 +00:00
|
|
|
return fname;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
const std::list< SEARCH_PATH >* FILENAME_RESOLVER::GetPaths()
|
2015-12-08 07:31:57 +00:00
|
|
|
{
|
2020-11-16 11:16:44 +00:00
|
|
|
return &m_paths;
|
2015-12-08 07:31:57 +00:00
|
|
|
}
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::SplitAlias( const wxString& aFileName,
|
2016-01-15 00:28:28 +00:00
|
|
|
wxString& anAlias, wxString& aRelPath )
|
|
|
|
{
|
|
|
|
anAlias.clear();
|
|
|
|
aRelPath.clear();
|
|
|
|
|
|
|
|
if( !aFileName.StartsWith( wxT( ":" ) ) )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
size_t tagpos = aFileName.find( wxT( ":" ), 1 );
|
|
|
|
|
|
|
|
if( wxString::npos == tagpos || 1 == tagpos )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if( tagpos + 1 >= aFileName.length() )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
anAlias = aFileName.substr( 1, tagpos - 1 );
|
|
|
|
aRelPath = aFileName.substr( tagpos + 1 );
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& aResult )
|
|
|
|
{
|
|
|
|
aResult.clear();
|
|
|
|
|
2016-02-29 23:08:19 +00:00
|
|
|
if( aIndex >= aString.size() )
|
2016-01-15 00:28:28 +00:00
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "bad Hollerith string on line";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t i2 = aString.find( '"', aIndex );
|
|
|
|
|
|
|
|
if( std::string::npos == i2 )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "missing opening quote mark in config file";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
++i2;
|
|
|
|
|
|
|
|
if( i2 >= aString.size() )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "invalid entry (unexpected end of line)";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string tnum;
|
|
|
|
|
|
|
|
while( aString[i2] >= '0' && aString[i2] <= '9' )
|
|
|
|
tnum.append( 1, aString[i2++] );
|
|
|
|
|
|
|
|
if( tnum.empty() || aString[i2++] != ':' )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "bad Hollerith string on line";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::istringstream istr;
|
|
|
|
istr.str( tnum );
|
|
|
|
size_t nchars;
|
|
|
|
istr >> nchars;
|
|
|
|
|
|
|
|
if( (i2 + nchars) >= aString.size() )
|
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-21 07:19:08 +00:00
|
|
|
wxString errmsg = "invalid entry (unexpected end of line)";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nchars > 0 )
|
|
|
|
{
|
2020-01-07 12:35:37 +00:00
|
|
|
aResult = wxString::FromUTF8( aString.substr( i2, nchars ).c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
i2 += nchars;
|
|
|
|
}
|
|
|
|
|
2020-12-21 00:14:00 +00:00
|
|
|
if( i2 >= aString.size() || aString[i2] != '"' )
|
2016-01-15 00:28:28 +00:00
|
|
|
{
|
2016-02-23 03:33:24 +00:00
|
|
|
std::ostringstream ostr;
|
|
|
|
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
2016-04-08 12:11:05 +00:00
|
|
|
wxString errmsg = "missing closing quote mark in config file";
|
2016-02-23 03:33:24 +00:00
|
|
|
ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'";
|
|
|
|
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
|
2016-01-15 00:28:28 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
aIndex = i2 + 1;
|
|
|
|
return true;
|
|
|
|
}
|
2016-01-23 03:52:54 +00:00
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::ValidateFileName( const wxString& aFileName, bool& hasAlias )
|
2016-01-23 03:52:54 +00:00
|
|
|
{
|
|
|
|
// Rules:
|
|
|
|
// 1. The generic form of an aliased 3D relative path is:
|
|
|
|
// ALIAS:relative/path
|
|
|
|
// 2. ALIAS is a UTF string excluding wxT( "{}[]()%~<>\"='`;:.,&?/\\|$" )
|
|
|
|
// 3. The relative path must be a valid relative path for the platform
|
|
|
|
hasAlias = false;
|
|
|
|
|
|
|
|
if( aFileName.empty() )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
wxString filename = aFileName;
|
|
|
|
size_t pos0 = aFileName.find( ':' );
|
|
|
|
|
|
|
|
// ensure that the file separators suit the current platform
|
|
|
|
#ifdef __WINDOWS__
|
|
|
|
filename.Replace( wxT( "/" ), wxT( "\\" ) );
|
|
|
|
|
|
|
|
// if we see the :\ pattern then it must be a drive designator
|
|
|
|
if( pos0 != wxString::npos )
|
|
|
|
{
|
2017-05-28 16:56:49 +00:00
|
|
|
size_t pos1 = filename.find( wxT( ":\\" ) );
|
2016-01-23 03:52:54 +00:00
|
|
|
|
|
|
|
if( pos1 != wxString::npos && ( pos1 != pos0 || pos1 != 1 ) )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// if we have a drive designator then we have no alias
|
|
|
|
if( pos1 != wxString::npos )
|
|
|
|
pos0 = wxString::npos;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
filename.Replace( wxT( "\\" ), wxT( "/" ) );
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// names may not end with ':'
|
|
|
|
if( pos0 == aFileName.length() -1 )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if( pos0 != wxString::npos )
|
|
|
|
{
|
|
|
|
// ensure the alias component is not empty
|
|
|
|
if( pos0 == 0 )
|
|
|
|
return false;
|
|
|
|
|
2016-05-30 08:22:19 +00:00
|
|
|
wxString lpath = filename.substr( 0, pos0 );
|
2016-01-23 03:52:54 +00:00
|
|
|
|
2016-06-09 05:48:49 +00:00
|
|
|
// check the alias for restricted characters
|
2016-01-23 03:52:54 +00:00
|
|
|
if( wxString::npos != lpath.find_first_of( wxT( "{}[]()%~<>\"='`;:.,&?/\\|$" ) ) )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
hasAlias = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2016-06-12 22:46:00 +00:00
|
|
|
|
|
|
|
|
2018-03-07 13:05:12 +00:00
|
|
|
bool FILENAME_RESOLVER::GetKicadPaths( std::list< wxString >& paths )
|
2016-06-12 22:46:00 +00:00
|
|
|
{
|
|
|
|
paths.clear();
|
|
|
|
|
|
|
|
if( !m_pgm )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
bool hasKisys3D = false;
|
|
|
|
|
|
|
|
|
|
|
|
// iterate over the list of internally defined ENV VARs
|
|
|
|
// and add them to the paths list
|
|
|
|
ENV_VAR_MAP_CITER mS = m_pgm->GetLocalEnvVariables().begin();
|
|
|
|
ENV_VAR_MAP_CITER mE = m_pgm->GetLocalEnvVariables().end();
|
|
|
|
|
|
|
|
while( mS != mE )
|
|
|
|
{
|
|
|
|
// filter out URLs, template directories, and known system paths
|
|
|
|
if( mS->first == wxString( "KICAD_PTEMPLATES" )
|
2020-12-31 21:22:44 +00:00
|
|
|
|| mS->first == wxString( "KICAD6_FOOTPRINT_DIR" ) )
|
2016-06-12 22:46:00 +00:00
|
|
|
{
|
|
|
|
++mS;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( wxString::npos != mS->second.GetValue().find( wxString( "://" ) ) )
|
|
|
|
{
|
|
|
|
++mS;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
wxString tmp( "${" );
|
|
|
|
tmp.Append( mS->first );
|
|
|
|
tmp.Append( "}" );
|
|
|
|
paths.push_back( tmp );
|
|
|
|
|
2020-12-31 21:22:44 +00:00
|
|
|
if( tmp == "${KICAD6_3DMODEL_DIR}" )
|
2016-06-12 22:46:00 +00:00
|
|
|
hasKisys3D = true;
|
|
|
|
|
|
|
|
++mS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !hasKisys3D )
|
2020-12-31 21:22:44 +00:00
|
|
|
paths.emplace_back("${KICAD6_3DMODEL_DIR}" );
|
2016-06-12 22:46:00 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|