Skip to content

Commit a98a044

Browse files
sorgomsorgom
authored
fglob -> glob (#11)
1 parent c26fe4a commit a98a044

File tree

7 files changed

+37
-37
lines changed

7 files changed

+37
-37
lines changed

‎code/Covbr2Html.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ bool Covbr2Html::convert(const std::string& fpath)
8989
static const regex reNok("( *)-->([TFtf])?( .*)?");
9090
// covered
9191
static const regex reCov("( *)(TF|tf|X)( .*)?");
92-
// extension
93-
static const regex reExt("\\.\\w+$");
9492

9593
static const std::map<const string, const CONST_C_STRING> repMap
9694
{
@@ -115,13 +113,15 @@ bool Covbr2Html::convert(const std::string& fpath)
115113

116114
std::ofstream os;
117115
{
118-
const auto opath = mOdir.empty() ? fspath(fpath).parent_path() : fspath(mOdir);
119-
const auto fname = fspath(fpath).filename().string();
120-
const auto ttl = repl(reExt, "", fname);
116+
const auto opath =
117+
mOdir.empty() ?
118+
fspath(fpath).replace_extension("html") :
119+
fspath(mOdir) / fspath(fpath).filename().replace_extension("html");
121120

122-
if (not open(os, opath / (ttl + ".html"))) return false;
121+
if (not open(os, opath)) return false;
123122

124-
os << cTtl << ttl << cHead;
123+
const auto ttl = fspath(fpath).filename().replace_extension("");
124+
os << cTtl << ttl.string() << cHead;
125125
}
126126
{
127127
TRACE_FLOW_TIME(convert to html)

‎code/Covbr2HtmlFglob.cpp ‎code/Covbr2HtmlGlob.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
#include <Covbr2HtmlFglob.h>
1+
#include <Covbr2HtmlGlob.h>
22
#include <SOM/TraceMacros.h>
33
#include <iostream>
44
#include <filesystem>
55

6-
void Covbr2HtmlFglob::process(const CONST_C_STRING item)
6+
void Covbr2HtmlGlob::process(const std::string& item)
77
{
8-
if (ok()) mThreads.push_back(std::thread(&Covbr2HtmlFglob::threadFunc, this, std::string(item)));
8+
if (ok()) mThreads.push_back(std::thread(&Covbr2HtmlGlob::threadFunc, this, std::string(item)));
99
}
1010

11-
INT32 Covbr2HtmlFglob::ret()
11+
INT32 Covbr2HtmlGlob::ret()
1212
{
1313
join();
1414
if (not ok()) mRet += 1;
1515
if (mRet != 0) std::cerr << mRet << " errors\n";
1616
return mRet;
1717
}
1818

19-
void Covbr2HtmlFglob::threadFunc(const std::string&& file)
19+
void Covbr2HtmlGlob::threadFunc(const std::string&& file)
2020
{
2121
TRACE_FUNC_TIME()
2222
if (not convert(file)) ++mRet;
2323
}
2424

25-
void Covbr2HtmlFglob::join()
25+
void Covbr2HtmlGlob::join()
2626
{
2727
TRACE_FUNC_TIME()
2828
for (auto& th : mThreads) th.join();

‎code/Covbr2HtmlFglob.h ‎code/Covbr2HtmlGlob.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@
44

55
#include <Covbr2Html.h>
66
#include <SOM/coding.h>
7-
#include <SOM/fglob.h>
7+
#include <SOM/Glob.h>
88

99
#include <atomic>
1010
#include <string>
1111
#include <thread>
1212
#include <vector>
1313

1414
// runs conversion of files in separate threads
15-
class Covbr2HtmlFglob :
15+
class Covbr2HtmlGlob :
1616
public Covbr2Html,
17-
public I_FglobProcessor
17+
public I_GlobProcessor
1818
{
1919
public:
2020
// I_FglobProcessor
21-
void process(CONST_C_STRING item) override;
21+
void process(const std::string& item) override;
2222

2323
// wait for all threads to finish
2424
// return: number of failures
2525
// -> end of main return
2626
int ret();
2727

28-
Covbr2HtmlFglob() = default;
28+
Covbr2HtmlGlob() = default;
2929

30-
inline ~Covbr2HtmlFglob() { join(); }
30+
inline ~Covbr2HtmlGlob() { join(); }
3131

3232
private:
3333
std::vector<std::thread> mThreads;
3434
std::atomic<int> mRet = 0;
3535
void threadFunc(const std::string&& file);
3636
void join();
37-
NOCOPY(Covbr2HtmlFglob)
37+
NOCOPY(Covbr2HtmlGlob)
3838
};
3939

4040
#endif // _H

‎code/main.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Covbr2HtmlFglob.h>
1+
#include <Covbr2HtmlGlob.h>
22
#include <SOM/docopts.h>
33
#define TRACE_ME
44
#include <SOM/TraceMacros.h>
@@ -31,25 +31,25 @@ INT32 main(const INT32 argc, const CONST_C_STRING* const argv)
3131
DocOpts opts;
3232
if (opts.process(cOpts, argc, argv))
3333
{
34-
ret = 0;
3534
if (opts.isSet('h'))
3635
{
3736
help(argv[0]);
3837
}
3938
else
4039
{
41-
Covbr2HtmlFglob globber;
42-
globber.setHc(opts.isSet('c'));
43-
globber.setFc(opts.isSet('f'));
40+
Covbr2HtmlGlob proc;
41+
proc.setHc(opts.isSet('c'));
42+
proc.setFc(opts.isSet('f'));
4443
CONST_C_STRING odir = nullptr;
45-
if ((not opts.getValue(odir, 'o')) or globber.setOdir(odir))
44+
if ((not opts.getValue(odir, 'o')) or proc.setOdir(odir))
4645
{
46+
Glob glob(proc, true);
4747
for (auto i = 0; i < opts.argc(); ++i)
4848
{
49-
fglob(opts.args()[i], globber);
49+
glob.glob(opts.args()[i]);
5050
}
5151
}
52-
ret = globber.ret();
52+
ret = proc.ret();
5353
}
5454
}
5555
return ret;

‎make/covbr2html.make

+7-7
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ GENERATED :=
6363
OBJECTS :=
6464

6565
GENERATED += $(OBJDIR)/Covbr2Html.o
66-
GENERATED += $(OBJDIR)/Covbr2HtmlFglob.o
66+
GENERATED += $(OBJDIR)/Covbr2HtmlGlob.o
67+
GENERATED += $(OBJDIR)/Glob.o
6768
GENERATED += $(OBJDIR)/docopts.o
68-
GENERATED += $(OBJDIR)/fglob.o
6969
GENERATED += $(OBJDIR)/fio.o
7070
GENERATED += $(OBJDIR)/main.o
7171
OBJECTS += $(OBJDIR)/Covbr2Html.o
72-
OBJECTS += $(OBJDIR)/Covbr2HtmlFglob.o
72+
OBJECTS += $(OBJDIR)/Covbr2HtmlGlob.o
73+
OBJECTS += $(OBJDIR)/Glob.o
7374
OBJECTS += $(OBJDIR)/docopts.o
74-
OBJECTS += $(OBJDIR)/fglob.o
7575
OBJECTS += $(OBJDIR)/fio.o
7676
OBJECTS += $(OBJDIR)/main.o
7777

@@ -140,16 +140,16 @@ endif
140140
$(OBJDIR)/Covbr2Html.o: ../code/Covbr2Html.cpp
141141
@echo "$(notdir $<)"
142142
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
143-
$(OBJDIR)/Covbr2HtmlFglob.o: ../code/Covbr2HtmlFglob.cpp
143+
$(OBJDIR)/Covbr2HtmlGlob.o: ../code/Covbr2HtmlGlob.cpp
144144
@echo "$(notdir $<)"
145145
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
146146
$(OBJDIR)/main.o: ../code/main.cpp
147147
@echo "$(notdir $<)"
148148
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
149-
$(OBJDIR)/docopts.o: ../submodules/somcpp/src/docopts.cpp
149+
$(OBJDIR)/Glob.o: ../submodules/somcpp/src/Glob.cpp
150150
@echo "$(notdir $<)"
151151
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
152-
$(OBJDIR)/fglob.o: ../submodules/somcpp/src/fglob.cpp
152+
$(OBJDIR)/docopts.o: ../submodules/somcpp/src/docopts.cpp
153153
@echo "$(notdir $<)"
154154
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
155155
$(OBJDIR)/fio.o: ../submodules/somcpp/src/fio.cpp

‎make/premake5.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ workspace 'covbr2html'
3838
includedirs { '../code', somcpp .. '/include' }
3939
files {
4040
'../code/*.cpp',
41-
somsrc .. 'fglob.cpp',
41+
somsrc .. 'Glob.cpp',
4242
somsrc .. 'fio.cpp',
4343
somsrc .. 'docopts.cpp'
4444
}

‎submodules/somcpp

0 commit comments

Comments
 (0)