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
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
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
6ff9e16c
Commit
6ff9e16c
authored
Jan 04, 2016
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ArtworkUrl -> ArtworkMrl
parent
1f9548c2
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
85 additions
and
85 deletions
+85
-85
include/IAlbum.h
include/IAlbum.h
+1
-1
include/IArtist.h
include/IArtist.h
+1
-1
include/IMovie.h
include/IMovie.h
+1
-1
include/IShow.h
include/IShow.h
+1
-1
include/IShowEpisode.h
include/IShowEpisode.h
+1
-1
src/Album.cpp
src/Album.cpp
+8
-8
src/Album.h
src/Album.h
+3
-3
src/Artist.cpp
src/Artist.cpp
+9
-9
src/Artist.h
src/Artist.h
+3
-3
src/Movie.cpp
src/Movie.cpp
+8
-8
src/Movie.h
src/Movie.h
+3
-3
src/Show.cpp
src/Show.cpp
+8
-8
src/Show.h
src/Show.h
+3
-3
src/ShowEpisode.cpp
src/ShowEpisode.cpp
+8
-8
src/ShowEpisode.h
src/ShowEpisode.h
+3
-3
src/metadata_services/vlc/VLCMetadataService.cpp
src/metadata_services/vlc/VLCMetadataService.cpp
+3
-3
test/unittest/AlbumTests.cpp
test/unittest/AlbumTests.cpp
+4
-4
test/unittest/ArtistTests.cpp
test/unittest/ArtistTests.cpp
+5
-5
test/unittest/MovieTests.cpp
test/unittest/MovieTests.cpp
+5
-5
test/unittest/ShowTests.cpp
test/unittest/ShowTests.cpp
+7
-7
No files found.
include/IAlbum.h
View file @
6ff9e16c
...
...
@@ -38,7 +38,7 @@ class IAlbum
*/
virtual
unsigned
int
releaseYear
()
const
=
0
;
virtual
const
std
::
string
&
shortSummary
()
const
=
0
;
virtual
const
std
::
string
&
artwork
U
rl
()
const
=
0
;
virtual
const
std
::
string
&
artwork
M
rl
()
const
=
0
;
virtual
time_t
lastSyncDate
()
const
=
0
;
/**
* @brief tracks fetches album tracks from the database
...
...
include/IArtist.h
View file @
6ff9e16c
...
...
@@ -36,5 +36,5 @@ public:
virtual
const
std
::
string
&
shortBio
()
const
=
0
;
virtual
std
::
vector
<
AlbumPtr
>
albums
()
const
=
0
;
virtual
std
::
vector
<
MediaPtr
>
media
()
const
=
0
;
virtual
const
std
::
string
&
artwork
U
rl
()
const
=
0
;
virtual
const
std
::
string
&
artwork
M
rl
()
const
=
0
;
};
include/IMovie.h
View file @
6ff9e16c
...
...
@@ -33,7 +33,7 @@ class IMovie
virtual
const
std
::
string
&
title
()
const
=
0
;
virtual
time_t
releaseDate
()
const
=
0
;
virtual
const
std
::
string
&
shortSummary
()
const
=
0
;
virtual
const
std
::
string
&
artwork
U
rl
()
const
=
0
;
virtual
const
std
::
string
&
artwork
M
rl
()
const
=
0
;
virtual
const
std
::
string
&
imdbId
()
const
=
0
;
virtual
std
::
vector
<
MediaPtr
>
files
()
=
0
;
};
...
...
include/IShow.h
View file @
6ff9e16c
...
...
@@ -34,7 +34,7 @@ class IShow
virtual
time_t
releaseDate
()
const
=
0
;
virtual
time_t
lastSyncDate
()
const
=
0
;
virtual
const
std
::
string
&
shortSummary
()
const
=
0
;
virtual
const
std
::
string
&
artwork
U
rl
()
const
=
0
;
virtual
const
std
::
string
&
artwork
M
rl
()
const
=
0
;
virtual
const
std
::
string
&
tvdbId
()
=
0
;
virtual
std
::
vector
<
ShowEpisodePtr
>
episodes
()
=
0
;
};
...
...
include/IShowEpisode.h
View file @
6ff9e16c
...
...
@@ -33,7 +33,7 @@ class IShowEpisode
virtual
~
IShowEpisode
(){}
virtual
unsigned
int
id
()
const
=
0
;
virtual
const
std
::
string
&
artwork
U
rl
()
const
=
0
;
virtual
const
std
::
string
&
artwork
M
rl
()
const
=
0
;
virtual
unsigned
int
episodeNumber
()
const
=
0
;
virtual
time_t
lastSyncDate
()
const
=
0
;
virtual
const
std
::
string
&
name
()
const
=
0
;
...
...
src/Album.cpp
View file @
6ff9e16c
...
...
@@ -41,7 +41,7 @@ Album::Album(DBConnection dbConnection, sqlite::Row& row)
>>
m_artistId
>>
m_releaseYear
>>
m_shortSummary
>>
m_artwork
U
rl
>>
m_artwork
M
rl
>>
m_lastSyncDate
>>
m_nbTracks
>>
m_isPresent
;
...
...
@@ -122,18 +122,18 @@ bool Album::setShortSummary( const std::string& summary )
return
true
;
}
const
std
::
string
&
Album
::
artwork
U
rl
()
const
const
std
::
string
&
Album
::
artwork
M
rl
()
const
{
return
m_artwork
U
rl
;
return
m_artwork
M
rl
;
}
bool
Album
::
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
)
bool
Album
::
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
)
{
static
const
std
::
string
req
=
"UPDATE "
+
policy
::
AlbumTable
::
Name
+
" SET artwork_
u
rl = ? WHERE id_album = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
U
rl
,
m_id
)
==
false
)
+
" SET artwork_
m
rl = ? WHERE id_album = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
M
rl
,
m_id
)
==
false
)
return
false
;
m_artwork
Url
=
artworkU
rl
;
m_artwork
Mrl
=
artworkM
rl
;
return
true
;
}
...
...
@@ -236,7 +236,7 @@ bool Album::createTable(DBConnection dbConnection )
"artist_id UNSIGNED INTEGER,"
"release_year UNSIGNED INTEGER,"
"short_summary TEXT,"
"artwork_
u
rl TEXT,"
"artwork_
m
rl TEXT,"
"last_sync_date UNSIGNED INTEGER,"
"nb_tracks UNSIGNED INTEGER DEFAULT 0,"
"is_present BOOLEAN NOT NULL DEFAULT 1"
...
...
src/Album.h
View file @
6ff9e16c
...
...
@@ -69,8 +69,8 @@ class Album : public IAlbum, public DatabaseHelpers<Album, policy::AlbumTable>
bool
setReleaseYear
(
unsigned
int
date
,
bool
force
);
virtual
const
std
::
string
&
shortSummary
()
const
override
;
bool
setShortSummary
(
const
std
::
string
&
summary
);
virtual
const
std
::
string
&
artwork
U
rl
()
const
override
;
bool
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
);
virtual
const
std
::
string
&
artwork
M
rl
()
const
override
;
bool
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
);
virtual
time_t
lastSyncDate
()
const
override
;
virtual
std
::
vector
<
MediaPtr
>
tracks
()
const
override
;
std
::
shared_ptr
<
AlbumTrack
>
addTrack
(
std
::
shared_ptr
<
Media
>
media
,
unsigned
int
trackNb
,
unsigned
int
discNumber
);
...
...
@@ -94,7 +94,7 @@ class Album : public IAlbum, public DatabaseHelpers<Album, policy::AlbumTable>
unsigned
int
m_artistId
;
unsigned
int
m_releaseYear
;
std
::
string
m_shortSummary
;
std
::
string
m_artwork
U
rl
;
std
::
string
m_artwork
M
rl
;
time_t
m_lastSyncDate
;
unsigned
int
m_nbTracks
;
bool
m_isPresent
;
...
...
src/Artist.cpp
View file @
6ff9e16c
...
...
@@ -38,7 +38,7 @@ Artist::Artist( DBConnection dbConnection, sqlite::Row& row )
row
>>
m_id
>>
m_name
>>
m_shortBio
>>
m_artwork
U
rl
>>
m_artwork
M
rl
>>
m_nbAlbums
>>
m_isPresent
;
}
...
...
@@ -113,20 +113,20 @@ bool Artist::addMedia(Media* media)
return
sqlite
::
Tools
::
insert
(
m_dbConnection
,
req
,
media
->
id
(),
artistForeignKey
)
!=
0
;
}
const
std
::
string
&
Artist
::
artwork
U
rl
()
const
const
std
::
string
&
Artist
::
artwork
M
rl
()
const
{
return
m_artwork
U
rl
;
return
m_artwork
M
rl
;
}
bool
Artist
::
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
)
bool
Artist
::
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
)
{
if
(
m_artwork
Url
==
artworkU
rl
)
if
(
m_artwork
Mrl
==
artworkM
rl
)
return
true
;
static
const
std
::
string
req
=
"UPDATE "
+
policy
::
ArtistTable
::
Name
+
" SET artwork_
u
rl = ? WHERE id_artist = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
U
rl
,
m_id
)
==
false
)
" SET artwork_
m
rl = ? WHERE id_artist = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
M
rl
,
m_id
)
==
false
)
return
false
;
m_artwork
Url
=
artworkU
rl
;
m_artwork
Mrl
=
artworkM
rl
;
return
true
;
}
...
...
@@ -170,7 +170,7 @@ bool Artist::createTable( DBConnection dbConnection )
"id_artist INTEGER PRIMARY KEY AUTOINCREMENT,"
"name TEXT COLLATE NOCASE UNIQUE ON CONFLICT FAIL,"
"shortbio TEXT,"
"artwork_
u
rl TEXT,"
"artwork_
m
rl TEXT,"
"nb_albums UNSIGNED INT DEFAULT 0,"
"is_present BOOLEAN NOT NULL DEFAULT 1"
")"
;
...
...
src/Artist.h
View file @
6ff9e16c
...
...
@@ -53,8 +53,8 @@ public:
virtual
std
::
vector
<
AlbumPtr
>
albums
()
const
override
;
virtual
std
::
vector
<
MediaPtr
>
media
()
const
override
;
bool
addMedia
(
Media
*
media
);
virtual
const
std
::
string
&
artwork
U
rl
()
const
override
;
bool
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
);
virtual
const
std
::
string
&
artwork
M
rl
()
const
override
;
bool
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
);
bool
updateNbAlbum
(
int
increment
);
std
::
shared_ptr
<
Album
>
unknownAlbum
();
...
...
@@ -68,7 +68,7 @@ private:
unsigned
int
m_id
;
std
::
string
m_name
;
std
::
string
m_shortBio
;
std
::
string
m_artwork
U
rl
;
std
::
string
m_artwork
M
rl
;
unsigned
int
m_nbAlbums
;
bool
m_isPresent
;
...
...
src/Movie.cpp
View file @
6ff9e16c
...
...
@@ -35,7 +35,7 @@ Movie::Movie(DBConnection dbConnection, sqlite::Row& row )
>>
m_title
>>
m_releaseDate
>>
m_summary
>>
m_artwork
U
rl
>>
m_artwork
M
rl
>>
m_imdbId
;
}
...
...
@@ -87,18 +87,18 @@ bool Movie::setShortSummary( const std::string& summary )
return
true
;
}
const
std
::
string
&
Movie
::
artwork
U
rl
()
const
const
std
::
string
&
Movie
::
artwork
M
rl
()
const
{
return
m_artwork
U
rl
;
return
m_artwork
M
rl
;
}
bool
Movie
::
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
)
bool
Movie
::
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
)
{
static
const
std
::
string
req
=
"UPDATE "
+
policy
::
MovieTable
::
Name
+
" SET artwork_
u
rl = ? WHERE id_movie = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
U
rl
,
m_id
)
==
false
)
+
" SET artwork_
m
rl = ? WHERE id_movie = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
M
rl
,
m_id
)
==
false
)
return
false
;
m_artwork
Url
=
artworkU
rl
;
m_artwork
Mrl
=
artworkM
rl
;
return
true
;
}
...
...
@@ -132,7 +132,7 @@ bool Movie::createTable( DBConnection dbConnection )
"title TEXT UNIQUE ON CONFLICT FAIL,"
"release_date UNSIGNED INTEGER,"
"summary TEXT,"
"artwork_
u
rl TEXT,"
"artwork_
m
rl TEXT,"
"imdb_id TEXT"
")"
;
return
sqlite
::
Tools
::
executeRequest
(
dbConnection
,
req
);
...
...
src/Movie.h
View file @
6ff9e16c
...
...
@@ -51,8 +51,8 @@ class Movie : public IMovie, public DatabaseHelpers<Movie, policy::MovieTable>
bool
setReleaseDate
(
time_t
date
);
virtual
const
std
::
string
&
shortSummary
()
const
override
;
bool
setShortSummary
(
const
std
::
string
&
summary
);
virtual
const
std
::
string
&
artwork
U
rl
()
const
override
;
bool
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
);
virtual
const
std
::
string
&
artwork
M
rl
()
const
override
;
bool
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
);
virtual
const
std
::
string
&
imdbId
()
const
override
;
bool
setImdbId
(
const
std
::
string
&
imdbId
);
virtual
std
::
vector
<
MediaPtr
>
files
()
override
;
...
...
@@ -66,7 +66,7 @@ class Movie : public IMovie, public DatabaseHelpers<Movie, policy::MovieTable>
std
::
string
m_title
;
time_t
m_releaseDate
;
std
::
string
m_summary
;
std
::
string
m_artwork
U
rl
;
std
::
string
m_artwork
M
rl
;
std
::
string
m_imdbId
;
friend
struct
policy
::
MovieTable
;
...
...
src/Show.cpp
View file @
6ff9e16c
...
...
@@ -35,7 +35,7 @@ Show::Show( DBConnection dbConnection, sqlite::Row& row )
>>
m_name
>>
m_releaseDate
>>
m_shortSummary
>>
m_artwork
U
rl
>>
m_artwork
M
rl
>>
m_lastSyncDate
>>
m_tvdbId
;
}
...
...
@@ -88,18 +88,18 @@ bool Show::setShortSummary( const std::string& summary )
return
true
;
}
const
std
::
string
&
Show
::
artwork
U
rl
()
const
const
std
::
string
&
Show
::
artwork
M
rl
()
const
{
return
m_artwork
U
rl
;
return
m_artwork
M
rl
;
}
bool
Show
::
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
)
bool
Show
::
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
)
{
static
const
std
::
string
req
=
"UPDATE "
+
policy
::
ShowTable
::
Name
+
" SET artwork_
u
rl = ? WHERE id_show = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
U
rl
,
m_id
)
==
false
)
+
" SET artwork_
m
rl = ? WHERE id_show = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
M
rl
,
m_id
)
==
false
)
return
false
;
m_artwork
Url
=
artworkU
rl
;
m_artwork
Mrl
=
artworkM
rl
;
return
true
;
}
...
...
@@ -142,7 +142,7 @@ bool Show::createTable(DBConnection dbConnection)
"name TEXT, "
"release_date UNSIGNED INTEGER,"
"short_summary TEXT,"
"artwork_
u
rl TEXT,"
"artwork_
m
rl TEXT,"
"last_sync_date UNSIGNED INTEGER,"
"tvdb_id TEXT"
")"
;
...
...
src/Show.h
View file @
6ff9e16c
...
...
@@ -54,8 +54,8 @@ class Show : public IShow, public DatabaseHelpers<Show, policy::ShowTable>
bool
setReleaseDate
(
time_t
date
);
virtual
const
std
::
string
&
shortSummary
()
const
override
;
bool
setShortSummary
(
const
std
::
string
&
summary
);
virtual
const
std
::
string
&
artwork
U
rl
()
const
override
;
bool
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
);
virtual
const
std
::
string
&
artwork
M
rl
()
const
override
;
bool
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
);
virtual
time_t
lastSyncDate
()
const
override
;
virtual
const
std
::
string
&
tvdbId
()
override
;
bool
setTvdbId
(
const
std
::
string
&
summary
);
...
...
@@ -71,7 +71,7 @@ class Show : public IShow, public DatabaseHelpers<Show, policy::ShowTable>
std
::
string
m_name
;
time_t
m_releaseDate
;
std
::
string
m_shortSummary
;
std
::
string
m_artwork
U
rl
;
std
::
string
m_artwork
M
rl
;
time_t
m_lastSyncDate
;
std
::
string
m_tvdbId
;
...
...
src/ShowEpisode.cpp
View file @
6ff9e16c
...
...
@@ -33,7 +33,7 @@ ShowEpisode::ShowEpisode(DBConnection dbConnection, sqlite::Row& row )
:
m_dbConnection
(
dbConnection
)
{
row
>>
m_id
>>
m_artwork
U
rl
>>
m_artwork
M
rl
>>
m_episodeNumber
>>
m_lastSyncDate
>>
m_name
...
...
@@ -57,18 +57,18 @@ unsigned int ShowEpisode::id() const
return
m_id
;
}
const
std
::
string
&
ShowEpisode
::
artwork
U
rl
()
const
const
std
::
string
&
ShowEpisode
::
artwork
M
rl
()
const
{
return
m_artwork
U
rl
;
return
m_artwork
M
rl
;
}
bool
ShowEpisode
::
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
)
bool
ShowEpisode
::
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
)
{
static
const
std
::
string
req
=
"UPDATE "
+
policy
::
ShowEpisodeTable
::
Name
+
" SET artwork_
u
rl = ? WHERE id_episode = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
U
rl
,
m_id
)
==
false
)
+
" SET artwork_
m
rl = ? WHERE id_episode = ?"
;
if
(
sqlite
::
Tools
::
executeUpdate
(
m_dbConnection
,
req
,
artwork
M
rl
,
m_id
)
==
false
)
return
false
;
m_artwork
Url
=
artworkU
rl
;
m_artwork
Mrl
=
artworkM
rl
;
return
true
;
}
...
...
@@ -153,7 +153,7 @@ bool ShowEpisode::createTable( DBConnection dbConnection )
const
std
::
string
req
=
"CREATE TABLE IF NOT EXISTS "
+
policy
::
ShowEpisodeTable
::
Name
+
"("
"id_episode INTEGER PRIMARY KEY AUTOINCREMENT,"
"artwork_
u
rl TEXT,"
"artwork_
m
rl TEXT,"
"episode_number UNSIGNED INT,"
"last_sync_date UNSIGNED INT,"
"title TEXT,"
...
...
src/ShowEpisode.h
View file @
6ff9e16c
...
...
@@ -50,8 +50,8 @@ class ShowEpisode : public IShowEpisode, public DatabaseHelpers<ShowEpisode, pol
ShowEpisode
(
const
std
::
string
&
name
,
unsigned
int
episodeNumber
,
unsigned
int
showId
);
virtual
unsigned
int
id
()
const
override
;
virtual
const
std
::
string
&
artwork
U
rl
()
const
override
;
bool
setArtwork
Url
(
const
std
::
string
&
artworkU
rl
);
virtual
const
std
::
string
&
artwork
M
rl
()
const
override
;
bool
setArtwork
Mrl
(
const
std
::
string
&
artworkM
rl
);
virtual
unsigned
int
episodeNumber
()
const
override
;
virtual
time_t
lastSyncDate
()
const
override
;
virtual
const
std
::
string
&
name
()
const
override
;
...
...
@@ -70,7 +70,7 @@ class ShowEpisode : public IShowEpisode, public DatabaseHelpers<ShowEpisode, pol
private:
DBConnection
m_dbConnection
;
unsigned
int
m_id
;
std
::
string
m_artwork
U
rl
;
std
::
string
m_artwork
M
rl
;
unsigned
int
m_episodeNumber
;
time_t
m_lastSyncDate
;
std
::
string
m_name
;
...
...
src/metadata_services/vlc/VLCMetadataService.cpp
View file @
6ff9e16c
...
...
@@ -308,7 +308,7 @@ std::shared_ptr<Album> VLCMetadataService::handleAlbum( std::shared_ptr<Media> m
{
auto
artwork
=
vlcMedia
.
meta
(
libvlc_meta_ArtworkURL
);
if
(
artwork
.
length
()
!=
0
)
album
->
setArtwork
U
rl
(
artwork
);
album
->
setArtwork
M
rl
(
artwork
);
}
}
}
...
...
@@ -452,8 +452,8 @@ bool VLCMetadataService::link( std::shared_ptr<Media> media, std::shared_ptr<Alb
// If we have an albumArtist (meaning the track was properly tagged, we
// can assume this artist is a correct match. We can use the thumbnail from
// the current album for the albumArtist, if none has been set before.
if
(
albumArtist
!=
nullptr
&&
albumArtist
->
artwork
U
rl
().
empty
()
==
true
&&
album
!=
nullptr
)
albumArtist
->
setArtwork
Url
(
album
->
artworkU
rl
()
);
if
(
albumArtist
!=
nullptr
&&
albumArtist
->
artwork
M
rl
().
empty
()
==
true
&&
album
!=
nullptr
)
albumArtist
->
setArtwork
Mrl
(
album
->
artworkM
rl
()
);
if
(
albumArtist
!=
nullptr
)
albumArtist
->
addMedia
(
media
.
get
()
);
...
...
test/unittest/AlbumTests.cpp
View file @
6ff9e16c
...
...
@@ -151,17 +151,17 @@ TEST_F( Albums, SetShortSummary )
ASSERT_EQ
(
a
->
shortSummary
(),
a2
->
shortSummary
()
);
}
TEST_F
(
Albums
,
SetArtwork
U
rl
)
TEST_F
(
Albums
,
SetArtwork
M
rl
)
{
auto
a
=
ml
->
createAlbum
(
"album"
);
a
->
setArtwork
U
rl
(
"artwork"
);
ASSERT_EQ
(
a
->
artwork
U
rl
(),
"artwork"
);
a
->
setArtwork
M
rl
(
"artwork"
);
ASSERT_EQ
(
a
->
artwork
M
rl
(),
"artwork"
);
Reload
();
auto
a2
=
ml
->
album
(
a
->
id
()
);
ASSERT_EQ
(
a
->
artwork
Url
(),
a2
->
artworkU
rl
()
);
ASSERT_EQ
(
a
->
artwork
Mrl
(),
a2
->
artworkM
rl
()
);
}
TEST_F
(
Albums
,
FetchAlbumFromTrack
)
...
...
test/unittest/ArtistTests.cpp
View file @
6ff9e16c
...
...
@@ -71,21 +71,21 @@ TEST_F( Artists, ShortBio )
ASSERT_EQ
(
a2
->
shortBio
(),
bio
);
}
TEST_F
(
Artists
,
Artwork
U
rl
)
TEST_F
(
Artists
,
Artwork
M
rl
)
{
auto
a
=
ml
->
createArtist
(
"Dream seaotter"
);
ASSERT_NE
(
a
,
nullptr
);
ASSERT_EQ
(
a
->
artwork
U
rl
(),
""
);
ASSERT_EQ
(
a
->
artwork
M
rl
(),
""
);
std
::
string
artwork
(
"/tmp/otter.png"
);
a
->
setArtwork
U
rl
(
artwork
);
ASSERT_EQ
(
a
->
artwork
U
rl
(),
artwork
);
a
->
setArtwork
M
rl
(
artwork
);
ASSERT_EQ
(
a
->
artwork
M
rl
(),
artwork
);
Reload
();
auto
a2
=
ml
->
artist
(
"Dream seaotter"
);
ASSERT_NE
(
a2
,
nullptr
);
ASSERT_EQ
(
a2
->
artwork
U
rl
(),
artwork
);
ASSERT_EQ
(
a2
->
artwork
M
rl
(),
artwork
);
}
TEST_F
(
Artists
,
Albums
)
...
...
test/unittest/MovieTests.cpp
View file @
6ff9e16c
...
...
@@ -77,17 +77,17 @@ TEST_F( Movies, SetShortSummary )
ASSERT_EQ
(
m2
->
shortSummary
(),
"great movie"
);
}
TEST_F
(
Movies
,
SetArtwork
U
rl
)
TEST_F
(
Movies
,
SetArtwork
M
rl
)
{
auto
m
=
ml
->
createMovie
(
"movie"
);
ASSERT_EQ
(
m
->
artwork
U
rl
().
length
(),
0u
);
m
->
setArtwork
U
rl
(
"artwork"
);
ASSERT_EQ
(
m
->
artwork
U
rl
(),
"artwork"
);
ASSERT_EQ
(
m
->
artwork
M
rl
().
length
(),
0u
);
m
->
setArtwork
M
rl
(
"artwork"
);
ASSERT_EQ
(
m
->
artwork
M
rl
(),
"artwork"
);
Reload
();
auto
m2
=
ml
->
movie
(
"movie"
);
ASSERT_EQ
(
m2
->
artwork
U
rl
(),
"artwork"
);
ASSERT_EQ
(
m2
->
artwork
M
rl
(),
"artwork"
);
}
TEST_F
(
Movies
,
SetImdbId
)
...
...
test/unittest/ShowTests.cpp
View file @
6ff9e16c
...
...
@@ -81,17 +81,17 @@ TEST_F( Shows, SetShortSummary )
ASSERT_EQ
(
s
->
shortSummary
(),
s2
->
shortSummary
()
);
}
TEST_F
(
Shows
,
SetArtwork
U
rl
)
TEST_F
(
Shows
,
SetArtwork
M
rl
)
{
auto
s
=
ml
->
createShow
(
"show"
);
s
->
setArtwork
U
rl
(
"artwork"
);
ASSERT_EQ
(
s
->
artwork
U
rl
(),
"artwork"
);
s
->
setArtwork
M
rl
(
"artwork"
);
ASSERT_EQ
(
s
->
artwork
M
rl
(),
"artwork"
);
Reload
();
auto
s2
=
ml
->
show
(
"show"
);
ASSERT_EQ
(
s
->
artwork
Url
(),
s2
->
artworkU
rl
()
);
ASSERT_EQ
(
s
->
artwork
Mrl
(),
s2
->
artworkM
rl
()
);
}
TEST_F
(
Shows
,
SetTvdbId
)
...
...
@@ -152,15 +152,15 @@ TEST_F( Shows, SetEpisodeArtwork )
{
auto
show
=
ml
->
createShow
(
"show"
);
auto
e
=
show
->
addEpisode
(
"episode 1"
,
1
);
bool
res
=
e
->
setArtwork
U
rl
(
"path-to-art"
);
bool
res
=
e
->
setArtwork
M
rl
(
"path-to-art"
);
ASSERT_TRUE
(
res
);
ASSERT_EQ
(
e
->
artwork
U
rl
(),
"path-to-art"
);
ASSERT_EQ
(
e
->
artwork
M
rl
(),
"path-to-art"
);
Reload
();
show
=
std
::
static_pointer_cast
<
Show
>
(
ml
->
show
(
"show"
)
);
auto
episodes
=
show
->
episodes
();
ASSERT_EQ
(
episodes
[
0
]
->
artwork
Url
(),
e
->
artworkU
rl
()
);
ASSERT_EQ
(
episodes
[
0
]
->
artwork
Mrl
(),
e
->
artworkM
rl
()
);
}
TEST_F
(
Shows
,
SetEpisodeSeasonNumber
)
...
...
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