dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close sqlite connection

Browse Source
This commit is contained in:
Ruud
2014-03-07 20:42:08 +01:00
parent dd9c65db4c
commit cfa8702654
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/database.py
+15 -12
View File
@@ -125,8 +125,6 @@ class Database(object):
import sqlite3 import sqlite3
conn = sqlite3.connect(old_db) conn = sqlite3.connect(old_db)
c = conn.cursor()
migrate_list = { migrate_list = {
'category': ['id', 'label', 'order', 'required', 'preferred', 'ignored', 'destination'], 'category': ['id', 'label', 'order', 'required', 'preferred', 'ignored', 'destination'],
'profile': ['id', 'label', 'order', 'core', 'hide'], 'profile': ['id', 'label', 'order', 'core', 'hide'],
@@ -146,10 +144,13 @@ class Database(object):
migrate_data = {} migrate_data = {}
c = conn.cursor()
for ml in migrate_list: for ml in migrate_list:
migrate_data[ml] = {} migrate_data[ml] = {}
rows = migrate_list[ml] rows = migrate_list[ml]
c.execute('SELECT %s FROM `%s`' % ('`' + '`,`'.join(rows) + '`', ml)) c.execute('SELECT %s FROM `%s`' % ('`' + '`,`'.join(rows) + '`', ml))
for p in c.fetchall(): for p in c.fetchall():
columns = {} columns = {}
for row in migrate_list[ml]: for row in migrate_list[ml]:
@@ -162,18 +163,20 @@ class Database(object):
migrate_data[ml][p[0]] = [migrate_data[ml][p[0]]] migrate_data[ml][p[0]] = [migrate_data[ml][p[0]]]
migrate_data[ml][p[0]].append(columns) migrate_data[ml][p[0]].append(columns)
c.close()
db = self.getDB() db = self.getDB()
# Use properties # Use properties
log.debug('Importing properties')
properties = migrate_data['properties'] properties = migrate_data['properties']
log.info('Importing %s properties', len(properties))
for x in properties: for x in properties:
property = properties[x] property = properties[x]
Env.prop(property.get('identifier'), property.get('value')) Env.prop(property.get('identifier'), property.get('value'))
# Categories # Categories
log.debug('Importing categories')
categories = migrate_data.get('category', []) categories = migrate_data.get('category', [])
log.info('Importing %s categories', len(categories))
category_link = {} category_link = {}
for x in categories: for x in categories:
c = categories[x] c = categories[x]
@@ -288,7 +291,7 @@ class Database(object):
releases_by_media[release.get('movie_id')].append(release) releases_by_media[release.get('movie_id')].append(release)
# Media # Media
log.debug('Importing media: processing %s', len(migrate_data['movie'])) log.debug('Importing %s media items', len(migrate_data['movie']))
statuses = migrate_data['status'] statuses = migrate_data['status']
libraries = migrate_data['library'] libraries = migrate_data['library']
library_files = migrate_data['library_files__file_library'] library_files = migrate_data['library_files__file_library']
@@ -343,11 +346,11 @@ class Database(object):
rel['info']['status'] = statuses.get(rel.get('status_id')).get('identifier') rel['info']['status'] = statuses.get(rel.get('status_id')).get('identifier')
fireEvent('release.create_from_search', [rel['info']], added_media, quality, single = True) fireEvent('release.create_from_search', [rel['info']], added_media, quality, single = True)
# rename old database # rename old database
log.info('Renaming old database to %s ', old_db + '.old') log.info('Renaming old database to %s ', old_db + '.old')
os.rename(old_db, old_db + '.old') os.rename(old_db, old_db + '.old')
if os.path.isfile(old_db + '-wal'): if os.path.isfile(old_db + '-wal'):
os.rename(old_db + '-wal', old_db + '-wal.old') os.rename(old_db + '-wal', old_db + '-wal.old')
if os.path.isfile(old_db + '-shm'): if os.path.isfile(old_db + '-shm'):
os.rename(old_db + '-shm', old_db + '-shm.old') os.rename(old_db + '-shm', old_db + '-shm.old')