From 3dbdab79a9d213aab3cb6347af0b8fb905bb6e45 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Tue, 26 Apr 2016 03:51:24 -0500 Subject: [PATCH] Revert "Fix missing playurl/pathid references" This reverts commit 601b36e9b3dd22d36d28c4b7c50532e242ea6958. --- resources/lib/itemtypes.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/resources/lib/itemtypes.py b/resources/lib/itemtypes.py index 2b388a40..18c90517 100644 --- a/resources/lib/itemtypes.py +++ b/resources/lib/itemtypes.py @@ -406,12 +406,12 @@ class Movies(Items): "UPDATE movie", "SET c00 = ?, c01 = ?, c02 = ?, c03 = ?, c04 = ?, c05 = ?, c06 = ?,", "c07 = ?, c09 = ?, c10 = ?, c11 = ?, c12 = ?, c14 = ?, c15 = ?,", - "c16 = ?, c18 = ?, c19 = ?, c21 = ?, c22 = ?, c23 = ?", + "c16 = ?, c18 = ?, c19 = ?, c21 = ?", "WHERE idMovie = ?" )) kodicursor.execute(query, (title, plot, shortplot, tagline, votecount, rating, writer, year, imdb, sorttitle, runtime, mpaa, genre, director, title, studio, trailer, - country, playurl, pathid, movieid)) + country, movieid)) # Update the checksum in emby table emby_db.updateReference(itemid, checksum) @@ -430,14 +430,14 @@ class Movies(Items): ''' INSERT INTO movie( idMovie, idFile, c00, c01, c02, c03, c04, c05, c06, c07, - c09, c10, c11, c12, c14, c15, c16, c18, c19, c21, c22, c23) + c09, c10, c11, c12, c14, c15, c16, c18, c19, c21) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ''' ) kodicursor.execute(query, (movieid, fileid, title, plot, shortplot, tagline, votecount, rating, writer, year, imdb, sorttitle, runtime, mpaa, genre, director, title, - studio, trailer, country, playurl, pathid)) + studio, trailer, country)) # Create the reference in emby table emby_db.addReference(itemid, movieid, "Movie", "movie", fileid, pathid, None, checksum, viewid) @@ -1377,24 +1377,23 @@ class TVShows(Items): "UPDATE episode", "SET c00 = ?, c01 = ?, c03 = ?, c04 = ?, c05 = ?, c09 = ?, c10 = ?,", - "c12 = ?, c13 = ?, c14 = ?, c15 = ?, c16 = ?, c18 = ?, c19 = ?,", - "idSeason = ?", + "c12 = ?, c13 = ?, c14 = ?, c15 = ?, c16 = ?, idSeason = ?", "WHERE idEpisode = ?" )) kodicursor.execute(query, (title, plot, rating, writer, premieredate, runtime, director, season, episode, title, airsBeforeSeason, - airsBeforeEpisode, playurl, pathid, seasonid, episodeid)) + airsBeforeEpisode, seasonid, episodeid)) else: query = ' '.join(( "UPDATE episode", "SET c00 = ?, c01 = ?, c03 = ?, c04 = ?, c05 = ?, c09 = ?, c10 = ?,", - "c12 = ?, c13 = ?, c14 = ?, c15 = ?, c16 = ?, c18 = ?, c19 = ?", + "c12 = ?, c13 = ?, c14 = ?, c15 = ?, c16 = ?", "WHERE idEpisode = ?" )) kodicursor.execute(query, (title, plot, rating, writer, premieredate, runtime, director, season, episode, title, airsBeforeSeason, - airsBeforeEpisode, playurl, pathid, episodeid)) + airsBeforeEpisode, episodeid)) # Update the checksum in emby table emby_db.updateReference(itemid, checksum) @@ -1417,27 +1416,27 @@ class TVShows(Items): ''' INSERT INTO episode( idEpisode, idFile, c00, c01, c03, c04, c05, c09, c10, c12, c13, c14, - idShow, c15, c16, c18, c19, idSeason) + idShow, c15, c16, idSeason) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ''' ) kodicursor.execute(query, (episodeid, fileid, title, plot, rating, writer, premieredate, runtime, director, season, episode, title, showid, - airsBeforeSeason, airsBeforeEpisode, playurl, pathid, seasonid)) + airsBeforeSeason, airsBeforeEpisode, seasonid)) else: query = ( ''' INSERT INTO episode( idEpisode, idFile, c00, c01, c03, c04, c05, c09, c10, c12, c13, c14, - idShow, c15, c16, c18, c19) + idShow, c15, c16) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ''' ) kodicursor.execute(query, (episodeid, fileid, title, plot, rating, writer, premieredate, runtime, director, season, episode, title, showid, - airsBeforeSeason, airsBeforeEpisode, playurl, pathid)) + airsBeforeSeason, airsBeforeEpisode)) # Create the reference in emby table emby_db.addReference(itemid, episodeid, "Episode", "episode", fileid, pathid,