From 224ebd7c0481c347367bed14e0e31082d170f71f Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Wed, 12 Dec 2007 14:08:34 +0000
Subject: [PATCH] cleanup ogg support

---
 oxdbarchive/controllers.py | 2 +-
 oxdbarchive/extract.py     | 4 ++--
 oxdbarchive/model.py       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/oxdbarchive/controllers.py b/oxdbarchive/controllers.py
index b8056c7..2a0cd58 100644
--- a/oxdbarchive/controllers.py
+++ b/oxdbarchive/controllers.py
@@ -38,7 +38,7 @@ class Root(controllers.RootController):
       return f.timeline()
     elif position: #clip / frame
       position = position.replace('.png', '').replace('.jpg', '')
-      position = position.replace('.flv', '')
+      position = position.replace('.flv', '').replace('.ogg', '')
       position = position.replace('-', ':').replace('.',':')
       if action == 'clip':
         cherrypy.response.headerMap['Content-Type'] = "video/x-flv"
diff --git a/oxdbarchive/extract.py b/oxdbarchive/extract.py
index 88288f0..23a2a2c 100644
--- a/oxdbarchive/extract.py
+++ b/oxdbarchive/extract.py
@@ -101,9 +101,9 @@ def extract_ogg(movie_file, clip_file, inpoint, outpoint, width=128, height=96,
     
     #create ogg file
     ffmpeg2theora_options = ''
-    ffmpeg2theora_options += " 'tempfile.avi' -H %s -o '%s'" % (audiorate, flash_file)
+    ffmpeg2theora_options += " 'tempfile.avi' -H %s -o '%s'" % (audiorate, clip_file)
     ffmpeg2theora = "ffmpeg2theora %s >/dev/null 2>&1" % ffmpeg2theora_options
-    print ffmpeg2theora.encode('utf-8')
+    #print ffmpeg2theora.encode('utf-8')
     os.system(ffmpeg2theora.encode('utf-8'))
   else:
     print "update the cache %s missing" % movie_file.encode('utf-8')
diff --git a/oxdbarchive/model.py b/oxdbarchive/model.py
index 1de177d..8a72a25 100644
--- a/oxdbarchive/model.py
+++ b/oxdbarchive/model.py
@@ -470,7 +470,7 @@ class ArchiveFile(SQLObject):
     extract_flash(movie_file, flash_movie, inpoint, outpoint, width, height, offset = 0)
     #extract_flash_ng(self.absolutePath, flash_movie, inpoint, outpoint, width, height, offset)
   
-  def extractOggClip(self, inpoint, outpoint=-1, flash_folder=-1):
+  def extractOggClip(self, inpoint, outpoint=-1, clip_folder=-1):
     if clip_folder == -1:
       clip_folder = self.frameFolder
     movie_file = self.mini_movie_file