Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
medialibrary
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
57
Issues
57
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
medialibrary
Commits
c5993864
Commit
c5993864
authored
May 12, 2020
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migration: 25 -> 26: Fix is_network flag for external files
Fix #253
parent
ff0c0152
Pipeline
#17275
passed with stage
in 14 minutes and 56 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
src/database/migrations/migration25-26.sql
src/database/migrations/migration25-26.sql
+6
-0
test/unittest/MiscTests.cpp
test/unittest/MiscTests.cpp
+8
-0
No files found.
src/database/migrations/migration25-26.sql
View file @
c5993864
...
@@ -105,3 +105,9 @@ MediaGroup::index( MediaGroup::Indexes::LastModificationDate, 26 ),
...
@@ -105,3 +105,9 @@ MediaGroup::index( MediaGroup::Indexes::LastModificationDate, 26 ),
" AND file_type = "
+
" AND file_type = "
+
std
::
to_string
(
static_cast
<
std
::
underlying_type_t
<
IFile
::
Type
>>
(
std
::
to_string
(
static_cast
<
std
::
underlying_type_t
<
IFile
::
Type
>>
(
IFile
::
Type
::
Unknown
)
),
IFile
::
Type
::
Unknown
)
),
/*
* Fix external files is_network state
*/
"UPDATE "
+
File
::
Table
::
Name
+
" SET is_network = 1"
" WHERE is_external = 1 AND substr(mrl, 0, 7) != 'file://'"
,
test/unittest/MiscTests.cpp
View file @
c5993864
...
@@ -687,4 +687,12 @@ TEST_F( DbModel, Upgrade25to26 )
...
@@ -687,4 +687,12 @@ TEST_F( DbModel, Upgrade25to26 )
auto
encodedFile
=
File
::
fetch
(
ml
.
get
(),
6
);
auto
encodedFile
=
File
::
fetch
(
ml
.
get
(),
6
);
ASSERT_NE
(
nullptr
,
encodedFile
);
ASSERT_NE
(
nullptr
,
encodedFile
);
ASSERT_EQ
(
"udp://@224.10.50.36:5004"
,
encodedFile
->
mrl
()
);
ASSERT_EQ
(
"udp://@224.10.50.36:5004"
,
encodedFile
->
mrl
()
);
ASSERT_TRUE
(
encodedFile
->
isNetwork
()
);
const
std
::
string
req
=
"SELECT * FROM "
+
File
::
Table
::
Name
+
" WHERE is_network = 1"
;
auto
networkFiles
=
File
::
fetchAll
<
File
>
(
ml
.
get
(),
req
);
ASSERT_EQ
(
1u
,
networkFiles
.
size
()
);
ASSERT_EQ
(
networkFiles
[
0
]
->
id
(),
encodedFile
->
id
()
);
}
}
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