Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
medialibrary
Commits
ec3600e7
Commit
ec3600e7
authored
Jul 03, 2018
by
Hugo Beauzée-Luyssen
Browse files
Media: Sort filename in a case unsensitive way
parent
24904fb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Media.cpp
View file @
ec3600e7
...
...
@@ -451,7 +451,7 @@ std::string Media::sortRequest( const QueryParameters* params )
desc
=
!
desc
;
// Make decreasing order default for play count sorting
break
;
case
SortingCriteria
::
Filename
:
req
+=
"m.filename"
;
req
+=
"m.filename
COLLATE NOCASE
"
;
break
;
case
SortingCriteria
::
LastModificationDate
:
req
+=
"f.last_modification_date"
;
...
...
test/unittest/MediaTests.cpp
View file @
ec3600e7
...
...
@@ -656,6 +656,35 @@ TEST_F( Medias, Pagination )
}
}
TEST_F
(
Medias
,
SortFilename
)
{
auto
m1
=
std
::
static_pointer_cast
<
Media
>
(
ml
->
addMedia
(
"AAAAB.mp3"
)
);
m1
->
setType
(
IMedia
::
Type
::
Audio
);
m1
->
save
();
auto
m2
=
std
::
static_pointer_cast
<
Media
>
(
ml
->
addMedia
(
"aaaaa.mp3"
)
);
m2
->
setType
(
IMedia
::
Type
::
Audio
);
m2
->
save
();
auto
m3
=
std
::
static_pointer_cast
<
Media
>
(
ml
->
addMedia
(
"BbBbB.mp3"
)
);
m3
->
setType
(
IMedia
::
Type
::
Audio
);
m3
->
save
();
QueryParameters
params
{
SortingCriteria
::
Filename
,
false
};
auto
media
=
ml
->
audioFiles
(
&
params
)
->
all
();
ASSERT_EQ
(
3u
,
media
.
size
()
);
ASSERT_EQ
(
m2
->
id
(),
media
[
0
]
->
id
()
);
ASSERT_EQ
(
m1
->
id
(),
media
[
1
]
->
id
()
);
ASSERT_EQ
(
m3
->
id
(),
media
[
2
]
->
id
()
);
params
.
desc
=
true
;
media
=
ml
->
audioFiles
(
&
params
)
->
all
();
ASSERT_EQ
(
3u
,
media
.
size
()
);
ASSERT_EQ
(
m2
->
id
(),
media
[
2
]
->
id
()
);
ASSERT_EQ
(
m1
->
id
(),
media
[
1
]
->
id
()
);
ASSERT_EQ
(
m3
->
id
(),
media
[
0
]
->
id
()
);
}
class
FetchMedia
:
public
Tests
{
protected:
...
...
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