Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/fix-import-presentation
into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~sam92/openlp/fix-import-presentation/+merge/140540
The error was in
http://bazaar.launchpad.net/~openlp-core/openlp/trunk/view/head:/openlp/plugins/presentations/lib/mediaitem.py#L180
It failed when the path contained non-ascii code.
--
https://code.launchpad.net/~sam92/openlp/fix-import-presentation/+merge/140540
Your team OpenLP Core is requested to review the proposed merge of
lp:~sam92/openlp/fix-import-presentation into lp:openlp.
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2012-12-03 19:19:10 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2012-12-18 20:53:24 +0000
@@ -172,11 +172,12 @@
files.sort(cmp=locale_compare,
key=lambda filename: os.path.split(unicode(filename))[1])
for file in files:
+ file = unicode(file)
if not initialLoad:
self.plugin.formParent.incrementProgressBar()
if currlist.count(file) > 0:
continue
- filename = os.path.split(unicode(file))[1]
+ filename = os.path.split(file)[1]
if not os.path.exists(file):
item_name = QtGui.QListWidgetItem(filename)
item_name.setIcon(build_icon(ERROR))
@@ -196,7 +197,7 @@
controller_name = self.findControllerByType(filename)
if controller_name:
controller = self.controllers[controller_name]
- doc = controller.add_document(unicode(file))
+ doc = controller.add_document(file)
thumb = os.path.join(doc.get_thumbnail_folder(),
u'icon.png')
preview = doc.get_thumbnail_path(1, True)
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
