From 31247240d022933990f43b738477b23481a6d292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Sun, 20 Feb 2011 20:12:55 +0200
Subject: [PATCH 1/2] fix possible leaving out of extensions, hopefully neater
 approach

---
 openlp/plugins/media/lib/mediaitem.py |  5 ++--
 openlp/plugins/media/mediaplugin.py   | 43 ++++++++++-----------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index fd98cdefa..9f3f98636 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -60,8 +60,9 @@ class MediaMediaItem(MediaManagerItem):
     def retranslateUi(self):
         self.onNewPrompt = translate('MediaPlugin.MediaItem', 'Select Media')
         self.onNewFileMasks = unicode(translate('MediaPlugin.MediaItem',
-            'Videos (%s);;Audio (%s);;%s (*)')) % (self.parent.video_list,
-            self.parent.audio_list, UiStrings.AllFiles)
+            'Videos (%s);;Audio (%s);;%s (*)')) % (
+            u' '.join(self.parent.video_list), 
+            u' '.join(self.parent.audio_list), UiStrings.AllFiles)
         self.replaceAction.setText(UiStrings.ReplaceBG)
         self.replaceAction.setToolTip(UiStrings.ReplaceLiveBG)
         self.resetAction.setText(UiStrings.ResetBG)
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 274bce2b4..1f6284d61 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -45,38 +45,27 @@ class MediaPlugin(Plugin):
         self.icon = build_icon(self.icon_path)
         # passed with drag and drop messages
         self.dnd_id = u'Media'
-        self.audio_list = u''
-        self.video_list = u''
+        self.audio_list = []
+        self.video_list = []
         mimetypes.init()
         for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
             mimetype = unicode(mimetype)
-            type = mimetype.split(u'audio/x-')
-            self.audio_list, mimetype = self._addToList(self.audio_list,
-                type, mimetype)
-            type = mimetype.split(u'audio/')
-            self.audio_list, mimetype = self._addToList(self.audio_list,
-                type, mimetype)
-            type = mimetype.split(u'video/x-')
-            self.video_list, mimetype = self._addToList(self.video_list,
-                type, mimetype)
-            type = mimetype.split(u'video/')
-            self.video_list, mimetype = self._addToList(self.video_list,
-                type, mimetype)
-        log.info(u'MediaPlugin handles audio extensions: %s', self.audio_list)
-        log.info(u'MediaPlugin handles video extensions: %s', self.video_list)
+            if mimetype.startswith(u'audio/'):
+                self._addToList(self.audio_list, mimetype)
+            elif mimetype.startswith(u'video/'):
+                self._addToList(self.video_list, mimetype)
+        log.info(u'MediaPlugin handles audio extensions: %s',
+            u' '.join(self.audio_list))
+        log.info(u'MediaPlugin handles video extensions: %s',
+            u' '.join(self.video_list))
 
-    def _addToList(self, list, value, mimetype):
+    def _addToList(self, list, mimetype):
         # Is it a media type
-        if len(value) == 2:
-            extensions = mimetypes.guess_all_extensions(unicode(mimetype))
-            # we have an extension
-            if extensions:
-                for extension in extensions:
-                    if list.find(extension) == -1:
-                        list += u'*%s ' % extension
-                        self.serviceManager.supportedSuffixes(extension[1:])
-                mimetype = u''
-        return list, mimetype
+        extensions = mimetypes.guess_all_extensions(unicode(mimetype))
+        for extension in extensions:
+            if extension not in list:
+                list.append(u'*%s' % extension)
+                self.serviceManager.supportedSuffixes(extension[1:])
 
     def about(self):
         about_text = translate('MediaPlugin', '<strong>Media Plugin</strong>'

From 09b515350ba641b51189c527b9fe48f983ed60f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Sun, 20 Feb 2011 20:49:59 +0200
Subject: [PATCH 2/2] oops

---
 openlp/plugins/media/mediaplugin.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 1f6284d61..12887a76c 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -63,8 +63,9 @@ class MediaPlugin(Plugin):
         # Is it a media type
         extensions = mimetypes.guess_all_extensions(unicode(mimetype))
         for extension in extensions:
-            if extension not in list:
-                list.append(u'*%s' % extension)
+            ext = u'*%s' % extension
+            if ext not in list:
+                list.append(ext)
                 self.serviceManager.supportedSuffixes(extension[1:])
 
     def about(self):