Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
42e5d98a
Commit
42e5d98a
authored
Dec 22, 2017
by
Force Charlie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix split_by_extenstion parse error extenstion
parent
c060a10c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
include/spdlog/details/file_helper.h
include/spdlog/details/file_helper.h
+8
-7
tests/file_helper.cpp
tests/file_helper.cpp
+14
-0
No files found.
include/spdlog/details/file_helper.h
View file @
42e5d98a
...
...
@@ -118,17 +118,18 @@ public:
//
// "my_folder/.mylog" => ("my_folder/.mylog")
// "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
static
std
::
tuple
<
filename_t
,
filename_t
>
split_by_extenstion
(
const
filename_t
&
fname
)
{
auto
index
=
fname
.
rfind
(
'.'
);
bool
found_ext
=
index
!=
filename_t
::
npos
&&
index
!=
0
&&
fname
[
index
-
1
]
!=
details
::
os
::
folder_sep
;
if
(
found_ext
)
return
std
::
make_tuple
(
fname
.
substr
(
0
,
index
),
fname
.
substr
(
index
));
else
return
std
::
make_tuple
(
fname
,
filename_t
());
if
(
index
!=
filename_t
::
npos
&&
index
!=
fname
.
size
()
-
1
&&
index
!=
0
&&
fname
[
index
-
1
]
!=
details
::
os
::
folder_sep
)
{
auto
index2
=
fname
.
find
(
details
::
os
::
folder_sep
,
index
);
if
(
index2
==
fname
.
npos
)
{
return
std
::
make_tuple
(
fname
.
substr
(
0
,
index
),
fname
.
substr
(
index
));
}
}
return
std
::
make_tuple
(
fname
,
std
::
string
());
}
private:
FILE
*
_fd
;
filename_t
_filename
;
...
...
tests/file_helper.cpp
View file @
42e5d98a
...
...
@@ -145,5 +145,19 @@ TEST_CASE("file_helper_split_by_extenstion7", "[file_helper::split_by_extenstion
}
TEST_CASE
(
"file_helper_split_by_extenstion8"
,
"[file_helper::split_by_extenstion(hidden_file)]]"
)
{
#ifdef _WIN32
auto
filename
=
"folder.ext
\\
mylog"
;
auto
expected_basename
=
"folder.ext
\\
mylog"
;
#else
auto
filename
=
"folder.ext/mylog"
;
auto
expected_basename
=
"folder.ext/mylog"
;
#endif
std
::
string
basename
,
ext
;
std
::
tie
(
basename
,
ext
)
=
file_helper
::
split_by_extenstion
(
filename
);
REQUIRE
(
basename
==
expected_basename
);
REQUIRE
(
ext
==
""
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment