Minor fixes

- Added error handling for PyGTK import
- Added 'mkv' to the video media manager

diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py
index 2a36623ef0bf9b94583fe31ac576a5416eae8d08..c1910ee29fa1506e61acdefc95cfbb1ee59dc398 100644 (file)
--- a/mediagoblin/media_types/video/__init__.py
+++ b/mediagoblin/media_types/video/__init__.py
@@ -23,4 +23,4 @@ MEDIA_MANAGER = {
                                 # 'mediagoblin.media_types.image.processing'?
     "display_template": "mediagoblin/media_displays/video.html",
     "default_thumb": "images/media_thumbs/video.jpg",
-    "accepted_extensions": ["mp4", "mov", "webm", "avi", "3gp", "3gpp"]}
+    "accepted_extensions": ["mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "ogg"]}

diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py
index dfb0899efa70d20de062ceb6c139fd3326ec0a30..512c7cb620cc4fb5d5db6ed92839bc4659314271 100644 (file)
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@ -29,7 +29,10 @@ _log = logging.getLogger(__name__)
 logging.basicConfig()
 _log.setLevel(logging.DEBUG)
 
-import gtk
+try:
+    import gtk
+except:
+    raise Exception('Could not find pygtk')
 
 try:
     import gobject