Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-26 02:36:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop

Browse source
This commit is contained in:
angelblue05 2017-07-09 00:35:37 -05:00
commit 1f2eeae8fc
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/lib/objects/_kodi_movies.py
View file

@ -115,8 +115,8 @@ class KodiMovies(KodiItems):
def get_ratingid(self, media_id): def get_ratingid(self, media_id):
query = "SELECT rating_id FROM rating WHERE media_id = ?" query = "SELECT rating_id FROM rating WHERE media_type = ? AND media_id = ?"
self.cursor.execute(query, (media_id,)) self.cursor.execute(query, ("movie", media_id,))
try: try:
ratingid = self.cursor.fetchone()[0] ratingid = self.cursor.fetchone()[0]
except TypeError: except TypeError:
@ -146,8 +146,8 @@ class KodiMovies(KodiItems):
def get_uniqueid(self, media_id): def get_uniqueid(self, media_id):
query = "SELECT uniqueid_id FROM uniqueid WHERE media_id = ?" query = "SELECT uniqueid_id FROM uniqueid WHERE media_type = ? AND media_id = ?"
self.cursor.execute(query, (media_id,)) self.cursor.execute(query, ("movie", media_id,))
try: try:
uniqueid = self.cursor.fetchone()[0] uniqueid = self.cursor.fetchone()[0]
except TypeError: except TypeError:

12
resources/lib/objects/_kodi_tvshows.py
View file

@ -74,10 +74,10 @@ class KodiTVShows(KodiItems):
return kodi_id return kodi_id
def get_ratingid(self, media_id): def get_ratingid(self, media_type, media_id):
query = "SELECT rating_id FROM rating WHERE media_id = ?" query = "SELECT rating_id FROM rating WHERE media_type = ? AND media_id = ?"
self.cursor.execute(query, (media_id,)) self.cursor.execute(query, (media_type, media_id,))
try: try:
ratingid = self.cursor.fetchone()[0] ratingid = self.cursor.fetchone()[0]
except TypeError: except TypeError:
@ -105,10 +105,10 @@ class KodiTVShows(KodiItems):
)) ))
self.cursor.execute(query, (args)) self.cursor.execute(query, (args))
def get_uniqueid(self, media_id): def get_uniqueid(self, media_type, media_id):
query = "SELECT uniqueid_id FROM uniqueid WHERE media_id = ?" query = "SELECT uniqueid_id FROM uniqueid WHERE media_type = ? AND media_id = ?"
self.cursor.execute(query, (media_id,)) self.cursor.execute(query, (media_type, media_id,))
try: try:
uniqueid = self.cursor.fetchone()[0] uniqueid = self.cursor.fetchone()[0]
except TypeError: except TypeError:

4
resources/lib/objects/movies.py
View file

@ -243,13 +243,13 @@ class Movies(Items):
if self.kodi_version >= 17: if self.kodi_version >= 17:
ratingid = self.kodi_db.get_ratingid(movieid) ratingid = self.kodi_db.get_ratingid(movieid)
self.kodi_db.update_ratings(movieid, "movie", "default", rating, votecount,ratingid) self.kodi_db.update_ratings(movieid, "movie", "default", rating, votecount, ratingid)
# update new uniqueid Kodi 17 # update new uniqueid Kodi 17
if self.kodi_version >= 17: if self.kodi_version >= 17:
uniqueid = self.kodi_db.get_uniqueid(movieid) uniqueid = self.kodi_db.get_uniqueid(movieid)
self.kodi_db.update_uniqueid(movieid, "movie", imdb, "imdb",uniqueid) self.kodi_db.update_uniqueid(movieid, "movie", imdb, "imdb", uniqueid)
# Update the movie entry # Update the movie entry
if self.kodi_version >= 17: if self.kodi_version >= 17:

8
resources/lib/objects/tvshows.py
View file

@ -344,13 +344,13 @@ class TVShows(Items):
# update new ratings Kodi 17 # update new ratings Kodi 17
if self.kodi_version > 16: if self.kodi_version > 16:
ratingid = self.kodi_db.get_ratingid(showid) ratingid = self.kodi_db.get_ratingid("tvshow", showid)
self.kodi_db.update_ratings(showid, "tvshow", "default", rating, votecount,ratingid) self.kodi_db.update_ratings(showid, "tvshow", "default", rating, votecount,ratingid)
# update new uniqueid Kodi 17 # update new uniqueid Kodi 17
if self.kodi_version > 16: if self.kodi_version > 16:
uniqueid = self.kodi_db.get_uniqueid(showid) uniqueid = self.kodi_db.get_uniqueid("tvshow", showid)
self.kodi_db.update_uniqueid(showid, "tvshow", imdb, "imdb",uniqueid) self.kodi_db.update_uniqueid(showid, "tvshow", imdb, "imdb",uniqueid)
@ -609,13 +609,13 @@ class TVShows(Items):
# update new ratings Kodi 17 # update new ratings Kodi 17
if self.kodi_version >= 17: if self.kodi_version >= 17:
ratingid = self.kodi_db.get_ratingid(episodeid) ratingid = self.kodi_db.get_ratingid("episode", episodeid)
self.kodi_db.update_ratings(episodeid, "episode", "default", rating, votecount,ratingid) self.kodi_db.update_ratings(episodeid, "episode", "default", rating, votecount,ratingid)
# update new uniqueid Kodi 17 # update new uniqueid Kodi 17
if self.kodi_version >= 17: if self.kodi_version >= 17:
uniqueid = self.kodi_db.get_uniqueid(episodeid) uniqueid = self.kodi_db.get_uniqueid("episode", episodeid)
self.kodi_db.update_uniqueid(episodeid, "episode", tvdb, "tvdb",uniqueid) self.kodi_db.update_uniqueid(episodeid, "episode", tvdb, "tvdb",uniqueid)