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

Update database.py

This commit is contained in:
angelblue05 2016-11-04 01:28:02 -05:00
parent 11af93ccc2
commit e06f138d5d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/lib/database.py
View File

@ -50,19 +50,22 @@ def music_database():
class DatabaseConn(object): class DatabaseConn(object):
# To be called as context manager - i.e. with DatabaseConn() as dbconn # To be called as context manager - i.e. with DatabaseConn() as dbconn
def __init__(self, database_file="video", commit_mode=""): def __init__(self, database_file="video", commit_mode="", timeout=20):
""" """
database_file can be custom: emby, texture, music, video, custom like :memory: or path database_file can be custom: emby, texture, music, video, :memory: or path to the file
commit_mode set to None to autocommit (isolation_level). See python documentation. commit_mode set to None to autocommit (isolation_level). See python documentation.
""" """
self.db_file = database_file self.db_file = database_file
self.commit_mode = commit_mode self.commit_mode = commit_mode
self.timeout = timeout
def __enter__(self): def __enter__(self):
# Open the connection # Open the connection
self.path = self._SQL(self.db_file) self.path = self._SQL(self.db_file)
log.warn("opening database: %s", self.path) log.warn("opening database: %s", self.path)
self.conn = sqlite3.connect(self.path, isolation_level=self.commit_mode, timeout=20) self.conn = sqlite3.connect(self.path,
isolation_level=self.commit_mode,
timeout=self.timeout)
return self.conn return self.conn
def _SQL(self, media_type): def _SQL(self, media_type):
@ -84,6 +87,7 @@ class DatabaseConn(object):
# Errors were raised in the with statement # Errors were raised in the with statement
log.error("rollback: Type: %s Value: %s", exc_type, exc_val) log.error("rollback: Type: %s Value: %s", exc_type, exc_val)
self.conn.rollback() self.conn.rollback()
raise
elif self.commit_mode is not None: elif self.commit_mode is not None:
log.warn("commit: %s", self.path) log.warn("commit: %s", self.path)
@ -91,7 +95,7 @@ class DatabaseConn(object):
self.conn.close() self.conn.close()
def query(execute_query, connection=None, conn_type=None, *args): '''def query(execute_query, connection=None, conn_type=None, *args):
""" """
connection is sqlite.connect connection is sqlite.connect
@ -122,12 +126,12 @@ def query(execute_query, connection=None, conn_type=None, *args):
return conn.execute(query, args) return conn.execute(query, args)
except sqlite3.OperationalError as e: except sqlite3.OperationalError as e:
if "database is locked" in str(e): if "database is locked" in e:
# Database is locked, retry # Database is locked, retry
attempts -= 1 attempts -= 1
xbmc.sleep(1000) xbmc.sleep(500)
else: else:
raise raise
if not attempts: if not attempts:
return False return False'''

4
resources/lib/objects/_common.py
View File

@ -4,6 +4,7 @@
import logging import logging
import os import os
import sqlite3
import xbmc import xbmc
import xbmcvfs import xbmcvfs
@ -28,6 +29,9 @@ def catch_except(errors=(Exception, ), default_value=False):
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
try: try:
return func(*args, **kwargs) return func(*args, **kwargs)
except sqlite3.OperationalError as error:
if "database is locked" in error:
raise
except errors as error: except errors as error:
errStrings = ga.formatException() errStrings = ga.formatException()
ga.sendEventData("Exception", errStrings[0], errStrings[1], True) ga.sendEventData("Exception", errStrings[0], errStrings[1], True)