[pitivi] Refactoring

[Edward Hervey <edwardrv src gnome org>]

commit 7e7721ee66b8a3d63c1c2449e15cd28b75ebb5d0
Author: Thibault Saunier <tsaunier gnome org>
Date:   Tue Jun 29 23:29:42 2010 -0400

    Refactoring

 pitivi/effects.py       |   23 +++++++++++++++++++++++
 pitivi/ui/effectlist.py |   12 ++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index af03aaa..ba0f579 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -25,6 +25,10 @@ Effects global handling
 """
 
 import gst
+import re
+
+from xml.sax.saxutils import escape
+
 from pitivi.factories.operation import EffectFactory
 from pitivi.stream import get_stream_for_pad
 
@@ -98,6 +102,14 @@ def get_categories(effect, effectType):
 
     return categories
 
+#Function  to parse effects human readable properties
+def getNiceEffectName(effect):
+    uselessWords = re.compile('(Video |effect |Audio )')
+    return uselessWords.sub("", (escape(effect.get_longname()))).title()
+
+def getNiceEffectDescription(effect):
+    return (escape(effect.get_description()))
+
 class Magician:
     """
     Handles all the effects
@@ -141,6 +153,17 @@ class Magician:
     def getFactory(self, name):
         return self.effect_factories_dict.get(name)
 
+    def getElementFromFactoryName(self, name, effectType):
+        if effectType == VIDEO_EFFECT:
+            for fact in self.simple_video:
+                if fact.get_name() == name:
+                    return fact
+        elif effectType == AUDIO_EFFECT:
+            for fact in self.simple_audio:
+                if fact.get_name() == name:
+                    return fact
+
+
     def addStreams(self, element, factory):
         pads = element.get_static_pad_templates()
 
diff --git a/pitivi/ui/effectlist.py b/pitivi/ui/effectlist.py
index 8bf5e31..1ac76ea 100644
--- a/pitivi/ui/effectlist.py
+++ b/pitivi/ui/effectlist.py
@@ -25,7 +25,6 @@ import gtk
 import pango
 import os
 import time
-import re
 
 from urllib import unquote
 from gettext import gettext as _
@@ -37,11 +36,10 @@ from pitivi.configure import get_pixmap_dir
 from pitivi.settings import GlobalSettings
 from pitivi.utils import beautify_length
 
-from xml.sax.saxutils import escape
-
 from pitivi.log.loggable import Loggable
 from pitivi.effects import AUDIO_EFFECT, VIDEO_EFFECT,\
-      audio_categories, video_categories, get_categories
+      audio_categories, video_categories, get_categories,\
+      getNiceEffectName, getNiceEffectDescription
 from pitivi.ui.common import SPACING, PADDING
 
 (COL_ICON,
@@ -186,13 +184,11 @@ class EffectList(gtk.VBox, Loggable):
         pixbuf = gtk.gdk.pixbuf_new_from_file(thumbnail_file)
 
         for effect in effects:
-            uselessWords = re.compile('(Video |effect |Audio )')
-            name = uselessWords.sub("", (escape(effect.get_longname()))).title()
-            description = (escape(effect.get_description()))
+            name = getNiceEffectName(effect)
+            description = getNiceEffectDescription(effect)
             categories = get_categories(effect, effectType)
 
             factory = self.app.effects.getFactory(effect.get_name())
-            #visible = self._setRowVisible(self.storemodel, None, None)
             self.storemodel.append ([pixbuf, pixbuf, name, description, effectType, categories,
                                     factory, effect.get_description(),
                                     factory.name])