From 869ab41cad4ed858aedd7cae8f30ff33ec4056cd Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 12 Jun 2011 13:51:23 +0200 Subject: [PATCH 1/3] - fixed crash attempting to add a non existent image to the service - fixed display of full presentation path in remote search - fixed names - fixed hard coded 'setting section' --- openlp/plugins/images/lib/mediaitem.py | 14 +++++++------- openlp/plugins/media/lib/mediaitem.py | 10 +++++----- openlp/plugins/presentations/lib/mediaitem.py | 14 ++++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 921a52ede..abd34f4e7 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -110,14 +110,14 @@ class ImageMediaItem(MediaManagerItem): SettingsManager.set_list(self.settingsSection, self.settingsSection, self.getFileList()) - def loadList(self, list, initialLoad=False): + def loadList(self, images, initialLoad=False): if not initialLoad: - self.plugin.formparent.displayProgressBar(len(list)) + self.plugin.formparent.displayProgressBar(len(images)) # Sort the themes by its filename considering language specific # characters. lower() is needed for windows! - list.sort(cmp=locale.strcoll, + images.sort(cmp=locale.strcoll, key=lambda filename: os.path.split(unicode(filename))[1].lower()) - for imageFile in list: + for imageFile in images: if not initialLoad: self.plugin.formparent.incrementProgressBar() filename = os.path.split(unicode(imageFile))[1] @@ -155,7 +155,7 @@ class ImageMediaItem(MediaManagerItem): for bitem in items: filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) if not os.path.exists(filename): - missing_items.append(item) + missing_items.append(bitem) missing_items_filenames.append(filename) for item in missing_items: items.remove(item) @@ -217,11 +217,11 @@ class ImageMediaItem(MediaManagerItem): 'the image file "%s" no longer exists.')) % filename) def search(self, string): - list = SettingsManager.load_list(self.settingsSection, + files = SettingsManager.load_list(self.settingsSection, self.settingsSection) results = [] string = string.lower() - for file in list: + for file in files: filename = os.path.split(unicode(file))[1] if filename.lower().find(string) > -1: results.append([file, filename]) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 96b97d25a..0022a9e46 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -202,12 +202,12 @@ class MediaMediaItem(MediaManagerItem): SettingsManager.set_list(self.settingsSection, self.settingsSection, self.getFileList()) - def loadList(self, list): + def loadList(self, files): # Sort the themes by its filename considering language specific # characters. lower() is needed for windows! - list.sort(cmp=locale.strcoll, + files.sort(cmp=locale.strcoll, key=lambda filename: os.path.split(unicode(filename))[1].lower()) - for file in list: + for file in files: filename = os.path.split(unicode(file))[1] item_name = QtGui.QListWidgetItem(filename) img = QtGui.QPixmap(u':/media/media_video.png').toImage() @@ -221,11 +221,11 @@ class MediaMediaItem(MediaManagerItem): self.mediaObject = Phonon.MediaObject(self) def search(self, string): - list = SettingsManager.load_list(self.settingsSection, + files = SettingsManager.load_list(self.settingsSection, self.settingsSection) results = [] string = string.lower() - for file in list: + for file in files: filename = os.path.split(unicode(file))[1] if filename.lower().find(string) > -1: results.append([file, filename]) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index e138d4ef9..dcf7c41f1 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -119,9 +119,9 @@ class PresentationMediaItem(MediaManagerItem): Populate the media manager tab """ self.listView.setIconSize(QtCore.QSize(88, 50)) - list = SettingsManager.load_list( + files = SettingsManager.load_list( self.settingsSection, u'presentations') - self.loadList(list, True) + self.loadList(files, True) self.populateDisplayTypes() def rebuild(self): @@ -312,10 +312,12 @@ class PresentationMediaItem(MediaManagerItem): return None def search(self, string): - list = SettingsManager.load_list(self.settingsSection, u'presentations') + files = SettingsManager.load_list( + self.settingsSection, self.settingsSection) results = [] string = string.lower() - for file in list: - if file.lower().find(string) > -1: - results.append([file, file]) + for file in files: + filename = os.path.split(unicode(file))[1] + if filename.lower().find(string) > -1: + results.append([file, filename]) return results From dc2bafaab9c7790c6f0410d900cee78780566fae Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 12 Jun 2011 14:13:04 +0200 Subject: [PATCH 2/3] removed not needed variable, removed obsolete comments --- openlp/plugins/bibles/lib/mediaitem.py | 1 - openlp/plugins/media/lib/mediaitem.py | 4 ---- 2 files changed, 5 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 54a7e603e..a85205ede 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -984,7 +984,6 @@ class BibleMediaItem(MediaManagerItem): """ bible = unicode(self.quickVersionComboBox.currentText()) search_results = self.plugin.manager.get_verses(bible, string, False, False) - results = [] if search_results: versetext = u' '.join([verse.text for verse in search_results]) return [[string, versetext]] diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 0022a9e46..a9b59844b 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -139,8 +139,6 @@ class MediaMediaItem(MediaManagerItem): self.mediaObject.clearQueue() self.mediaObject.setCurrentSource(Phonon.MediaSource(filename)) if not self.mediaStateWait(Phonon.StoppedState): - # Due to string freeze, borrow a message from presentations - # This will be corrected in 1.9.6 critical_error_message_box(UiStrings().UnsupportedFile, UiStrings().UnsupportedFile) return False @@ -150,8 +148,6 @@ class MediaMediaItem(MediaManagerItem): if not self.mediaStateWait(Phonon.PlayingState) \ or self.mediaObject.currentSource().type() \ == Phonon.MediaSource.Invalid: - # Due to string freeze, borrow a message from presentations - # This will be corrected in 1.9.6 self.mediaObject.stop() critical_error_message_box(UiStrings().UnsupportedFile, UiStrings().UnsupportedFile) From 08a3a7aba6b5a36e50914e93e1f7968f42219737 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 12 Jun 2011 15:01:46 +0200 Subject: [PATCH 3/3] hard coded misleading arguments --- openlp/plugins/images/lib/mediaitem.py | 7 +++---- openlp/plugins/media/lib/mediaitem.py | 8 +++----- openlp/plugins/presentations/lib/mediaitem.py | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index abd34f4e7..76a22b89d 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -80,7 +80,7 @@ class ImageMediaItem(MediaManagerItem): u'thumbnails') check_directory_exists(self.servicePath) self.loadList(SettingsManager.load_list( - self.settingsSection, self.settingsSection), True) + self.settingsSection, u'images'), True) def addListViewToToolBar(self): MediaManagerItem.addListViewToToolBar(self) @@ -108,7 +108,7 @@ class ImageMediaItem(MediaManagerItem): unicode(text.text()))) self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, - self.settingsSection, self.getFileList()) + u'images', self.getFileList()) def loadList(self, images, initialLoad=False): if not initialLoad: @@ -217,8 +217,7 @@ class ImageMediaItem(MediaManagerItem): 'the image file "%s" no longer exists.')) % filename) def search(self, string): - files = SettingsManager.load_list(self.settingsSection, - self.settingsSection) + files = SettingsManager.load_list(self.settingsSection, u'images') results = [] string = string.lower() for file in files: diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index a9b59844b..77727b454 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -182,8 +182,7 @@ class MediaMediaItem(MediaManagerItem): def initialise(self): self.listView.clear() self.listView.setIconSize(QtCore.QSize(88, 50)) - self.loadList(SettingsManager.load_list(self.settingsSection, - self.settingsSection)) + self.loadList(SettingsManager.load_list(self.settingsSection, u'media')) def onDeleteClick(self): """ @@ -196,7 +195,7 @@ class MediaMediaItem(MediaManagerItem): for row in row_list: self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, - self.settingsSection, self.getFileList()) + u'media', self.getFileList()) def loadList(self, files): # Sort the themes by its filename considering language specific @@ -217,8 +216,7 @@ class MediaMediaItem(MediaManagerItem): self.mediaObject = Phonon.MediaObject(self) def search(self, string): - files = SettingsManager.load_list(self.settingsSection, - self.settingsSection) + files = SettingsManager.load_list(self.settingsSection, u'media') results = [] string = string.lower() for file in files: diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index dcf7c41f1..f9ccd7337 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -228,7 +228,7 @@ class PresentationMediaItem(MediaManagerItem): for row in row_list: self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, - self.settingsSection, self.getFileList()) + u'presentations', self.getFileList()) def generateSlideData(self, service_item, item=None, xmlVersion=False): """ @@ -313,7 +313,7 @@ class PresentationMediaItem(MediaManagerItem): def search(self, string): files = SettingsManager.load_list( - self.settingsSection, self.settingsSection) + self.settingsSection, u'presentations') results = [] string = string.lower() for file in files: