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

use new DatabaseCon context object for play websocket play actions

Browse source
This commit is contained in:
shaun 2016-11-05 11:31:40 +11:00
parent d3ce04ab10
commit b3214a9250
2 changed files with 53 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lib/database.py
View file

@ -129,6 +129,7 @@ class DatabaseConn(object):
if self.db_file == "video": if self.db_file == "video":
kodi_commit() kodi_commit()
self.conn.commit() self.conn.commit()
log.info("commit: %s", self.path)
log.info("close: %s", self.path) log.info("close: %s", self.path)
self.conn.close() self.conn.close()

13
resources/lib/playlist.py
View file

@ -12,6 +12,8 @@ import playbackutils
import embydb_functions as embydb import embydb_functions as embydb
import read_embyserver as embyserver import read_embyserver as embyserver
from utils import window, kodiSQL, JSONRPC from utils import window, kodiSQL, JSONRPC
from database import DatabaseConn
from contextlib import closing
################################################################################################# #################################################################################################
@ -29,8 +31,8 @@ class Playlist(object):
def play_all(self, item_ids, start_at): def play_all(self, item_ids, start_at):
conn = kodiSQL('emby') with DatabaseConn('emby') as conn:
cursor = conn.cursor() with closing(conn.cursor()) as cursor:
emby_db = embydb.Embydb_Functions(cursor) emby_db = embydb.Embydb_Functions(cursor)
player = xbmc.Player() player = xbmc.Player()
@ -69,12 +71,11 @@ class Playlist(object):
player.play(playlist) player.play(playlist)
self.verify_playlist() self.verify_playlist()
cursor.close()
def modify_playlist(self, item_ids): def modify_playlist(self, item_ids):
conn = kodiSQL('emby') with DatabaseConn('emby') as conn:
cursor = conn.cursor() with closing(conn.cursor()) as cursor:
emby_db = embydb.Embydb_Functions(cursor) emby_db = embydb.Embydb_Functions(cursor)
log.info("---*** ADD TO PLAYLIST ***---") log.info("---*** ADD TO PLAYLIST ***---")
@ -99,7 +100,7 @@ class Playlist(object):
self.add_to_playlist(db_id, media_type) self.add_to_playlist(db_id, media_type)
self.verify_playlist() self.verify_playlist()
cursor.close()
return playlist return playlist
@classmethod @classmethod