b060378dca
- wrap command-line retrieval of fileName with an implicit validate.
Instead of this:
fileName input(args[1]);
fileName other(args["someopt"]);
Now use this:
auto input = args.get<fileName>(1);
auto other = args.get<fileName>("someopt");
which adds a fileName::validate on the inputs
Because of how it is implemented, it will automatically also apply
to argList getOrDefault<fileName>, readIfPresent<fileName> etc.
- adjust fileName::validate and clean to handle backslash conversion.
This makes it easier to ensure that path names arising from MS-Windows
are consistently handled internally.
- dictionarySearch: now check for initial '/' directly instead of
relying on fileName isAbsolute(), which now does more things
BREAKING: remove fileName::clean() const method
- relying on const/non-const to control the behaviour (inplace change
or return a copy) is too fragile and the const version was
almost never used.
Replace:
fileName sanitized = constPath.clean();
With:
fileName sanitized(constPath);
sanitized.clean());
STYLE: test empty() instead of comparing with fileName::null
129 lines
3.9 KiB
C
129 lines
3.9 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2011 OpenFOAM Foundation
|
|
Copyright (C) 2021 OpenCFD Ltd.
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM 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 OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
Application
|
|
Test-fileNameClean
|
|
|
|
Description
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "argList.H"
|
|
#include "fileName.H"
|
|
#include "SubList.H"
|
|
#include "IOobject.H"
|
|
#include "IOstreams.H"
|
|
#include "OSspecific.H"
|
|
|
|
|
|
using namespace Foam;
|
|
|
|
void printCleaning(fileName& pathName)
|
|
{
|
|
Info<< "fileName = " << pathName << nl
|
|
<< " path() = " << pathName.path() << nl
|
|
<< " name() = " << pathName.name() << nl
|
|
<< " joined = " << pathName.path()/pathName.name() << nl << nl;
|
|
|
|
Info<< "components = " << flatOutput(pathName.components()) << nl;
|
|
Info<< "component 2 = " << pathName.component(2) << nl;
|
|
|
|
pathName.clean(); // Remove unneeded ".."
|
|
|
|
Info<< "cleaned = " << pathName << nl
|
|
<< " path() = " << pathName.path() << nl
|
|
<< " name() = " << pathName.name() << nl
|
|
<< " joined = " << pathName.path()/pathName.name() << nl << nl;
|
|
|
|
IOobject::writeDivider(Info);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
// Main program:
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
argList::noBanner();
|
|
argList::noParallel();
|
|
argList::addArgument("fileName .. fileNameN");
|
|
argList::addOption("istream", "file", "test Istream values");
|
|
|
|
argList args(argc, argv, false, true);
|
|
|
|
if (args.size() <= 1 && args.options().empty())
|
|
{
|
|
args.printUsage();
|
|
}
|
|
|
|
fileName pathName;
|
|
if (args.readIfPresent("case", pathName))
|
|
{
|
|
Info<< nl
|
|
<< "-case" << nl
|
|
<< "path = " << args.path() << nl
|
|
<< "root = " << args.rootPath() << nl
|
|
<< "case = " << args.caseName() << nl
|
|
<< "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
|
|
<< "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
|
|
<< endl;
|
|
|
|
printCleaning(pathName);
|
|
}
|
|
|
|
for (label argi=1; argi < args.size(); ++argi)
|
|
{
|
|
fileName fn(args[argi], false); // no strip
|
|
Info<< "Input = " << fn << nl;
|
|
fn.clean(); // Remove unneeded ".."
|
|
Info<< "cleaned = " << fn << nl;
|
|
Info<< "get = " << args.get<fileName>(argi) << nl;
|
|
|
|
pathName = fileName::validate(args[argi]);
|
|
printCleaning(pathName);
|
|
}
|
|
|
|
if (args.readIfPresent("istream", pathName))
|
|
{
|
|
Info<< nl
|
|
<< "-case" << nl
|
|
<< "path = " << args.path() << nl
|
|
<< "root = " << args.rootPath() << nl
|
|
<< "case = " << args.caseName() << nl
|
|
<< "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
|
|
<< "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
|
|
<< endl;
|
|
|
|
printCleaning(pathName);
|
|
}
|
|
|
|
Info<< "\nEnd\n" << endl;
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|