Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't import DatabaseConn initialized 

This creates import loops. It's always better to initialize them within
the class' __init__
This commit is contained in:
angelblue05 2016-11-05 16:15:07 -05:00
parent 16df4d6404
commit 82c31e0672
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/lib/read_embyserver.py
View File

@ -8,8 +8,8 @@ import hashlib
import xbmc import xbmc
import downloadutils import downloadutils
import database
from utils import window, settings from utils import window, settings
from database import DatabaseConn
from contextlib import closing from contextlib import closing
################################################################################################# #################################################################################################
@ -27,7 +27,7 @@ class Read_EmbyServer():
def __init__(self): def __init__(self):
self.doUtils = downloadutils.DownloadUtils().downloadUrl self.doUtils = downloadutils.DownloadUtils().downloadUrl
self.database = database.DatabaseConn
self.userId = window('emby_currUser') self.userId = window('emby_currUser')
self.server = window('emby_server%s' % self.userId) self.server = window('emby_server%s' % self.userId)
@ -107,7 +107,7 @@ class Read_EmbyServer():
viewId = view['Id'] viewId = view['Id']
# Compare to view table in emby database # Compare to view table in emby database
with DatabaseConn('emby') as conn: with self.database('emby') as conn:
with closing(conn.cursor()) as cursor: with closing(conn.cursor()) as cursor:
query = ' '.join(( query = ' '.join((