From 73bb16c31d3b08219509cec7b3e831aa5342d71e Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sun, 12 Aug 2007 10:35:58 +0000 Subject: [PATCH] normalize outpoint too --- oxdbarchive/cache.py | 2 +- oxdbarchive/midentify.py | 2 +- oxdbarchive/model.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/oxdbarchive/cache.py b/oxdbarchive/cache.py index d0c535f..953f5ef 100644 --- a/oxdbarchive/cache.py +++ b/oxdbarchive/cache.py @@ -45,7 +45,7 @@ def loadClip(afile, position): positions = position.split(';') if len(positions) > 1: position = positions[0] - outpoint= positions[1] + outpoint = positions[1] else: outpoint = -1 flash = join(afile.frameFolder, '%s.%s' % (position, 'flv')) diff --git a/oxdbarchive/midentify.py b/oxdbarchive/midentify.py index c73ab01..3460c50 100644 --- a/oxdbarchive/midentify.py +++ b/oxdbarchive/midentify.py @@ -65,7 +65,7 @@ def identify(fname): if fname.endswith('ogg') or fname.endswith('ogv'): return oggzinfo(fname) - cmd = 'midentify "%s"' % fname + cmd = '/usr/local/bin/midentify "%s"' % fname f = os.popen(cmd.encode('utf-8')) data = f.read().strip() f.close() diff --git a/oxdbarchive/model.py b/oxdbarchive/model.py index 0b049db..d6c9536 100644 --- a/oxdbarchive/model.py +++ b/oxdbarchive/model.py @@ -452,6 +452,8 @@ class ArchiveFile(SQLObject): outpoint = s['stop'] else: outpoint = shift_time(5000, inpoint) + else: + outpoint = outpoint.replace('.', ':') extract_flash(movie_file, flash_movie, inpoint, outpoint, width, height, offset = 0) #extract_flash_ng(self.absolutePath, flash_movie, inpoint, outpoint, width, height, offset)