forked from openlp/openlp
Keeping the boss happy, if that is possible (formatting)
This commit is contained in:
Jonathan Corwin
parent
6ced2f5037
commit
32cf72153d
@ -31,8 +31,8 @@ from openlp.plugins.songs.lib.classes import *
|
|||||||
clear_mappers()
|
clear_mappers()
|
||||||
mapper(Author, authors_table)
|
mapper(Author, authors_table)
|
||||||
mapper(Book, song_books_table)
|
mapper(Book, song_books_table)
|
||||||
mapper(Song, songs_table,
|
mapper(Song, songs_table, properties={
|
||||||
properties={'authors': relation(Author, backref='songs',
|
'authors': relation(Author, backref='songs',
|
||||||
secondary=authors_songs_table),
|
secondary=authors_songs_table),
|
||||||
'book': relation(Book, backref='songs'),
|
'book': relation(Book, backref='songs'),
|
||||||
'topics': relation(Topic, backref='songs',
|
'topics': relation(Topic, backref='songs',
|
||||||
@ -42,217 +42,199 @@ mapper(Topic, topics_table)
|
|||||||
class MigrateSongs():
|
class MigrateSongs():
|
||||||
def __init__(self, display):
|
def __init__(self, display):
|
||||||
self.display = display
|
self.display = display
|
||||||
self.config = PluginConfig("Songs")
|
self.config = PluginConfig('Songs')
|
||||||
self.data_path = self.config.get_data_path()
|
self.data_path = self.config.get_data_path()
|
||||||
self.database_files = self.config.get_files("sqlite")
|
self.database_files = self.config.get_files('sqlite')
|
||||||
print self.database_files
|
print self.database_files
|
||||||
|
|
||||||
def process(self):
|
def process(self):
|
||||||
self.display.output("Songs processing started")
|
self.display.output(u'Songs processing started')
|
||||||
for f in self.database_files:
|
for f in self.database_files:
|
||||||
self.v_1_9_0(f)
|
self.v_1_9_0(f)
|
||||||
self.display.output("Songs processing finished")
|
self.display.output(u'Songs processing finished')
|
||||||
|
|
||||||
def v_1_9_0(self, database):
|
def v_1_9_0(self, database):
|
||||||
self.display.output("Migration 1.9.0 Started for "+database);
|
self.display.output(u'Migration 1.9.0 Started for ' + database)
|
||||||
self._v1_9_0_authors(database)
|
self._v1_9_0_authors(database)
|
||||||
self._v1_9_0_topics(database)
|
self._v1_9_0_topics(database)
|
||||||
self._v1_9_0_songbook(database)
|
self._v1_9_0_songbook(database)
|
||||||
self._v1_9_0_songauthors(database)
|
self._v1_9_0_songauthors(database)
|
||||||
self._v1_9_0_songtopics(database)
|
self._v1_9_0_songtopics(database)
|
||||||
self._v1_9_0_songs(database)
|
self._v1_9_0_songs(database)
|
||||||
self.display.output("Migration 1.9.0 Finished for " + database)
|
self.display.output(u'Migration 1.9.0 Finished for ' + database)
|
||||||
|
|
||||||
def _v1_9_0_authors(self, database):
|
def _v1_9_0_authors(self, database):
|
||||||
self.display.sub_output("Authors Started for "+database)
|
self.display.sub_output(u'Authors Started for ' + database)
|
||||||
conn = sqlite3.connect(self.data_path + os.sep + database)
|
conn = sqlite3.connect(self.data_path + os.sep + database)
|
||||||
conn.execute("""alter table authors rename to authors_temp;""")
|
conn.execute("""alter table authors rename to authors_temp;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.execute("""create table authors (id integer primary key ASC AUTOINCREMENT);""")
|
self.display.sub_output(u'old author renamed to author_temp')
|
||||||
|
conn.execute("""create table authors (
|
||||||
|
id integer primary key ASC AUTOINCREMENT,
|
||||||
|
first_name varchar(128),
|
||||||
|
last_name varchar(128),
|
||||||
|
display_name varchar(255)
|
||||||
|
);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("authors table created")
|
self.display.sub_output(u'authors table created')
|
||||||
conn.execute("""alter table authors add column first_name varchar(128);""")
|
conn.execute("""create index if not exists author1 on authors
|
||||||
|
(display_name ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("first_name added")
|
self.display.sub_output(u'index author1 created')
|
||||||
conn.execute("""alter table authors add column last_name varchar(128);""")
|
conn.execute("""create index if not exists author2 on authors
|
||||||
|
(last_name ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("last_name added")
|
self.display.sub_output(u'index author2 created')
|
||||||
conn.execute("""alter table authors add column display_name varchar(255);""")
|
conn.execute("""create index if not exists author3 on authors
|
||||||
|
(first_name ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("display_name added")
|
self.display.sub_output(u'index author3 created')
|
||||||
conn.execute("""create index if not exists author1 on authors (display_name ASC,id ASC);""")
|
self.display.sub_output(u'Author Data Migration started')
|
||||||
|
conn.execute("""insert into authors (id, display_name)
|
||||||
|
select authorid, authorname from authors_temp;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("index author1 created")
|
self.display.sub_output(u'authors populated')
|
||||||
conn.execute("""create index if not exists author2 on authors (last_name ASC,id ASC);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("index author2 created")
|
|
||||||
conn.execute("""create index if not exists author3 on authors (first_name ASC,id ASC);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("index author3 created")
|
|
||||||
self.display.sub_output("Author Data Migration started")
|
|
||||||
conn.execute("""insert into authors (id, display_name) select authorid, authorname from authors_temp;""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("authors populated")
|
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
text = c.execute("""select * from authors""") .fetchall()
|
text = c.execute("""select * from authors""") .fetchall()
|
||||||
for author in text:
|
for author in text:
|
||||||
dispname = author[3]
|
dispname = author[3]
|
||||||
dispname = dispname.replace("'", "") # remove quotes.
|
dispname = dispname.replace("'", "")
|
||||||
pos = dispname.rfind(" ")
|
pos = dispname.rfind(" ")
|
||||||
afn = dispname[:pos]
|
authorfirstname = dispname[:pos]
|
||||||
aln = dispname[pos + 1:len(dispname)]
|
authorlastname = dispname[pos + 1:len(dispname)]
|
||||||
s = "update authors set first_name = '" \
|
s = "update authors set first_name = '" \
|
||||||
+ afn + "', last_name = '" + aln + "' where id = " + str(author[0])
|
+ authorfirstname + "', last_name = '" + authorlastname \
|
||||||
text1 = c.execute(s)
|
+ "' where id = " + str(author[0])
|
||||||
|
c.execute(s)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("Author Data Migration Completed")
|
self.display.sub_output(u'Author Data Migration Completed')
|
||||||
conn.execute("""drop table authors_temp;""")
|
conn.execute("""drop table authors_temp;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.display.sub_output("author_temp dropped")
|
self.display.sub_output(u'author_temp dropped')
|
||||||
self.display.sub_output("Authors Completed")
|
self.display.sub_output(u'Authors Completed')
|
||||||
|
|
||||||
def _v1_9_0_songbook(self, database):
|
def _v1_9_0_songbook(self, database):
|
||||||
self.display.sub_output("SongBook Started for "+database)
|
self.display.sub_output(u'SongBook Started for ' + database)
|
||||||
conn = sqlite3.connect(self.data_path + os.sep + database)
|
conn = sqlite3.connect(self.data_path + os.sep + database)
|
||||||
conn.execute("""create table if not exists song_books (id integer Primary Key ASC AUTOINCREMENT);""")
|
conn.execute("""create table if not exists song_books (
|
||||||
|
id integer Primary Key ASC AUTOINCREMENT,
|
||||||
|
name varchar(128),
|
||||||
|
publisher varchar(128)
|
||||||
|
);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("SongBook table created")
|
self.display.sub_output(u'songbook table created')
|
||||||
conn.execute("""alter table song_books add column name varchar(128);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songbook name added")
|
|
||||||
conn.execute("""alter table song_books add column publisher varchar(128);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songbook publisher added")
|
|
||||||
conn.execute("""create index if not exists songbook1 on song_books (name ASC,id ASC);""")
|
conn.execute("""create index if not exists songbook1 on song_books (name ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("index songbook1 created")
|
self.display.sub_output(u'index songbook1 created')
|
||||||
conn.execute("""create index if not exists songbook2 on song_books (publisher ASC,id ASC);""")
|
conn.execute("""create index if not exists songbook2 on song_books (publisher ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.display.sub_output("index songbook2 created")
|
self.display.sub_output(u'index songbook2 created')
|
||||||
self.display.sub_output("SongBook Completed")
|
self.display.sub_output(u'SongBook Completed')
|
||||||
|
|
||||||
def _v1_9_0_songs(self, database):
|
def _v1_9_0_songs(self, database):
|
||||||
self.display.sub_output("Songs Started for "+database)
|
self.display.sub_output(u'Songs Started for ' + database)
|
||||||
conn = sqlite3.connect(self.data_path + os.sep + database)
|
conn = sqlite3.connect(self.data_path + os.sep + database)
|
||||||
conn.execute("""alter table songs rename to songs_temp;""")
|
conn.execute("""alter table songs rename to songs_temp;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.execute("""create table if not exists songs (id integer Primary Key ASC AUTOINCREMENT);""")
|
conn.execute("""create table if not exists songs (
|
||||||
|
id integer Primary Key ASC AUTOINCREMENT,
|
||||||
|
song_book_id integer,
|
||||||
|
title varchar(255),
|
||||||
|
lyrics text,
|
||||||
|
verse_order varchar(128),
|
||||||
|
copyright varchar(255),
|
||||||
|
comments text,
|
||||||
|
ccli_number varchar(64),
|
||||||
|
song_number varchar(64),
|
||||||
|
theme_name varchar(128),
|
||||||
|
search_title varchar(255),
|
||||||
|
search_lyrics text
|
||||||
|
);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("songs table created")
|
self.display.sub_output(u'songs table created')
|
||||||
conn.execute("""alter table songs add column song_book_id integer;""")
|
conn.execute("""create index if not exists songs1 on songs
|
||||||
|
(search_lyrics ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("songs song_book_id added")
|
self.display.sub_output(u'index songs1 created')
|
||||||
conn.execute("""alter table songs add title varchar(255);""")
|
conn.execute("""create index if not exists songs2 on songs
|
||||||
|
(search_title ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("songs title added")
|
self.display.sub_output(u'index songs2 created')
|
||||||
conn.execute("""alter table songs add lyrics text;""")
|
conn.execute("""insert into songs (id, title, lyrics, copyright,
|
||||||
conn.commit()
|
search_title, search_lyrics, song_book_id)
|
||||||
self.display.sub_output("songs lyrics added")
|
|
||||||
conn.execute("""alter table songs add column verse_order varchar(128);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs verse_order added")
|
|
||||||
conn.execute("""alter table songs add copyright varchar(255);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs copyright added")
|
|
||||||
conn.execute("""alter table songs add column comments text;""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs comments added")
|
|
||||||
conn.execute("""alter table songs add ccli_number varchar(64);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs ccli_number added")
|
|
||||||
conn.execute("""alter table songs add song_number varchar(64);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs song_number added")
|
|
||||||
conn.execute("""alter table songs add theme_name varchar(128);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs theme_name added")
|
|
||||||
conn.execute("""alter table songs add search_title varchar(255);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs search_title added")
|
|
||||||
conn.execute("""alter table songs add search_lyrics text;""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songs search_lyrics added")
|
|
||||||
|
|
||||||
conn.execute("""create index if not exists songs1 on songs (search_lyrics ASC,id ASC);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("index songs1 created")
|
|
||||||
conn.execute("""create index if not exists songs2 on songs (search_title ASC,id ASC);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("index songs2 created")
|
|
||||||
|
|
||||||
conn.execute("""insert into songs (id, title, lyrics, copyright, search_title, search_lyrics, song_book_id)
|
|
||||||
select songid, songtitle, lyrics, copyrightinfo,
|
select songid, songtitle, lyrics, copyrightinfo,
|
||||||
replace(replace(replace(replace(replace(replace(replace(replace(replace(songtitle, '&', 'and'), ',', ''), ';', ''), ':', ''), '(', ''), ')', ''), '{', ''), '}',''),'?',''),
|
replace(replace(replace(replace(replace(replace(replace(replace(
|
||||||
replace(replace(replace(replace(replace(replace(replace(replace(replace(lyrics, '&', 'and'), ',', ''), ';', ''), ':', ''), '(', ''), ')', ''), '{', ''), '}',''),'?',''),
|
replace(songtitle, '&', 'and'), ',', ''), ';', ''), ':', ''),
|
||||||
|
'(', ''), ')', ''), '{', ''), '}',''),'?',''),
|
||||||
|
replace(replace(replace(replace(replace(replace(replace(replace(
|
||||||
|
replace(lyrics, '&', 'and'), ',', ''), ';', ''), ':', ''),
|
||||||
|
'(', ''), ')', ''), '{', ''), '}',''),'?',''),
|
||||||
0
|
0
|
||||||
from songs_temp;""")
|
from songs_temp;""")
|
||||||
|
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("songs populated")
|
self.display.sub_output(u'songs populated')
|
||||||
conn.execute("""drop table songs_temp;""")
|
conn.execute("""drop table songs_temp;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.display.sub_output("songs_temp dropped")
|
self.display.sub_output(u'songs_temp dropped')
|
||||||
|
self.display.sub_output(u'Songs Completed')
|
||||||
self.display.sub_output("Songs Completed")
|
|
||||||
|
|
||||||
def _v1_9_0_topics(self, database):
|
def _v1_9_0_topics(self, database):
|
||||||
self.display.sub_output("Topics Started for "+database)
|
self.display.sub_output(u'Topics Started for ' + database)
|
||||||
conn = sqlite3.connect(self.data_path+os.sep+database)
|
conn = sqlite3.connect(self.data_path+os.sep+database)
|
||||||
conn.text_factory = str
|
conn.text_factory = str
|
||||||
conn.execute("""create table if not exists topics (id integer Primary Key ASC AUTOINCREMENT);""")
|
conn.execute("""create table if not exists topics
|
||||||
|
(id integer Primary Key ASC AUTOINCREMENT,
|
||||||
|
name varchar(128));""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("Topic table created")
|
self.display.sub_output(u'Topic table created')
|
||||||
conn.execute("""alter table topics add column name varchar(128);""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("topicname added")
|
|
||||||
conn.execute("""create index if not exists topic1 on topics (name ASC,id ASC);""")
|
conn.execute("""create index if not exists topic1 on topics (name ASC,id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.display.sub_output("index topic1 created")
|
self.display.sub_output(u'index topic1 created')
|
||||||
|
|
||||||
self.display.sub_output("Topics Completed")
|
self.display.sub_output(u'Topics Completed')
|
||||||
|
|
||||||
def _v1_9_0_songauthors(self, database):
|
def _v1_9_0_songauthors(self, database):
|
||||||
self.display.sub_output("SongAuthors Started for "+database);
|
self.display.sub_output(u'SongAuthors Started for ' + database);
|
||||||
conn = sqlite3.connect(self.data_path + os.sep + database)
|
conn = sqlite3.connect(self.data_path + os.sep + database)
|
||||||
conn.execute("""create table if not exists authors_songs (author_id integer);""")
|
conn.execute("""create table if not exists authors_songs
|
||||||
|
(author_id integer,
|
||||||
|
song_id integer);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("authors_songs table created")
|
self.display.sub_output(u'authors_songs table created')
|
||||||
conn.execute("""alter table authors_songs add column song_id integer;""")
|
conn.execute("""insert into authors_songs (author_id, song_id)
|
||||||
|
select authorid, songid from songauthors;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.execute("""insert into authors_songs (author_id, song_id) select authorid, songid from songauthors;""")
|
self.display.sub_output(u'authors_songs populated')
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("authors_songs populated")
|
|
||||||
conn.execute("""drop table songauthors;""")
|
conn.execute("""drop table songauthors;""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("songauthors dropped")
|
self.display.sub_output(u'songauthors dropped')
|
||||||
conn.close()
|
conn.close()
|
||||||
self.display.sub_output("SongAuthors Completed")
|
self.display.sub_output(u'SongAuthors Completed')
|
||||||
|
|
||||||
def _v1_9_0_songtopics(self, database):
|
def _v1_9_0_songtopics(self, database):
|
||||||
self.display.sub_output("Songtopics Started for "+database);
|
self.display.sub_output(u'Songtopics Started for ' + database);
|
||||||
conn = sqlite3.connect(self.data_path+os.sep+database)
|
conn = sqlite3.connect(self.data_path+os.sep+database)
|
||||||
conn.execute("""create table if not exists song_topics (song_id integer);""")
|
conn.execute("""create table if not exists song_topics
|
||||||
|
(song_id integer,
|
||||||
|
topic_id integer);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("Songtopics table created")
|
self.display.sub_output(u'songtopics table created')
|
||||||
conn.execute("""alter table song_topics add column topic_id integer;""")
|
|
||||||
conn.commit()
|
|
||||||
self.display.sub_output("songtopics_topic_id added")
|
|
||||||
conn.execute("""create index if not exists songtopic1 on song_topics (topic_id ASC,song_id ASC);""")
|
conn.execute("""create index if not exists songtopic1 on song_topics (topic_id ASC,song_id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
self.display.sub_output("index songtopic1 created")
|
self.display.sub_output(u'index songtopic1 created')
|
||||||
conn.execute("""create index if not exists songtopic2 on song_topics (song_id ASC,topic_id ASC);""")
|
conn.execute("""create index if not exists songtopic2 on song_topics (song_id ASC,topic_id ASC);""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.display.sub_output("index songtopic2 created")
|
self.display.sub_output(u'index songtopic2 created')
|
||||||
self.display.sub_output("SongTopics Completed")
|
self.display.sub_output(u'SongTopics Completed')
|
||||||
|
|
||||||
def run_cmd(self, cmd):
|
def run_cmd(self, cmd):
|
||||||
f_i, f_o = os.popen4(cmd)
|
filein, fileout = os.popen4(cmd)
|
||||||
out = f_o.readlines()
|
out = fileout.readlines()
|
||||||
if len(out) > 0:
|
if len(out) > 0:
|
||||||
for o in range (0, len(out)):
|
for o in range (0, len(out)):
|
||||||
self.display.sub_output(out[o])
|
self.display.sub_output(out[o])
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user