From 35001679078c4f8a7af2cb0bd2e1af6217f2353e Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sun, 21 Mar 2010 22:54:26 +0000 Subject: [PATCH 1/7] Bible migration --- openlp/migration/migratebibles.py | 207 +++++++++++++++++++++++++++++- openlpcnv.pyw | 34 +++-- 2 files changed, 228 insertions(+), 13 deletions(-) diff --git a/openlp/migration/migratebibles.py b/openlp/migration/migratebibles.py index f9e10b756..6f3552099 100644 --- a/openlp/migration/migratebibles.py +++ b/openlp/migration/migratebibles.py @@ -23,10 +23,213 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### +import os +import sys +import sqlite3 + +from sqlalchemy import * +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation + +from openlp.core.lib import PluginConfig +from openlp.plugins.bibles.lib.models import * + +class BaseModel(object): + """ + BaseModel provides a base object with a set of generic functions + """ + + @classmethod + def populate(cls, **kwargs): + """ + Creates an instance of a class and populates it, returning the instance + """ + me = cls() + keys = kwargs.keys() + for key in keys: + me.__setattr__(key, kwargs[key]) + return me + +class TBibleMeta(BaseModel): + """ + Bible Meta Data + """ + pass + +class TTestament(BaseModel): + """ + Bible Testaments + """ + pass + +class TBook(BaseModel): + """ + Song model + """ + pass + +class TVerse(BaseModel): + """ + Topic model + """ + pass + +temp_meta_table = Table(u'metadata_temp', metadata, + Column(u'key', types.Unicode(255), primary_key=True), + Column(u'value', types.Unicode(255)), +) +temp_testament_table = Table(u'testament_temp', metadata, + Column(u'id', types.Integer, primary_key=True), + Column(u'name', types.Unicode(30)), +) +temp_book_table = Table(u'book_temp', metadata, + Column(u'id', types.Integer, primary_key=True), + Column(u'testament_id', types.Integer), + Column(u'name', types.Unicode(30)), + Column(u'abbreviation', types.Unicode(5)), +) +temp_verse_table = Table(u'verse_temp', metadata, + Column(u'id', types.Integer, primary_key=True), + Column(u'book_id', types.Integer), + Column(u'chapter', types.Integer), + Column(u'verse', types.Integer), + Column(u'text', types.UnicodeText), +) + +mapper(TBibleMeta, temp_meta_table) +mapper(TTestament, temp_testament_table) +mapper(TBook, temp_book_table) +mapper(TVerse, temp_verse_table) + +def init_models(url): + engine = create_engine(url) + metadata.bind = engine + session = scoped_session(sessionmaker(autoflush=False, + autocommit=False, bind=engine)) + return session + class MigrateBibles(): def __init__(self, display): self.display = display + self.config = PluginConfig(u'Bibles') + self.data_path = self.config.get_data_path() + self.database_files = self.config.get_files(u'sqlite') + print self.database_files + + def progress(self, text): + print text + self.display.output(text) def process(self): - self.display.output(u'Bible process started') - self.display.output(u'Bible process finished') \ No newline at end of file + self.progress(u'Bibles processing started') + for f in self.database_files: + self.v_1_9_0(f) + self.progress(u'Bibles processing finished') + + def v_1_9_0(self, database): + self.progress(u'Migration 1.9.0 Started for ' + database) + self._v1_9_0_old(database) + self._v1_9_0_new(database) + self._v1_9_0_cleanup(database) + self.progress(u'Migration 1.9.0 Finished for ' + database) + + def _v1_9_0_old(self, database): + self.progress(u'Rename Tables ' + database) + conn = sqlite3.connect(self.data_path + os.sep + database) + conn.execute(u'alter table book rename to book_temp;') + conn.commit() + conn.execute(u'alter table testament rename to testament_temp;') + conn.commit() + conn.execute(u'alter table verse rename to verse_temp;') + conn.commit() + conn.execute(u'alter table metadata rename to metadata_temp;') + conn.commit() + + def _v1_9_0_new(self, database): + self.progress(u'Create new Tables ' + database) + self.db_url = u'sqlite:///' + self.data_path + u'/' + database + print self.db_url + self.session = init_models(self.db_url) + metadata.create_all(checkfirst=True) + self.progress(u'Create testament table') + results = self.session.query(TTestament).order_by(TTestament.id).all() + for testament_temp in results: + testament = Testament() + testament.id = testament_temp.id + testament.name = testament_temp.name + try: + self.session.add(testament) + self.session.commit() + except: + self.session.rollback() + print u'Error thrown = ', sys.exc_info()[1] + self.progress(u'Create book table') + results = self.session.query(TBook).order_by(TBook.id).all() + for book_temp in results: + book = Book() + book.id = book_temp.id + book.testament_id = book_temp.testament_id + book.name = book_temp.name + book.abbreviation = book_temp.abbreviation + try: + self.session.add(book) + self.session.commit() + except: + self.session.rollback() + print u'Error thrown = ', sys.exc_info()[1] + self.progress(u'Create verse table') + #---- + #results = self.session.query(TVerse).order_by(TVerse.id).all() + #for verse_temp in results: + # verse = Verse() + # verse.id = verse_temp.id + # verse.book_id = verse_temp.book_id + # verse.chapter = verse_temp.chapter + # verse.verse = verse_temp.verse + # verse.text = verse_temp.text + # try: + # self.session.add(verse) + # self.session.commit() + # except: + # self.session.rollback() + # print u'Error thrown = ', sys.exc_info()[1] + # + # The above is too slow, took hours to not finish one bible + # For now, just do it the old fashioned way + #--- + try: + conn = sqlite3.connect(self.data_path + os.sep + database) + conn.execute(u'insert into verse select * from verse_temp;') + conn.commit() + except: + self.session.rollback() + print u'Error thrown = ', sys.exc_info()[1] + #--- + self.progress(u'Create metadata table') + results = self.session.query(TBibleMeta).order_by(TBibleMeta.key).all() + for biblemeta_temp in results: + biblemeta = BibleMeta() + biblemeta.key = biblemeta_temp.key + biblemeta.value = biblemeta_temp.value + try: + self.session.add(biblemeta) + self.session.commit() + except: + self.session.rollback() + print u'Error thrown = ', sys.exc_info()[1] + + def _v1_9_0_cleanup(self, database): + self.progress(u'Update Internal Data ' + database) + conn = sqlite3.connect(self.data_path + os.sep + database) + conn.commit() + conn.execute(u'drop table book_temp;') + conn.commit() + conn.execute(u'drop table testament_temp;') + conn.commit() + conn.execute(u'drop table verse_temp;') + conn.commit() + conn.execute(u'drop table metadata_temp;') + conn.commit() + conn.execute(u'vacuum;') + conn.commit() + diff --git a/openlpcnv.pyw b/openlpcnv.pyw index 8c3a8bcf5..802bc7a27 100755 --- a/openlpcnv.pyw +++ b/openlpcnv.pyw @@ -70,7 +70,7 @@ class Migration(object): """ #MigrateFiles(self.display).process() MigrateSongs(self.display).process() - #MigrateBibles(self.display).process() + MigrateBibles(self.display).process() def move_log_file(self): """ @@ -101,6 +101,7 @@ class Migration(object): writefile.close() def convert_sqlite2_to_3(self, olddb, newdb): + print u'Converting sqlite2 ' + olddb + ' to sqlite3 ' + newdb if os.name == u'nt': # we can't make this a raw unicode string as the \U within it causes much confusion hKey = win32api.RegOpenKey(win32con.HKEY_LOCAL_MACHINE, u'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\SQLite ODBC Driver') @@ -127,24 +128,35 @@ class Migration(object): subprocess.call(cmd, stdin=open(u'sqlite3.dmp', u'r')) else: subprocess.call(cmd, stdin=open(u'sqlite3.dmp', u'r'), shell=True) - os.remove(u'sqlite.dmp') - os.remove(u'sqlite3.dmp') +# os.remove(u'sqlite.dmp') +# os.remove(u'sqlite3.dmp') if __name__ == u'__main__': mig = Migration() - config = PluginConfig(u'Songs') - newpath = config.get_data_path() + songconfig = PluginConfig(u'Songs') + newsongpath = songconfig.get_data_path() + bibleconfig = PluginConfig(u'Bibles') + newbiblepath = bibleconfig.get_data_path() if os.name == u'nt': - if not os.path.isdir(newpath): - os.makedirs(newpath) + if not os.path.isdir(newsongpath): + os.makedirs(newsongpath) + if not os.path.isdir(newbiblepath): + os.makedirs(newbiblepath) ALL_USERS_APPLICATION_DATA = 35 shell = Dispatch(u'Shell.Application') folder = shell.Namespace(ALL_USERS_APPLICATION_DATA) folderitem = folder.Self - olddb = os.path.join(folderitem.path, u'openlp.org', u'Data', u'songs.olp') + oldsongdb = os.path.join(folderitem.path, u'openlp.org', u'Data', u'songs.olp') + oldbiblepath = os.path.join(folderitem.path, u'openlp.org', u'Data', u'Bibles') else: - olddb = os.path.join(newpath, u'songs.olp') - newdb = os.path.join(newpath, u'songs.sqlite') - mig.convert_sqlite2_to_3(olddb, newdb) + oldsongdb = os.path.join(newsongpath, u'songs.olp') + newsongdb = os.path.join(newsongpath, u'songs.sqlite') + mig.convert_sqlite2_to_3(oldsongdb, newsongdb) + files = os.listdir(oldbiblepath) + for file in files: + f = os.path.splitext(os.path.basename(file))[0] + if f != 'kjv': #kjv bible has an autoincrement key not supported in sqlite3 + mig.convert_sqlite2_to_3(os.path.join(oldbiblepath, file), + os.path.join(newbiblepath, f + u'.sqlite')) mig.process() #mig.move_log_file() From 5f2a637b6390edcaabb162ebd87bcdbce0b81c17 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Mon, 22 Mar 2010 08:45:45 +0000 Subject: [PATCH 3/7] Commit verses at end --- openlp/migration/migratebibles.py | 41 ++++++++++++------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/openlp/migration/migratebibles.py b/openlp/migration/migratebibles.py index 6f3552099..93f2765c0 100644 --- a/openlp/migration/migratebibles.py +++ b/openlp/migration/migratebibles.py @@ -135,7 +135,7 @@ class MigrateBibles(): def _v1_9_0_old(self, database): self.progress(u'Rename Tables ' + database) - conn = sqlite3.connect(self.data_path + os.sep + database) + conn = sqlite3.connect(os.path.join(self.data_path, database)) conn.execute(u'alter table book rename to book_temp;') conn.commit() conn.execute(u'alter table testament rename to testament_temp;') @@ -178,33 +178,24 @@ class MigrateBibles(): self.session.rollback() print u'Error thrown = ', sys.exc_info()[1] self.progress(u'Create verse table') - #---- - #results = self.session.query(TVerse).order_by(TVerse.id).all() - #for verse_temp in results: - # verse = Verse() - # verse.id = verse_temp.id - # verse.book_id = verse_temp.book_id - # verse.chapter = verse_temp.chapter - # verse.verse = verse_temp.verse - # verse.text = verse_temp.text - # try: - # self.session.add(verse) - # self.session.commit() - # except: - # self.session.rollback() - # print u'Error thrown = ', sys.exc_info()[1] - # - # The above is too slow, took hours to not finish one bible - # For now, just do it the old fashioned way - #--- + results = self.session.query(TVerse).order_by(TVerse.id).all() + for verse_temp in results: + verse = Verse() + verse.id = verse_temp.id + verse.book_id = verse_temp.book_id + verse.chapter = verse_temp.chapter + verse.verse = verse_temp.verse + verse.text = verse_temp.text + try: + self.session.add(verse) + except: + self.session.rollback() + print u'Error thrown = ', sys.exc_info()[1] try: - conn = sqlite3.connect(self.data_path + os.sep + database) - conn.execute(u'insert into verse select * from verse_temp;') - conn.commit() + self.session.commit() except: self.session.rollback() print u'Error thrown = ', sys.exc_info()[1] - #--- self.progress(u'Create metadata table') results = self.session.query(TBibleMeta).order_by(TBibleMeta.key).all() for biblemeta_temp in results: @@ -220,7 +211,7 @@ class MigrateBibles(): def _v1_9_0_cleanup(self, database): self.progress(u'Update Internal Data ' + database) - conn = sqlite3.connect(self.data_path + os.sep + database) + conn = sqlite3.connect(os.path.join(self.data_path, database)) conn.commit() conn.execute(u'drop table book_temp;') conn.commit() From ca62429bad1e2f556ca857ab69c004fd75ede50f Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Mon, 22 Mar 2010 19:57:24 +0000 Subject: [PATCH 4/7] Commented out two lines without realising it. I blame Noah --- openlpcnv.pyw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlpcnv.pyw b/openlpcnv.pyw index 01d0a7db9..5d0ff62d0 100755 --- a/openlpcnv.pyw +++ b/openlpcnv.pyw @@ -128,8 +128,8 @@ class Migration(object): subprocess.call(cmd, stdin=open(u'sqlite3.dmp', u'r')) else: subprocess.call(cmd, stdin=open(u'sqlite3.dmp', u'r'), shell=True) -# os.remove(u'sqlite.dmp') -# os.remove(u'sqlite3.dmp') + os.remove(u'sqlite.dmp') + os.remove(u'sqlite3.dmp') if __name__ == u'__main__': mig = Migration() From c196d258072aed39a95c7ed8dc44f5b6c6f4c934 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 22 Mar 2010 22:38:50 +0200 Subject: [PATCH 5/7] Replaced "live" icon with a projector icon. Replaced "preview" with a screen icon. --- resources/images/openlp-2.qrc | 2 +- resources/images/system_live.png | Bin 688 -> 720 bytes resources/images/system_preview.png | Bin 608 -> 815 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 3f2a6e843..bba088c2b 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -96,9 +96,9 @@ system_about.png system_help_contents.png system_add.png - system_live.png system_preview.png system_mediamanager.png + system_live.png system_contribute.png system_servicemanager.png system_thememanager.png diff --git a/resources/images/system_live.png b/resources/images/system_live.png index 17fd3ca9dfb1f929a3d9ae17242a99a8c1c67d34..cb2be2258ad636e049e7903049b6f0a662191bd4 100644 GIT binary patch delta 696 zcmV;p0!RI@1<(bMB!32COGiWi{{a60|De66lK=n!32;bRa{vGvuK)lWuK`{fksJU3 z00(qQO+^RS2^(vN&o-?T}ebiRCwCOQcG(SQ560%ck*gFO(IB>*rsW;CatzX zU5FsqE_{I%9|+<<5Ujt${sHM)uwA)yqb?LdVh{>KW0R54=6}&P>6m2NyeG}|+`*J= zT#6rj+?jjs`ObIFz4-62^gkkz2wPo!eRXtnbir3vmbs>t`0j3j zt7_`o%F4?z5Pu{PCMQErm0{(w)oL9u$HBQ^@7S!xVu38nP!#3T`1ts!2H(^H;uxm>6AihDkp$!CUKLroIRFfoZ$NO*@5)nqdHovP;m)GhcsB%+Pj eBN{}Ge}Uhla5FU+K$&>}0000B!2{RLP=Bz2nYy#2xN!=000SaNLh0L00FxI00FxJI_%@(0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$SElET{R5*>LlRHloQ51l` zJ9Bq-c6OKd@{pir3zfvmio(Lugy280w4mn?_%A5jhR%-OXnzQe4b2)GA4EuiEE!mL zcHXahEyPto6Qid&$vG$Ac?+#I|05Eh+wJOpzmMZM*tU(75-BB>N(Cw9DELRRIF7L_ zi*~y$M&5;8m+6@qApCA96l4Wt*@Z43FCZ<62YqRjDfl@IOMeX4!{Z7-m_x8jSnEL}f`b5F^}vXrNI+&_C@2+zWYo^6g>0(FsjU#l zF|C^mh(-eH43rPnkf0WDo`(okkk}Q>Uxx^=<$j?aRSCL74E+(ECjmHKcV?>_?3gB2;YwhgMWyuC_xxhq)A$c%WDL9f7qwz zd9)Wx6eV%4_|!89(kfC;kQEutW|KlnT;IJ8XfEEt9uu5PMWRwXv%sDelu3=MhjG+Bckf-3X(|lcqeZ+V+tu)xIA_@1Cqa-ns+;*xA{U@Kz5#uh9uaDShdpEf00000b000McNliru+5-#^A0rlKXixwE01e&Qo^Ld7>ubNRsdK4RaGI3F}Mmo8A3aSvkClg31pxp2e_`w_ro*1#3A`* zf}vlciz(?S=HezLic``g#!v+f1Co4#za;JfH#ax@c=0Rq4}2CEOy+x<-_Az-@n^~; zo{}aRg{lz3z_Ly9Lf~c@TI*X6%ChA5vuj?B#=N^wQR|9nS@ZJJAe9cL)um7colXbK zvKUT=gnwmuZ=zC)&cb`RZwMl*M%FoFQ{m1DD%r$owW#YF(=;(nlWuDcrPM7TP19(3 zc{%9!`?Ojut_DpK*TsL+<%1Om!!Rg{;x0f^O0rC|xVT7`Ws%t3-F>pOwDhdk>-qc- z#c_OndV2bq_>Z}E09#vI@2{_~e{C4XW7l;% zZnujN0^7FHTDPMp z`ba7D9C-1s9{|Gl{ReAnYmZk}R^DD+UF|xKBaV-cM~8=pe;phg9E?VzA)sdqe*@Z{ WUlGQJEb#&W0000r)4^&KK@fo9 zzk7OiCcD`&I*ADiA}ERy^Z^3ieFHDvdg!JfCG5&kcE3AZl5%huO#xqf z?%(c_CxJ&V7pNwH3e~V;d$**WM#N%CY{ODoQHK#7mVc%|H*Wa4)8lBV#F5jnHN$=% zKd#7=l+ve|G{d&eU=T#0)Xo$THLR{LBku#%@PKkKz&DCF+ From 1c7504cbb43162e3bcf551e6dc70809dc8b3bd2e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 22 Mar 2010 22:54:38 +0200 Subject: [PATCH 6/7] A small unicode conversion fix. --- openlp/plugins/bibles/lib/opensong.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 247c97672..2f7e3e451 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -63,7 +63,8 @@ class OpenSongBible(BibleDB): Loads a Bible from file. """ log.debug(u'Starting OpenSong import from "%s"' % self.filename) - self.filename = unicode(self.filename, u'utf-8') + if not isinstance(self.filename, unicode): + self.filename = unicode(self.filename, u'utf8') self.wizard.incrementProgressBar(u'Preparing for import...') file = None success = True From 8524bf9174c4aa3550269d288cc436bc0ce07cf8 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Mon, 22 Mar 2010 23:50:32 +0000 Subject: [PATCH 7/7] Remove transparent error: QImage::scaled: Image is a null image --- openlp/core/lib/__init__.py | 5 +++-- openlp/core/ui/themestab.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index fc6a4bf0c..84525352e 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -144,8 +144,9 @@ def resize_image(image, width, height): The image to resize. """ preview = QtGui.QImage(image) - preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio, - QtCore.Qt.SmoothTransformation) + if not preview.isNull(): + preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio, + QtCore.Qt.SmoothTransformation) realw = preview.width() realh = preview.height() # and move it to the centre of the preview space diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index fff8c384c..0deca94e9 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -159,9 +159,10 @@ class ThemesTab(SettingsTab): image = self.parent.ThemeManagerContents.getPreviewImage( self.global_theme) preview = QtGui.QPixmap(unicode(image)) - display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, - QtCore.Qt.SmoothTransformation) - self.DefaultListView.setPixmap(display) + if not preview.isNull(): + preview = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, + QtCore.Qt.SmoothTransformation) + self.DefaultListView.setPixmap(preview) def updateThemeList(self, theme_list): """ @@ -184,6 +185,7 @@ class ThemesTab(SettingsTab): image = self.parent.ThemeManagerContents.getPreviewImage( self.global_theme) preview = QtGui.QPixmap(unicode(image)) - display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, - QtCore.Qt.SmoothTransformation) - self.DefaultListView.setPixmap(display) + if not preview.isNull(): + preview = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, + QtCore.Qt.SmoothTransformation) + self.DefaultListView.setPixmap(preview)