From 39f04ef50cda3643e8a2711274fe4678a9a139db Mon Sep 17 00:00:00 2001 From: yomguy Date: Sat, 28 May 2011 17:26:34 +0200 Subject: [PATCH] go to django ! --- models.py | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++- station.py | 8 ++-- 2 files changed, 107 insertions(+), 6 deletions(-) diff --git a/models.py b/models.py index 71a8362..a77edc6 100644 --- a/models.py +++ b/models.py @@ -1,3 +1,104 @@ -from django.db import models +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" + telecaster -# Create your models here. + Copyright (c) 2006-2011 Guillaume Pellerin + +# This software is governed by the CeCILL license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL +# license as circulated by CEA, CNRS and INRIA at the following URL +# "http://www.cecill.info". + +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. + +# In this respect, the user's attention is drawn to the risks associated +# with loading, using, modifying and/or developing or reproducing the +# software by the user in light of its specific status of free software, +# that may mean that it is complicated to manipulate, and that also +# therefore means that it is reserved for developers and experienced +# professionals having in-depth computer knowledge. Users are therefore +# encouraged to load and test the software's suitability as regards their +# requirements in conditions enabling the security of their systems and/or +# data to be ensured and, more generally, to use and operate it in the +# same conditions as regards security. + +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL license and that you accept its terms. + +# Author: Guillaume Pellerin +""" + +from django.db.models import * + +app_label = 'telecaster' + +class Organization(Model): + + name = CharField(_('name')) + description = CharField(_('description')) + + class Meta: + db_table = app_label + '_' + 'organization' + +class Department(Model): + + name = CharField(_('name')) + description = CharField(_('description')) + + class Meta: + db_table = app_label + '_' + 'department' + + +class Conference(Model): + + title = CharField(_('title')) + description = CharField(_('description')) + department = Foreignkey('Department', related_name='conferences', verbose_name='department') + + class Meta: + db_table = app_label + '_' + 'conference' + + +class Session(Model): + + name = CharField(_('name')) + description = CharField(_('description')) + number = IntegerField(_('number')) + + class Meta: + db_table = app_label + '_' + 'session' + + +class Professor(Model): + + name = CharField(_('name')) + institution = CharField(_('institution')) + address = CharField(_('address')) + telephone = CharField(_('telephone')) + email = CharField(_('email')) + + class Meta: + db_table = app_label + '_' + 'professor' + + +class Station(Model): + + organization = Foreignkey('Organization', related_name='stations', verbose_name='organization') + conference = Foreignkey('Conference', related_name='stations', verbose_name='conference') + session = Foreignkey('Session', related_name='stations', verbose_name='session') + professor = Foreignkey('Professor', related_name='stations', verbose_name='professor') + comment = TextField(_('comment')) + started = BooleanField(_('started')) + datetime_start = DateTimeField(_('datetime_start'), auto_now_add=True) + datetime_stop = DateTimeField(_('datetime_stop')) + + class Meta: + db_table = app_label + '_' + 'station' + + diff --git a/station.py b/station.py index 0d8155e..b05e628 100644 --- a/station.py +++ b/station.py @@ -168,13 +168,13 @@ class Station(Conference): os.remove(self.lock_file) def deefuzzer_stop(self): - if len(self.deefuzzer_pid) != 0: - os.system('kill -9 '+self.deefuzzer_pid[0]) + if len(self.deefuzzer_pid) != 0: + os.system('kill -9 '+self.deefuzzer_pid[0]) def rec_stop(self): if len(self.deefuzzer_pid) != 0: - for port in self.deefuzzer_osc_ports: - target = liblo.Address(int(port)) + for port in self.deefuzzer_osc_ports: + target = liblo.Address(int(port)) liblo.send(target, '/record', 0) def mp3_convert(self): -- 2.39.5