Audio: Add models and disable media_data.

1. Add a super-minimal media_data table for audio.
   It currently contains nothing.
   Like the ascii one.

2. To avoid media_data trouble -- for now -- disable the
   creation of media_data completrly.
This commit is contained in:
Elrond 2012-03-29 21:45:05 +02:00
parent 90b25eb2d1
commit c7cf6235fe
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,36 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# 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.db.sql.base import Base
from sqlalchemy import (
Column, Integer, ForeignKey)
from sqlalchemy.orm import relationship, backref
class AudioData(Base):
__tablename__ = "audio__mediadata"
# The primary key *and* reference to the main media_entry
media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
primary_key=True)
get_media_entry = relationship("MediaEntry",
backref=backref("audio__media_data", cascade="all, delete-orphan"))
DATA_MODEL = AudioData
MODELS = [AudioData]

View File

@ -72,8 +72,7 @@ def process_audio(entry):
entry.media_files['ogg'] = ogg_filepath
entry.media_data['audio'] = {
u'length': int(data.audiolength)}
# entry.media_data_init(length=int(data.audiolength))
if audio_config['create_spectrogram']:
spectrogram_filepath = create_pub_filepath(