raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Detect v1.0 database at the beginning of the import, not half way through.

Browse Source 
Do some detection of the encoding.
This commit is contained in:
Raoul Snyman 2010-09-11 20:51:27 +02:00
parent b303dc3973
commit c1ed2a76e2
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
openlp/plugins/songs/lib/olp1import.py
View File

@ -28,6 +28,7 @@ The :mod:`olp1import` module provides the functionality for importing
openlp.org 1.x song databases into the current installation database. openlp.org 1.x song databases into the current installation database.
""" """
import logging import logging
import chardet
try: try:
import sqlite import sqlite
except: except:
@ -63,6 +64,11 @@ class OpenLP1SongImport(SongImport):
# Connect to the database # Connect to the database
connection = sqlite.connect(self.import_source) connection = sqlite.connect(self.import_source)
cursor = connection.cursor() cursor = connection.cursor()
# Determine if we're using a new or an old DB
cursor.execute(u'SELECT name FROM sqlite_master '
u'WHERE type = \'table\' AND name = \'tracks\'')
table_list = cursor.fetchall()
new_db = len(table_list) > 0
# Count the number of records we need to import, for the progress bar # Count the number of records we need to import, for the progress bar
cursor.execute(u'SELECT COUNT(songid) FROM songs') cursor.execute(u'SELECT COUNT(songid) FROM songs')
count = int(cursor.fetchone()[0]) count = int(cursor.fetchone()[0])
@ -71,6 +77,7 @@ class OpenLP1SongImport(SongImport):
# "cache" our list of authors # "cache" our list of authors
cursor.execute(u'SELECT authorid, authorname FROM authors') cursor.execute(u'SELECT authorid, authorname FROM authors')
authors = cursor.fetchall() authors = cursor.fetchall()
if new_db:
# "cache" our list of tracks # "cache" our list of tracks
cursor.execute(u'SELECT trackid, fulltrackname FROM tracks') cursor.execute(u'SELECT trackid, fulltrackname FROM tracks')
tracks = cursor.fetchall() tracks = cursor.fetchall()
@ -84,9 +91,22 @@ class OpenLP1SongImport(SongImport):
success = False success = False
break break
song_id = song[0] song_id = song[0]
title = unicode(song[1], u'cp1252') encoding = chardet.detect(song[1])
lyrics = unicode(song[2], u'cp1252').replace(u'\r', u'') if encoding[u'confidence'] < 0.9:
copyright = unicode(song[3], u'cp1252') title = unicode(song[1], u'windows-1251')
else:
title = unicode(song[1], encoding[u'encoding'])
encoding = chardet.detect(song[2])
if encoding[u'confidence'] < 0.9:
lyrics = unicode(song[2], u'windows-1251')
else:
lyrics = unicode(song[2], encoding[u'encoding'])
lyrics = lyrics.replace(u'\r', u'')
encoding = chardet.detect(song[3])
if encoding[u'confidence'] < 0.9:
copyright = unicode(song[3], u'windows-1251')
else:
copyright = unicode(song[3], encoding[u'encoding'])
self.import_wizard.incrementProgressBar( self.import_wizard.incrementProgressBar(
unicode(translate('SongsPlugin.ImportWizardForm', unicode(translate('SongsPlugin.ImportWizardForm',
'Importing "%s"...')) % title) 'Importing "%s"...')) % title)
@ -102,15 +122,16 @@ class OpenLP1SongImport(SongImport):
break break
for author in authors: for author in authors:
if author[0] == author_id[0]: if author[0] == author_id[0]:
self.parse_author(unicode(author[1], u'cp1252')) encoding = chardet.detect(author[1])
if encoding[u'confidence'] < 0.9:
self.parse_author(unicode(author[1], u'windows-1251'))
else:
self.parse_author(unicode(author[1], encoding[u'encoding']))
break break
if self.stop_import_flag: if self.stop_import_flag:
success = False success = False
break break
cursor.execute(u'SELECT name FROM sqlite_master ' if new_db:
u'WHERE type = \'table\' AND name = \'tracks\'')
table_list = cursor.fetchall()
if len(table_list) > 0:
cursor.execute(u'SELECT trackid FROM songtracks ' cursor.execute(u'SELECT trackid FROM songtracks '
u'WHERE songid = %s ORDER BY listindex' % song_id) u'WHERE songid = %s ORDER BY listindex' % song_id)
track_ids = cursor.fetchall() track_ids = cursor.fetchall()
@ -120,7 +141,11 @@ class OpenLP1SongImport(SongImport):
break break
for track in tracks: for track in tracks:
if track[0] == track_id[0]: if track[0] == track_id[0]:
self.add_media_file(unicode(track[1], u'cp1252')) encoding = chardet.detect(author[1])
if encoding[u'confidence'] < 0.9:
self.add_media_file(unicode(track[1], u'windows-1251'))
else:
self.add_media_file(unicode(track[1], encoding[u'encoding']))
break break
if self.stop_import_flag: if self.stop_import_flag:
success = False success = False