Compare commits
2 Commits
297b04bd56
...
a29cea6f61
Author | SHA1 | Date | |
---|---|---|---|
a29cea6f61 | |||
360b2b41d1 |
@ -14,8 +14,8 @@ namespace myx {
|
||||
namespace filesystem {
|
||||
|
||||
MYXLIB_INLINE Paths::Paths() :
|
||||
m_binDirRegex ( "/s*bin$" ),
|
||||
m_unityBinDirRegex( "/bin/unity$" )
|
||||
m_binDirRegex ( QStringLiteral( "/s*bin$" ) ),
|
||||
m_unityBinDirRegex( QStringLiteral( "/bin/unity$" ) )
|
||||
{
|
||||
QFileInfo procSelfExe( QStringLiteral( "/proc/self/exe" ) );
|
||||
QFileInfo currentExecutable = procSelfExe.canonicalFilePath();
|
||||
@ -54,56 +54,56 @@ MYXLIB_INLINE bool Paths::init( bool autodetect )
|
||||
} // Paths::init
|
||||
|
||||
|
||||
MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultProjectDirectory,
|
||||
const QString& defaultEtcDirectory,
|
||||
const QString& defaultConstDataDirectory,
|
||||
const QString& defaultVarDataDirectory,
|
||||
const QString& defaultLogDirectory )
|
||||
MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& projectDir,
|
||||
const QString& etcDir,
|
||||
const QString& constDataDir,
|
||||
const QString& varDataDir,
|
||||
const QString& logDir )
|
||||
{
|
||||
QFileInfo prefixDirInfo { defaultProjectDirectory };
|
||||
QFileInfo prefixDirInfo { projectDir };
|
||||
if ( prefixDirInfo.isDir() && prefixDirInfo.isReadable() )
|
||||
{
|
||||
m_projectDirectory = defaultProjectDirectory;
|
||||
m_projectDirectory = projectDir;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_projectDirectory = QStringLiteral( "." );
|
||||
}
|
||||
|
||||
QFileInfo etcDirInfo { defaultEtcDirectory };
|
||||
QFileInfo etcDirInfo { etcDir };
|
||||
if ( etcDirInfo.isDir() && etcDirInfo.isReadable() )
|
||||
{
|
||||
m_systemConfigDirectory = defaultEtcDirectory;
|
||||
m_systemConfigDirectory = etcDir;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_systemConfigDirectory = m_userConfigDirectory;
|
||||
}
|
||||
|
||||
QFileInfo constDataDirInfo { defaultConstDataDirectory };
|
||||
QFileInfo constDataDirInfo { constDataDir };
|
||||
if ( constDataDirInfo.isDir() && constDataDirInfo.isReadable() )
|
||||
{
|
||||
m_systemConstDataDirectory = defaultConstDataDirectory;
|
||||
m_systemConstDataDirectory = constDataDir;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_systemConstDataDirectory = m_userConstDataDirectory;
|
||||
}
|
||||
|
||||
QFileInfo varDataDirInfo { defaultVarDataDirectory };
|
||||
QFileInfo varDataDirInfo { varDataDir };
|
||||
if ( varDataDirInfo.isDir() && varDataDirInfo.isWritable() )
|
||||
{
|
||||
m_systemVarDataDirectory = defaultVarDataDirectory;
|
||||
m_systemVarDataDirectory = varDataDir;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_systemVarDataDirectory = m_userVarDataDirectory;
|
||||
}
|
||||
|
||||
QFileInfo logDirInfo { defaultLogDirectory };
|
||||
QFileInfo logDirInfo { logDir };
|
||||
if ( logDirInfo.isDir() && logDirInfo.isWritable() )
|
||||
{
|
||||
m_systemLogDirectory = defaultLogDirectory;
|
||||
m_systemLogDirectory = logDir;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -211,11 +211,11 @@ MYXLIB_INLINE void Paths::calculatePaths( HierarchyType hType )
|
||||
break;
|
||||
|
||||
case HierarchyType::kHome:
|
||||
m_projectDirectory = m_homeDirectory;
|
||||
m_systemConfigDirectory = m_userConfigDirectory;
|
||||
m_systemConstDataDirectory = m_userConstDataDirectory;
|
||||
m_systemVarDataDirectory = m_userVarDataDirectory;
|
||||
m_systemLogDirectory = m_userLogDirectory;
|
||||
setupSystemDirectories( m_homeDirectory,
|
||||
m_userConfigDirectory,
|
||||
m_userConstDataDirectory,
|
||||
m_userVarDataDirectory,
|
||||
m_userLogDirectory );
|
||||
break;
|
||||
|
||||
case HierarchyType::kDevelopment:
|
||||
@ -241,30 +241,29 @@ MYXLIB_INLINE void Paths::processOptHierarhy()
|
||||
|
||||
if ( m_autodetect )
|
||||
{
|
||||
QRegularExpression regex( "^/opt/(.+?)-(.+?)/(.+?)/" );
|
||||
QRegularExpression regex( QStringLiteral( "^/opt/(.+?)/(.+?)/" ) );
|
||||
QRegularExpressionMatch match = regex.match( m_executableDirectory );
|
||||
if ( match.hasMatch() )
|
||||
{
|
||||
m_organizationName = match.captured( 1 );
|
||||
m_themeName = match.captured( 2 );
|
||||
m_projectName = match.captured( 3 );
|
||||
|
||||
QRegularExpression vr( "(.+?)\\.(.+)" );
|
||||
QRegularExpressionMatch vm = vr.match( m_themeName );
|
||||
if ( vm.hasMatch() )
|
||||
{
|
||||
m_themeName = vm.captured( 1 );
|
||||
m_version = vm.captured( 2 );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
regex.setPattern( "^/opt/(.+?)/(.+?)/" );
|
||||
match = regex.match( m_executableDirectory );
|
||||
if ( match.hasMatch() )
|
||||
{
|
||||
m_organizationName = match.captured( 1 );
|
||||
m_projectName = match.captured( 2 );
|
||||
|
||||
QRegularExpression themeRegex( QStringLiteral( "(.+?)-(.+)" ) );
|
||||
QRegularExpressionMatch themeMatch = themeRegex.match( m_organizationName );
|
||||
if ( themeMatch.hasMatch() )
|
||||
{
|
||||
m_themeName = themeMatch.captured( 2 );
|
||||
m_organizationName = themeMatch.captured( 1 );
|
||||
m_systemThemeDirectory = "/opt/" + m_organizationName + "-" + m_themeName;
|
||||
}
|
||||
|
||||
QRegularExpression versionRegex( QStringLiteral( "(.+?)\\.(.+)" ) );
|
||||
QRegularExpressionMatch versionMatch = versionRegex.match( m_projectName );
|
||||
if ( versionMatch.hasMatch() )
|
||||
{
|
||||
m_projectName = versionMatch.captured( 1 );
|
||||
m_version = versionMatch.captured( 2 );
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -284,10 +283,10 @@ MYXLIB_INLINE bool Paths::makeDefaultSystemDirectories()
|
||||
bool status = true;
|
||||
QDir dir;
|
||||
|
||||
if ( !dir.mkpath( m_systemConfigDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_systemVarDataDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_systemConstDataDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_systemLogDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_systemConfigDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_systemVarDataDirectory ) ) { status = false; }
|
||||
|
||||
return( status );
|
||||
}
|
||||
@ -298,10 +297,10 @@ MYXLIB_INLINE bool Paths::makeDefaultUserDirectories()
|
||||
bool status = true;
|
||||
QDir dir;
|
||||
|
||||
if ( !dir.mkpath( m_userConfigDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_userVarDataDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_userConstDataDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_userLogDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_userConfigDirectory ) ) { status = false; }
|
||||
if ( !dir.mkpath( m_userVarDataDirectory ) ) { status = false; }
|
||||
|
||||
return( status );
|
||||
}
|
||||
|
@ -208,11 +208,11 @@ private:
|
||||
QRegularExpression m_binDirRegex;
|
||||
QRegularExpression m_unityBinDirRegex;
|
||||
|
||||
void setupSystemDirectories( const QString& defaultProjectDirectory,
|
||||
const QString& defaultEtcDirectory,
|
||||
const QString& defaultConstDataDirectory,
|
||||
const QString& defaultVarDataDirectory,
|
||||
const QString& defaultLogDirectory );
|
||||
void setupSystemDirectories( const QString& projectDir,
|
||||
const QString& etcDir,
|
||||
const QString& constDataDir,
|
||||
const QString& varDataDir,
|
||||
const QString& logDir );
|
||||
void setupUserDirectories();
|
||||
|
||||
HierarchyType getHierarchyType();
|
||||
|
Loading…
Reference in New Issue
Block a user