")
+ .attr("value", parseInt(row))
+ .click(OpenLP.Remote.sendSetItem);
+ if (item["selected"])
+ {
+ trow.addClass("selected");
+ }
+ trow.append($("| ").text(parseInt(row) + 1));
+ trow.append($(" | ").text(item["title"]));
+ trow.append($(" | ").text(item["plugin"]));
+ trow.append($(" | ").text("Notes: " + item["notes"]));
+ table.append(trow);
+ });
+ $("#service").html(table);
+ break;
+ case "slidecontroller_live_text_request":
+ var table = $("");
+ $.each(eventData, function (row, item) {
+ var trow = $("")
+ .attr("value", parseInt(row))
+ .click(OpenLP.Remote.sendLiveSet);
+ if (item["selected"])
+ {
+ trow.addClass("selected");
+ }
+ trow.append($("| ").text(item["tag"]));
+ trow.append($(" | ").html(item["text"] ? item["text"].replace(/\\n/g, "
") : ""));
+ table.append(trow);
+ });
+ $("#current-item").html(table);
+ break;
+ case "remotes_poll_request":
+ OpenLP.Remote.sendEvent("remotes_poll_request");
+ OpenLP.Remote.sendEvent("servicemanager_list_request");
+ OpenLP.Remote.sendEvent("slidecontroller_live_text_request");
+ break;
+ }
+ },
+ sendLiveSet: function (e)
+ {
+ var id = OpenLP.Events.getElement(e).parent().attr("value");
+ OpenLP.Remote.sendEvent("slidecontroller_live_set", id);
+ return false;
+ },
+ sendSetItem: function (e)
+ {
+ var id = OpenLP.Events.getElement(e).parent().attr("value");
+ OpenLP.Remote.sendEvent("servicemanager_set_item", id);
+ return false;
+ },
+ sendAlert: function (e)
+ {
+ var alert_text = $("#alert-text").val();
+ OpenLP.Remote.sendEvent("alerts_text", alert_text);
+ return false;
+ },
+ buttonClick: function (e)
+ {
+ var id = OpenLP.Events.getElement(e).attr("id");
+ OpenLP.Remote.sendEvent(id);
+ return false;
+ }
+});
+
+OpenLP.Events.bindLoad(function () {
+ OpenLP.Events.bindClick("input[type=button][id!=alert-send]", OpenLP.Remote.buttonClick);
+ OpenLP.Events.bindClick("#alert-send", OpenLP.Remote.sendAlert);
+ OpenLP.Remote.sendEvent("servicemanager_list_request");
+ OpenLP.Remote.sendEvent("slidecontroller_live_text_request");
+ OpenLP.Remote.sendEvent("remotes_poll_request");
+});
diff --git a/openlp/plugins/remotes/html/openlp.service.js b/openlp/plugins/remotes/html/openlp.service.js
new file mode 100644
index 000000000..843e6d18f
--- /dev/null
+++ b/openlp/plugins/remotes/html/openlp.service.js
@@ -0,0 +1,44 @@
+/*****************************************************************************
+ * OpenLP - Open Source Lyrics Projection *
+ * ------------------------------------------------------------------------- *
+ * Copyright (c) 2008-2010 Raoul Snyman *
+ * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael *
+ * Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin *
+ * Thompson, Jon Tibble, Carsten Tinggaard *
+ * ------------------------------------------------------------------------- *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; version 2 of the License. *
+ * *
+ * This program is distributed in the hope that it will be useful, but *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
+ * Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License along *
+ * with this program; if not, write to the Free Software Foundation, Inc., *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+ *****************************************************************************/
+
+OpenLP.Namespace.create("OpenLP.Service", {
+ addServiceItem: function (elem, item)
+ {
+ var trow = $(" | ")
+ .attr("id", "item-" + item.id)
+ .addClass("item")
+ .append($("| ").text(item.tag))
+ .append($(" | ").text(item.tag.replace(/\n/g, "
")));
+ return false;
+ },
+ sendLive: function (e)
+ {
+ var elem = OpenLP.Events.getElement(e);
+ var row = elem.attr("id").substr(5);
+ elem.addStyle("font-weight", "bold");
+ return false;
+ }
+});
+
+OpenLP.Events.load(function (){
+ OpenLP.Events.liveClick(".item", OpenLP.Service.sendLive);
+});
\ No newline at end of file
diff --git a/openlp/plugins/remotes/html/style.css b/openlp/plugins/remotes/html/style.css
new file mode 100644
index 000000000..3b55529d9
--- /dev/null
+++ b/openlp/plugins/remotes/html/style.css
@@ -0,0 +1,45 @@
+body
+{
+ background-color: #fff;
+ font-family: Lucida Grande, Lucida Sans, Arial, Helvetica, sans-serif;
+ font-size: 80%;
+}
+
+a
+{
+ color: #3c60a5;
+ text-decoration: none;
+}
+
+a:hover
+{
+ color: #304d85;
+ text-decoration: underline;
+}
+
+fieldset
+{
+ border: 1px solid #ccc;
+}
+
+td
+{
+ cursor: pointer;
+ padding: 3px 5px;
+}
+
+tr:hover
+{
+ background-color: #eee;
+}
+
+tr.selected:hover
+{
+ background-color: #ccc;
+}
+
+.selected
+{
+ background-color: #ddd;
+ font-weight: bold;
+}
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index 9d3f09bb6..f1796101f 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -26,9 +26,13 @@
import logging
import os
-import json
import urlparse
+try:
+ import json
+except ImportError:
+ import simplejson as json
+
from PyQt4 import QtCore, QtNetwork
from openlp.core.lib import Receiver
@@ -37,7 +41,7 @@ from openlp.core.utils import AppLocation
log = logging.getLogger(__name__)
class HttpServer(object):
- """
+ """
Ability to control OpenLP via a webbrowser
e.g. http://localhost:4316/send/slidecontroller_live_next
http://localhost:4316/send/alerts_text?q=your%20alert%20text
@@ -59,7 +63,7 @@ class HttpServer(object):
def start_tcp(self):
"""
Start the http server, use the port in the settings default to 4316
- Listen out for slide and song changes so they can be broadcast to
+ Listen out for slide and song changes so they can be broadcast to
clients. Listen out for socket connections
"""
log.debug(u'Start TCP server')
@@ -67,13 +71,13 @@ class HttpServer(object):
self.parent.settingsSection + u'/remote port',
QtCore.QVariant(4316)).toInt()[0]
self.server = QtNetwork.QTcpServer()
- self.server.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.Any),
+ self.server.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.Any),
port)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'slidecontroller_live_changed'),
+ QtCore.SIGNAL(u'slidecontroller_live_changed'),
self.slide_change)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'slidecontroller_live_started'),
+ QtCore.SIGNAL(u'slidecontroller_live_started'),
self.item_change)
QtCore.QObject.connect(self.server,
QtCore.SIGNAL(u'newConnection()'), self.new_connection)
@@ -92,7 +96,7 @@ class HttpServer(object):
"""
self.current_item = items[0].title
self.send_poll()
-
+
def send_poll(self):
"""
Tell the clients something has changed
@@ -100,7 +104,7 @@ class HttpServer(object):
Receiver.send_message(u'remotes_poll_response',
{'slide': self.current_slide,
'item': self.current_item})
-
+
def new_connection(self):
"""
A new http connection has been made. Create a client object to handle
@@ -110,7 +114,7 @@ class HttpServer(object):
socket = self.server.nextPendingConnection()
if socket:
self.connections.append(HttpConnection(self, socket))
-
+
def close_connection(self, connection):
"""
The connection has been closed. Clean up
@@ -124,9 +128,9 @@ class HttpServer(object):
"""
log.debug(u'close http server')
self.server.close()
-
+
class HttpConnection(object):
- """
+ """
A single connection, this handles communication between the server
and the client
"""
@@ -134,7 +138,7 @@ class HttpConnection(object):
"""
Initialise the http connection. Listen out for socket signals
"""
- log.debug(u'Initialise HttpConnection: %s' %
+ log.debug(u'Initialise HttpConnection: %s' %
socket.peerAddress().toString())
self.socket = socket
self.parent = parent
@@ -180,13 +184,13 @@ class HttpConnection(object):
def serve_file(self, filename):
"""
Send a file to the socket. For now, just a subset of file types
- and must be top level inside the html folder.
+ and must be top level inside the html folder.
If subfolders requested return 404, easier for security for the present.
Ultimately for i18n, this could first look for xx/file.html before
falling back to file.html... where xx is the language, e.g. 'en'
"""
- log.debug(u'serve file request %s' % filename)
+ log.debug(u'serve file request %s' % filename)
if not filename:
filename = u'index.html'
path = os.path.normpath(os.path.join(self.parent.html_dir, filename))
@@ -229,8 +233,8 @@ class HttpConnection(object):
if not params:
return None
else:
- return params['q']
-
+ return params['q']
+
def process_event(self, event, params):
"""
Send a signal to openlp to perform an action.
@@ -239,21 +243,27 @@ class HttpConnection(object):
"""
log.debug(u'Processing event %s' % event)
if params:
- Receiver.send_message(event, params)
- else:
- Receiver.send_message(event)
- return u'OK'
+ Receiver.send_message(event, params)
+ else:
+ Receiver.send_message(event)
+ return json.dumps([u'OK'])
def process_request(self, event, params):
"""
Client has requested data. Send the signal and parameters for openlp
- to handle, then listen out for a corresponding _request signal
+ to handle, then listen out for a corresponding ``_request`` signal
which will have the data to return.
- For most event timeout after 10 seconds (i.e. incase the signal
- recipient isn't listening)
- remotes_poll_request is a special case, this is a ajax long poll which
- is just waiting for slide change/song change activity. This can wait
- longer (one minute)
+
+ For most events, timeout after 10 seconds (i.e. in case the signal
+ recipient isn't listening). ``remotes_poll_request`` is a special case
+ however, this is a ajax long poll which is just waiting for slide
+ change/song change activity. This can wait longer (one minute).
+
+ ``event``
+ The event from the web page.
+
+ ``params``
+ Parameters sent with the event.
"""
log.debug(u'Processing request %s' % event)
if not event.endswith(u'_request'):
@@ -271,14 +281,14 @@ class HttpConnection(object):
else:
self.timer.start(10000)
if params:
- Receiver.send_message(event, params)
- else:
- Receiver.send_message(event)
+ Receiver.send_message(event, params)
+ else:
+ Receiver.send_message(event)
return True
def process_response(self, data):
"""
- The recipient of a _request signal has sent data. Convert this to
+ The recipient of a _request signal has sent data. Convert this to
json and return it to client
"""
log.debug(u'Processing response for %s' % self.event)
@@ -292,7 +302,7 @@ class HttpConnection(object):
def send_200_ok(self, mimetype='text/html; charset="utf-8"'):
"""
- Successful request. Send OK headers. Assume html for now.
+ Successful request. Send OK headers. Assume html for now.
"""
self.socket.write(u'HTTP/1.1 200 OK\r\n' + \
u'Content-Type: %s\r\n\r\n' % mimetype)
@@ -307,11 +317,11 @@ class HttpConnection(object):
def send_408_timeout(self):
"""
- A _request hasn't returned anything in the timeout period.
+ A _request hasn't returned anything in the timeout period.
Return timeout
"""
self.socket.write(u'HTTP/1.1 408 Request Timeout\r\n')
-
+
def timeout(self):
"""
Listener for timeout signal
@@ -320,14 +330,14 @@ class HttpConnection(object):
return
self.send_408_timeout()
self.close()
-
+
def disconnected(self):
"""
The client has disconnected. Tidy up
"""
log.debug(u'socket disconnected')
self.close()
-
+
def close(self):
"""
The server has closed the connection. Tidy up
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 9d96beb06..458e7200c 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -274,7 +274,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
item = self.VerseListWidget.item(row, 0)
data = unicode(item.data(QtCore.Qt.UserRole).toString())
bit = data.split(u':')
- rowTag = u'%s\n%s' % (bit[0][0:1], bit[1])
+ rowTag = u'%s%s' % (bit[0][0:1], bit[1])
rowLabel.append(rowTag)
self.VerseListWidget.setVerticalHeaderLabels(rowLabel)
@@ -395,9 +395,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.VerseDeleteButton.setEnabled(True)
def onVerseAddButtonClicked(self):
- # Allow insert button as you do not know if multiple verses will
- # be entered.
- self.verse_form.setVerse(u'')
+ self.verse_form.setVerse(u'', True)
if self.verse_form.exec_():
afterText, verse, subVerse = self.verse_form.getVerse()
data = u'%s:%s' % (verse, subVerse)
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index f2a59ba81..0c58b8650 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -31,7 +31,6 @@ from PyQt4 import QtCore, QtGui
from songimportwizard import Ui_SongImportWizard
from openlp.core.lib import Receiver, SettingsManager, translate
-#from openlp.core.utils import AppLocation
from openlp.plugins.songs.lib.importer import SongFormat
log = logging.getLogger(__name__)
@@ -136,7 +135,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
self.openLP2BrowseButton.setFocus()
return False
elif source_format == SongFormat.OpenLP1:
- if self.openSongFilenameEdit.text().isEmpty():
+ if self.openLP1FilenameEdit.text().isEmpty():
QtGui.QMessageBox.critical(self,
translate('SongsPlugin.ImportWizardForm',
'No openlp.org 1.x Song Database Selected'),
@@ -292,7 +291,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
def onCCLIRemoveButtonClicked(self):
self.removeSelectedItems(self.ccliFileListWidget)
-
+
def onSongsOfFellowshipAddButtonClicked(self):
self.getFiles(
translate('SongsPlugin.ImportWizardForm',
@@ -374,11 +373,11 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
importer = self.plugin.importSongs(SongFormat.OpenLP2,
filename=unicode(self.openLP2FilenameEdit.text())
)
- #elif source_format == SongFormat.OpenLP1:
- # # Import an openlp.org database
- # importer = self.plugin.importSongs(SongFormat.OpenLP1,
- # filename=unicode(self.field(u'openlp1_filename').toString())
- # )
+ elif source_format == SongFormat.OpenLP1:
+ # Import an openlp.org database
+ importer = self.plugin.importSongs(SongFormat.OpenLP1,
+ filename=unicode(self.openLP1FilenameEdit.text())
+ )
elif source_format == SongFormat.OpenLyrics:
# Import OpenLyrics songs
importer = self.plugin.importSongs(SongFormat.OpenLyrics,
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 5801ea44a..da9618ef2 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -26,6 +26,7 @@
from opensongimport import OpenSongImport
from olpimport import OpenLPSongImport
+from olp1import import OpenLP1SongImport
try:
from sofimport import SofImport
from oooimport import OooImport
@@ -61,6 +62,8 @@ class SongFormat(object):
"""
if format == SongFormat.OpenLP2:
return OpenLPSongImport
+ if format == SongFormat.OpenLP1:
+ return OpenLP1SongImport
elif format == SongFormat.OpenSong:
return OpenSongImport
elif format == SongFormat.SongsOfFellowship:
@@ -70,7 +73,7 @@ class SongFormat(object):
elif format == SongFormat.Generic:
return OooImport
elif format == SongFormat.CCLI:
- return CCLIFileImport
+ return CCLIFileImport
# else:
return None
diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py
index 1625bfff2..68bd3ef06 100644
--- a/openlp/plugins/songs/lib/olp1import.py
+++ b/openlp/plugins/songs/lib/olp1import.py
@@ -28,10 +28,13 @@ The :mod:`olp1import` module provides the functionality for importing
openlp.org 1.x song databases into the current installation database.
"""
import logging
-import sqlite
+import chardet
+try:
+ import sqlite
+except:
+ pass
-#from openlp.core.lib.db import BaseModel
-from openlp.plugins.songs.lib.db import Author, Book, Song, Topic #, MediaFile
+from openlp.core.lib import translate
from songimport import SongImport
log = logging.getLogger(__name__)
@@ -52,80 +55,95 @@ class OpenLP1SongImport(SongImport):
The database providing the data to import.
"""
SongImport.__init__(self, manager)
- self.manager = manager
self.import_source = kwargs[u'filename']
+ def decode_string(self, raw):
+ """
+ Use chardet to detect the encoding of the raw string, and convert it
+ to unicode.
+
+ ``raw``
+ The raw bytestring to decode.
+ """
+ detection = chardet.detect(raw)
+ if detection[u'confidence'] < 0.8:
+ codec = u'windows-1252'
+ else:
+ codec = detection[u'encoding']
+ return unicode(raw, codec)
+
def do_import(self):
"""
Run the import for an openlp.org 1.x song database.
"""
+ # Connect to the database
connection = sqlite.connect(self.import_source)
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
+ cursor.execute(u'SELECT COUNT(songid) FROM songs')
+ count = int(cursor.fetchone()[0])
+ success = True
+ self.import_wizard.importProgressBar.setMaximum(count)
+ # "cache" our list of authors
+ cursor.execute(u'SELECT authorid, authorname FROM authors')
+ authors = cursor.fetchall()
+ if new_db:
+ # "cache" our list of tracks
+ cursor.execute(u'SELECT trackid, fulltrackname FROM tracks')
+ tracks = cursor.fetchall()
+ # Import the songs
+ cursor.execute(u'SELECT songid, songtitle, lyrics || \'\' AS lyrics, '
+ u'copyrightinfo FROM songs')
+ songs = cursor.fetchall()
+ for song in songs:
+ self.set_defaults()
+ if self.stop_import_flag:
+ success = False
+ break
+ song_id = song[0]
+ title = self.decode_string(song[1])
+ lyrics = self.decode_string(song[2]).replace(u'\r', u'')
+ copyright = self.decode_string(song[3])
+ self.import_wizard.incrementProgressBar(
+ unicode(translate('SongsPlugin.ImportWizardForm',
+ 'Importing "%s"...')) % title)
+ self.title = title
+ self.process_song_text(lyrics)
+ self.add_copyright(copyright)
+ cursor.execute(u'SELECT authorid FROM songauthors '
+ u'WHERE songid = %s' % song_id)
+ author_ids = cursor.fetchall()
+ for author_id in author_ids:
+ if self.stop_import_flag:
+ success = False
+ break
+ for author in authors:
+ if author[0] == author_id[0]:
+ self.parse_author(self.decode_string(author[1]))
+ break
+ if self.stop_import_flag:
+ success = False
+ break
+ if new_db:
+ cursor.execute(u'SELECT trackid FROM songtracks '
+ u'WHERE songid = %s ORDER BY listindex' % song_id)
+ track_ids = cursor.fetchall()
+ for track_id in track_ids:
+ if self.stop_import_flag:
+ success = False
+ break
+ for track in tracks:
+ if track[0] == track_id[0]:
+ self.add_media_file(self.decode_string(track[1]))
+ break
+ if self.stop_import_flag:
+ success = False
+ break
+ self.finish()
+ return success
-# for song in source_songs:
-# new_song = Song()
-# new_song.title = song.title
-# if has_media_files:
-# new_song.alternate_title = song.alternate_title
-# else:
-# old_titles = song.search_title.split(u'@')
-# if len(old_titles) > 1:
-# new_song.alternate_title = old_titles[1]
-# else:
-# new_song.alternate_title = u''
-# new_song.search_title = song.search_title
-# new_song.song_number = song.song_number
-# new_song.lyrics = song.lyrics
-# new_song.search_lyrics = song.search_lyrics
-# new_song.verse_order = song.verse_order
-# new_song.copyright = song.copyright
-# new_song.comments = song.comments
-# new_song.theme_name = song.theme_name
-# new_song.ccli_number = song.ccli_number
-# if song.authors:
-# for author in song.authors:
-# existing_author = self.master_manager.get_object_filtered(
-# Author, Author.display_name == author.display_name)
-# if existing_author:
-# new_song.authors.append(existing_author)
-# else:
-# new_song.authors.append(Author.populate(
-# first_name=author.first_name,
-# last_name=author.last_name,
-# display_name=author.display_name))
-# else:
-# au = self.master_manager.get_object_filtered(Author,
-# Author.display_name == u'Author Unknown')
-# if au:
-# new_song.authors.append(au)
-# else:
-# new_song.authors.append(Author.populate(
-# display_name=u'Author Unknown'))
-# if song.book:
-# existing_song_book = self.master_manager.get_object_filtered(
-# Book, Book.name == song.book.name)
-# if existing_song_book:
-# new_song.book = existing_song_book
-# else:
-# new_song.book = Book.populate(name=song.book.name,
-# publisher=song.book.publisher)
-# if song.topics:
-# for topic in song.topics:
-# existing_topic = self.master_manager.get_object_filtered(
-# Topic, Topic.name == topic.name)
-# if existing_topic:
-# new_song.topics.append(existing_topic)
-# else:
-# new_song.topics.append(Topic.populate(name=topic.name))
-## if has_media_files:
-## if song.media_files:
-## for media_file in song.media_files:
-## existing_media_file = \
-## self.master_manager.get_object_filtered(MediaFile,
-## MediaFile.file_name == media_file.file_name)
-## if existing_media_file:
-## new_song.media_files.append(existing_media_file)
-## else:
-## new_song.media_files.append(MediaFile.populate(
-## file_name=media_file.file_name))
-# self.master_manager.save_object(new_song)
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 6748d5a8a..b0a21271a 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -31,6 +31,7 @@ from lxml import objectify
from lxml.etree import Error, LxmlError
import re
+from openlp.core.lib import translate
from openlp.plugins.songs.lib.songimport import SongImport
log = logging.getLogger(__name__)
@@ -131,49 +132,49 @@ class OpenSongImport(SongImport):
self.import_wizard.importProgressBar.setMaximum(numfiles)
for filename in self.filenames:
if self.stop_import_flag:
+ success = False
break
ext = os.path.splitext(filename)[1]
if ext.lower() == u'.zip':
- log.info(u'Zipfile found %s', filename)
+ log.debug(u'Zipfile found %s', filename)
z = ZipFile(filename, u'r')
for song in z.infolist():
if self.stop_import_flag:
+ success = False
break
parts = os.path.split(song.filename)
if parts[-1] == u'':
#No final part => directory
continue
log.info(u'Zip importing %s', parts[-1])
- self.import_wizard.incrementProgressBar(u'Importing %s...' \
- % parts[-1])
+ self.import_wizard.incrementProgressBar(
+ unicode(translate('SongsPlugin.ImportWizardForm',
+ 'Importing %s...')) % parts[-1])
songfile = z.open(song)
self.do_import_file(songfile)
if self.commit:
self.finish()
if self.stop_import_flag:
+ success = False
break
- else:
+ else: # not a zipfile
log.info('Direct import %s', filename)
- self.import_wizard.incrementProgressBar(u'Importing %s...' \
- % os.path.split(filename)[-1])
+ self.import_wizard.incrementProgressBar(
+ unicode(translate('SongsPlugin.ImportWizardForm',
+ 'Importing %s...')) % os.path.split(filename)[-1])
file = open(filename)
self.do_import_file(file)
if self.commit:
self.finish()
- if self.commit:
- self.finish()
+ return success
def do_import_file(self, file):
"""
Process the OpenSong file - pass in a file-like object,
not a filename
"""
- # self.setDefaults()
- # Setup blank storage to append to
- verse_order_list = []
- topics = []
- verselist = []
+ self.set_defaults()
try:
tree = objectify.parse(file)
except Error, LxmlError:
@@ -196,11 +197,10 @@ class OpenSongImport(SongImport):
setattr(self, fn_or_string, ustring)
else:
fn_or_string(ustring)
- if u'theme' in fields and unicode(root.theme) not in topics:
- topics.append(unicode(root.theme))
- if u'alttheme' in fields and unicode(root.alttheme) not in topics:
- topics.append(unicode(root.alttheme))
- lyrics = unicode(root.lyrics)
+ if u'theme' in fields and unicode(root.theme) not in self.topics:
+ self.topics.append(unicode(root.theme))
+ if u'alttheme' in fields and unicode(root.alttheme) not in self.topics:
+ self.topics.append(unicode(root.alttheme))
# data storage while importing
verses = {}
# keep track of a "default" verse order, in case none is specified
@@ -210,6 +210,7 @@ class OpenSongImport(SongImport):
# erm, versetype!
versetype = u'V'
versenum = None
+ lyrics = unicode(root.lyrics)
for thisline in lyrics.split(u'\n'):
# remove comments
semicolon = thisline.find(u';')
@@ -277,7 +278,7 @@ class OpenSongImport(SongImport):
for num in versenums:
versetag = u'%s%s' % (our_verse_type, num)
lines = u'\n'.join(verses[versetype][num])
- verselist.append([versetag, lines])
+ self.verses.append([versetag, lines])
# Keep track of what we have for error checking later
versetags[versetag] = 1
# now figure out the presentation order
@@ -300,11 +301,4 @@ class OpenSongImport(SongImport):
if not versetags.has_key(tag):
log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
else:
- verse_order_list.append(tag)
- # now copy the data
- self.topics = topics
- self.verse_order_list = verse_order_list
- self.verses = verselist
-
- # xxx sort out where to call setdefaults
- # xxx need to make calls to insert to database here
+ self.verse_order_list.append(tag)
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index e049740cc..a3085bb1c 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -30,7 +30,7 @@ from PyQt4 import QtCore
from openlp.core.lib import Receiver, translate
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.db import Song, Author, Topic, Book
+from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile
from openlp.plugins.songs.lib.xml import SongXMLBuilder
log = logging.getLogger(__name__)
@@ -52,10 +52,9 @@ class SongImport(QtCore.QObject):
"""
self.manager = manager
self.stop_import_flag = False
+ self.set_defaults()
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
- self.set_defaults()
-
def set_defaults(self):
"""
Create defaults for properties - call this before each song
@@ -71,17 +70,17 @@ class SongImport(QtCore.QObject):
self.ccli_number = u''
self.authors = []
self.topics = []
+ self.media_files = []
self.song_book_name = u''
self.song_book_pub = u''
self.verse_order_list = []
self.verses = []
- self.versecount = 0
- self.choruscount = 0
+ self.versecounts = {}
self.copyright_string = unicode(translate(
'SongsPlugin.SongImport', 'copyright'))
self.copyright_symbol = unicode(translate(
'SongsPlugin.SongImport', '\xa9'))
-
+
def stop_import(self):
"""
Sets the flag for importers to stop their import
@@ -189,7 +188,15 @@ class SongImport(QtCore.QObject):
return
self.authors.append(author)
- def add_verse(self, verse, versetag=None):
+ def add_media_file(self, filename):
+ """
+ Add a media file to the list
+ """
+ if filename in self.media_files:
+ return
+ self.media_files.append(filename)
+
+ def add_verse(self, verse, versetag=u'V'):
"""
Add a verse. This is the whole verse, lines split by \n
Verse tag can be V1/C1/B etc, or 'V' and 'C' (will count the verses/
@@ -201,13 +208,14 @@ class SongImport(QtCore.QObject):
if oldverse.strip() == verse.strip():
self.verse_order_list.append(oldversetag)
return
- if versetag == u'V' or not versetag:
- self.versecount += 1
- versetag = u'V' + unicode(self.versecount)
- if versetag.startswith(u'C'):
- self.choruscount += 1
- if versetag == u'C':
- versetag += unicode(self.choruscount)
+ if versetag[0] in self.versecounts:
+ self.versecounts[versetag[0]] += 1
+ else:
+ self.versecounts[versetag[0]] = 1
+ if len(versetag) == 1:
+ versetag += unicode(self.versecounts[versetag[0]])
+ elif int(versetag[1:]) > self.versecounts[versetag[0]]:
+ self.versecounts[versetag[0]] = int(versetag[1:])
self.verses.append([versetag, verse.rstrip()])
self.verse_order_list.append(versetag)
if versetag.startswith(u'V') and self.contains_verse(u'C1'):
@@ -258,8 +266,9 @@ class SongImport(QtCore.QObject):
+ '@' + self.alternate_title
song.song_number = self.song_number
song.search_lyrics = u''
- verses_changed_to_other = []
+ verses_changed_to_other = {}
sxml = SongXMLBuilder()
+ other_count = 1
for (versetag, versetext) in self.verses:
if versetag[0] == u'C':
versetype = VerseType.to_string(VerseType.Chorus)
@@ -274,16 +283,19 @@ class SongImport(QtCore.QObject):
elif versetag[0] == u'E':
versetype = VerseType.to_string(VerseType.Ending)
else:
- verses_changed_to_other.append(versetag)
+ newversetag = u'O%d' % other_count
+ verses_changed_to_other[versetag] = newversetag
+ other_count += 1
versetype = VerseType.to_string(VerseType.Other)
- print "Versetype", versetype
+ log.info(u'Versetype %s changing to %s' , versetag, newversetag)
+ versetag = newversetag
sxml.add_verse_to_lyrics(versetype, versetag[1:], versetext)
song.search_lyrics += u' ' + self.remove_punctuation(versetext)
- print verses_changed_to_other
+ # print verses_changed_to_other
song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
- for tag in verses_changed_to_other:
- pass
- # xxx sort out the "other" verses
+ for i, current_verse_tag in enumerate(self.verse_order_list):
+ if verses_changed_to_other.has_key(current_verse_tag):
+ self.verse_order_list[i] = verses_changed_to_other[current_verse_tag]
song.verse_order = u' '.join(self.verse_order_list)
song.copyright = self.copyright
song.comments = self.comments
@@ -292,11 +304,16 @@ class SongImport(QtCore.QObject):
for authortext in self.authors:
author = self.manager.get_object_filtered(Author,
Author.display_name == authortext)
- if author is None:
+ if not author:
author = Author.populate(display_name = authortext,
last_name=authortext.split(u' ')[-1],
first_name=u' '.join(authortext.split(u' ')[:-1]))
song.authors.append(author)
+ for filename in self.media_files:
+ media_file = self.manager.get_object_filtered(MediaFile,
+ MediaFile.file_name == filename)
+ if not media_file:
+ song.media_files.append(MediaFile.populate(file_name=filename))
if self.song_book_name:
song_book = self.manager.get_object_filtered(Book,
Book.name == self.song_book_name)
diff --git a/openlp/plugins/songs/lib/test/test3.opensong b/openlp/plugins/songs/lib/test/test3.opensong
new file mode 100755
index 000000000..388ab53c7
--- /dev/null
+++ b/openlp/plugins/songs/lib/test/test3.opensong
@@ -0,0 +1,10 @@
+
+
+ Test single verse
+ Martin Thompson
+ 2010
+ 123456
+ Worship: Declaration
+ Line 1
+Line 2
+
diff --git a/openlp/plugins/songs/lib/test/test_import_file.py b/openlp/plugins/songs/lib/test/test_import_file.py
new file mode 100644
index 000000000..0a0228317
--- /dev/null
+++ b/openlp/plugins/songs/lib/test/test_import_file.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
+# Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+import sys
+
+from openlp.plugins.songs.lib.opensongimport import OpenSongImport
+from openlp.core.lib.db import Manager
+from openlp.plugins.songs.lib.db import init_schema
+
+import logging
+LOG_FILENAME = 'test_import_file.log'
+logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
+
+from test_opensongimport import wizard_stub, progbar_stub
+
+def test(filenames):
+ manager = Manager(u'songs', init_schema)
+ o = OpenSongImport(manager, filenames=filenames)
+ o.import_wizard = wizard_stub()
+ o.commit = False
+ o.do_import()
+ o.print_song()
+
+if __name__ == "__main__":
+ test(sys.argv[1:])
diff --git a/openlp/plugins/songs/lib/test/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py
index 43ceeab04..75982da92 100644
--- a/openlp/plugins/songs/lib/test/test_importing_lots.py
+++ b/openlp/plugins/songs/lib/test/test_importing_lots.py
@@ -13,15 +13,19 @@ LOG_FILENAME = 'import.log'
logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
from test_opensongimport import wizard_stub, progbar_stub
+
+# Useful test function for importing a variety of different files
+# Uncomment below depending on what problem trying to make occur!
+
def opensong_import_lots():
ziploc = u'/home/mjt/openlp/OpenSong_Data/'
files = []
- #files = [u'test.opensong.zip', ziploc+u'ADond.zip']
+ files = [os.path.join(ziploc, u'RaoulSongs', u'Songs', u'Jesus Freak')]
# files.extend(glob(ziploc+u'Songs.zip'))
- files.extend(glob(ziploc+u'RaoulSongs.zip'))
- #files.extend(glob(ziploc+u'SOF.zip'))
- #files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip'))
-# files.extend(glob(ziploc+u'opensong_*.zip'))
+ # files.extend(glob(ziploc+u'RaoulSongs.zip'))
+ # files.extend(glob(ziploc+u'SOF.zip'))
+ # files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip'))
+ # files.extend(glob(ziploc+u'opensong_*.zip'))
errfile = codecs.open(u'import_lots_errors.txt', u'w', u'utf8')
manager = Manager(u'songs', init_schema)
o = OpenSongImport(manager, filenames=files)
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index 8bede1bbf..b503c65c5 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -48,7 +48,7 @@ def test():
manager = Manager(u'songs', init_schema)
o = OpenSongImport(manager, filenames=[u'test.opensong'])
o.import_wizard = wizard_stub()
- o.commit = True
+ o.commit = False
o.do_import()
o.print_song()
assert o.copyright == u'2010 Martin Thompson'
diff --git a/resources/forms/exceptiondialog.ui b/resources/forms/exceptiondialog.ui
new file mode 100644
index 000000000..f6f15cdc7
--- /dev/null
+++ b/resources/forms/exceptiondialog.ui
@@ -0,0 +1,130 @@
+
+
+ ExceptionDialog
+
+
+
+ 0
+ 0
+ 580
+ 407
+
+
+
+ Dialog
+
+
+
+ 8
+
+
+ 8
+
+ -
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 64
+ 64
+
+
+
+
+ 64
+ 64
+
+
+
+
+
+
+ :/graphics/exception.png
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred.
+
+
+ true
+
+
+
+
+
+ -
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Close
+
+
+
+
+
+
+
+
+
+
+ exceptionButtonBox
+ accepted()
+ ExceptionDialog
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ exceptionButtonBox
+ rejected()
+ ExceptionDialog
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/resources/images/exception.png b/resources/images/exception.png
new file mode 100644
index 000000000..c7ace707e
Binary files /dev/null and b/resources/images/exception.png differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index c9277c3cf..78d74cf7e 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -62,6 +62,7 @@
openlp-logo-256x256.png
+ exception.png
openlp-about-logo.png
openlp-splash-screen.png
diff --git a/scripts/resources.patch b/scripts/resources.patch
index ba85a157c..cfcf4e37e 100644
--- a/scripts/resources.patch
+++ b/scripts/resources.patch
@@ -1,6 +1,6 @@
--- openlp/core/resources.py.old Mon Jun 21 23:16:19 2010
+++ openlp/core/resources.py Mon Jun 21 23:27:48 2010
-@@ -1,10 +1,31 @@
+@@ -1,10 +1,32 @@
# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
@@ -14,8 +14,9 @@
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
-+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin #
-+# Thompson, Jon Tibble, Carsten Tinggaard #
++# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
++# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
++# Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
| |