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

Catch common errors during import and report to user

This commit is contained in:
Gerald Britton 2011-05-24 16:41:14 -04:00
parent a5a8c0d6d2
commit d05c349f41
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openlp/plugins/songs/lib/oooimport.py
View File

@ -40,6 +40,7 @@ if os.name == u'nt':
PAGE_BOTH = 6 PAGE_BOTH = 6
else: else:
import uno import uno
from com.sun.star.connection import NoConnectException
from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH
class OooImport(SongImport): class OooImport(SongImport):
@ -56,7 +57,16 @@ class OooImport(SongImport):
self.process_started = False self.process_started = False
def do_import(self): def do_import(self):
self.start_ooo() if not isinstance(self.import_source, list):
return
try:
self.start_ooo()
except NoConnectException as exc:
self.log_error(
self.import_source[0],
u'Unable to connect to OpenOffice.org or LibreOffice')
log.error(exc)
return
self.import_wizard.progressBar.setMaximum(len(self.import_source)) self.import_wizard.progressBar.setMaximum(len(self.import_source))
for filename in self.import_source: for filename in self.import_source:
if self.stop_import_flag: if self.stop_import_flag:
@ -98,13 +108,16 @@ class OooImport(SongImport):
while uno_instance is None and loop < 5: while uno_instance is None and loop < 5:
try: try:
uno_instance = get_uno_instance(resolver) uno_instance = get_uno_instance(resolver)
except: except NoConnectException:
log.exception("Failed to resolve uno connection") log.exception("Failed to resolve uno connection")
self.start_ooo_process() self.start_ooo_process()
loop += 1 loop += 1
manager = uno_instance.ServiceManager else:
self.desktop = manager.createInstanceWithContext( manager = uno_instance.ServiceManager
"com.sun.star.frame.Desktop", uno_instance) self.desktop = manager.createInstanceWithContext(
"com.sun.star.frame.Desktop", uno_instance)
return
raise
def start_ooo_process(self): def start_ooo_process(self):
try: try:

26
openlp/plugins/songs/lib/sofimport.py
View File

@ -30,10 +30,14 @@
# http://www.oooforum.org/forum/viewtopic.phtml?t=14409 # http://www.oooforum.org/forum/viewtopic.phtml?t=14409
# http://wiki.services.openoffice.org/wiki/Python # http://wiki.services.openoffice.org/wiki/Python
import logging
import os import os
import re import re
from oooimport import OooImport from oooimport import OooImport
from com.sun.star.uno import RuntimeException
log = logging.getLogger(__name__)
if os.name == u'nt': if os.name == u'nt':
BOLD = 150.0 BOLD = 150.0
@ -85,16 +89,18 @@ class SofImport(OooImport):
""" """
self.blanklines = 0 self.blanklines = 0
self.new_song() self.new_song()
paragraphs = self.document.getText().createEnumeration() try:
while paragraphs.hasMoreElements(): paragraphs = self.document.getText().createEnumeration()
if self.stop_import_flag: while paragraphs.hasMoreElements():
return if self.stop_import_flag:
paragraph = paragraphs.nextElement() return
if paragraph.supportsService("com.sun.star.text.Paragraph"): paragraph = paragraphs.nextElement()
self.process_paragraph(paragraph) if paragraph.supportsService("com.sun.star.text.Paragraph"):
if self.song: self.process_paragraph(paragraph)
self.finish() except RuntimeException as exc:
self.song = False log.exception(u'Error processing file: %s', exc)
if not self.finish():
self.log_error(self.filepath)
def process_paragraph(self, paragraph): def process_paragraph(self, paragraph):
""" """