X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fmedia_types%2Fvideo%2F__init__.py;h=ea7bc0217675d1314a08f5f41d9bbfb41fdfb189;hb=ae7ebecdbba7c7ae66e547920502c77a65c4dc0f;hp=e8a4308bc7386b943f12ff51bc84a2eee4d3d473;hpb=67d303ffa96a80da3a3cf48d2f9231bc1a087a19;p=mediagoblin.git

diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py
index e8a4308b..ea7bc021 100644
--- a/mediagoblin/media_types/video/__init__.py
+++ b/mediagoblin/media_types/video/__init__.py
@@ -14,38 +14,47 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from mediagoblin import mg_globals as mgg
 from mediagoblin.media_types import MediaManagerBase
-from mediagoblin.media_types.video.processing import process_video, \
-    sniff_handler
-from mediagoblin.tools import pluginapi
+from mediagoblin.media_types.video.processing import (VideoProcessingManager,
+        sniff_handler, sniffer)
+
 
 MEDIA_TYPE = 'mediagoblin.media_types.video'
 ACCEPTED_EXTENSIONS = [
         "mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "m4v"]
 
 
-def setup_plugin():
-    config = pluginapi.get_config(MEDIA_TYPE)
-
-
 class VideoMediaManager(MediaManagerBase):
     human_readable = "Video"
-    processor = staticmethod(process_video)
     display_template = "mediagoblin/media_displays/video.html"
     default_thumb = "images/media_thumbs/video.jpg"
+    type_icon = "images/type_icons/video.png"
 
     # Used by the media_entry.get_display_media method
-    media_fetch_order = [u'webm_640', u'original']
     default_webm_type = 'video/webm; codecs="vp8, vorbis"'
 
+    @property
+    def media_fetch_order(self):
+        video_config = mgg.global_config['plugins'][MEDIA_TYPE]
+        video_res = video_config['available_resolutions']
+        video_res.remove(video_config['default_resolution'])
+        video_res.insert(0, video_config['default_resolution'])
+        video_res = map((lambda x: unicode('webm_' + str(x), 'utf-8')), video_res)
+        return ([u'webm_video'] + video_res + [u'original'])
+
 
 def get_media_type_and_manager(ext):
     if ext in ACCEPTED_EXTENSIONS:
         return MEDIA_TYPE, VideoMediaManager
 
+def type_match_handler(ext):
+    if ext in ACCEPTED_EXTENSIONS:
+        return MEDIA_TYPE, VideoMediaManager, sniffer
+
 hooks = {
-    'setup': setup_plugin,
-    'get_media_type_and_manager': get_media_type_and_manager,
+    'type_match_handler': type_match_handler,
     'sniff_handler': sniff_handler,
     ('media_manager', MEDIA_TYPE): lambda: VideoMediaManager,
+    ('reprocess_manager', MEDIA_TYPE): lambda: VideoProcessingManager,
 }