Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Yuchen Wang 2011-10-12 15:18:58 -04:00
parent bae33b3e20 ba6b4ed1f6
commit a317d3904b
9 changed files with 19 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/AddShowRR.php
View File

@ -7,7 +7,7 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm
{
// Add record element
$this->addElement('checkbox', 'add_show_record', array(
'label' => 'Record?',
'label' => 'Record from Line In?',
'required' => false,
));

4
airtime_mvc/application/forms/WatchedDirPreferences.php
View File

@ -11,7 +11,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
$this->addElement('text', 'storageFolder', array(
'class' => 'input_text',
'label' => 'Airtime\'s Storage Folder:',
'label' => 'Import Folder:',
'required' => false,
'filters' => array('StringTrim'),
'value' => '',
@ -22,7 +22,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
$this->addElement('text', 'watchedFolder', array(
'class' => 'input_text',
'label' => 'Choose a Watched Folder:',
'label' => 'Watched Folders:',
'required' => false,
'filters' => array('StringTrim'),
'value' => '',

2
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View File

@ -16,7 +16,7 @@
</ul>
<?php endif; ?>
</dd>
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dd class="block-display selected-item"><strong>Current Import Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>

3
airtime_mvc/application/views/scripts/partialviews/header.phtml
View File

@ -30,6 +30,9 @@
<li class="time-zone"><span id="time-zone"></span></li>
</ul>
</div>
<div class="listen-control-block">
<a class="" href="#"><span>Listen</span></a>
</div>
<?php if($this->is_trial){?>
<div class="trial-info-block">
<ul>

32
airtime_mvc/library/propel/generator/bin/propel-gen.bat
View File

@ -1,32 +0,0 @@
@echo off
rem *********************************************************************
rem ** The Propel generator convenience script for Windows based systems
rem ** $Id$
rem *********************************************************************
rem This script will do the following:
rem - check for PHING_COMMAND env, if found, use it.
rem - if not found detect php, if found use it, otherwise err and terminate
rem - check for PROPEL_GEN_HOME env, if found use it
rem - if not found error and leave
if "%OS%"=="Windows_NT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
set DEFAULT_PROPEL_GEN_HOME=%~dp0..
if "%PROPEL_GEN_HOME%" == "" set PROPEL_GEN_HOME=%DEFAULT_PROPEL_GEN_HOME%
set DEFAULT_PROPEL_GEN_HOME=
if "%PHING_COMMAND%" == "" set PHING_COMMAND=phing.bat
set nbArgs=0
for %%x in (%*) do Set /A nbArgs+=1
if %nbArgs% leq 1 (
%PHING_COMMAND% -f "%PROPEL_GEN_HOME%\build.xml" -Dusing.propel-gen=true -Dproject.dir="%CD%" %*
) else (
%PHING_COMMAND% -f "%PROPEL_GEN_HOME%\build.xml" -Dusing.propel-gen=true -Dproject.dir=%*
)
if "%OS%"=="Windows_NT" @endlocal

2
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -260,7 +260,7 @@ function init() {
setupQtip();
$('#on-air-info').click(function() {
$('.listen-control-block').click(function() {
if (stream_window == null || stream_window.closed)
stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216');
stream_window.focus();

0
Changelog → changelog
View File

25
dev_tools/fabric/fab_setup.py
View File

@ -20,12 +20,9 @@ def test():
print x.succeeded
print x.return_code
def download_if_needed(vdi_dir, vdi_snapshot_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
if not os.path.exists(vdi_dir):
os.makedirs(vdi_dir)
if not os.path.exists(vdi_snapshot_dir):
os.makedirs(vdi_snapshot_dir)
if os.path.exists(os.path.join(vdi_dir, vm_vdi_file)):
print "File %s already exists. No need to re-download" % os.path.join(vdi_dir, vm_vdi_file)
@ -34,14 +31,7 @@ def download_if_needed(vdi_dir, vdi_snapshot_dir, xml_dir, vm_name, vm_vdi_file,
print "File %s not found. Downloading" % vm_vdi_file
local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_vdi_file, os.path.join(vdi_dir, vm_vdi_file)))
downloaded = True
snapshot_file = "{fd4f1d58-2737-49dd-8cd3-aef484d93a9d}.vdi"
if os.path.exists(os.path.join(vdi_snapshot_dir, snapshot_file)):
print "File %s already exists. No need to re-download" % os.path.join(vdi_snapshot_dir, snapshot_file)
else:
print "File %s not found. Downloading" % snapshot_file
local("wget %s/%s/Snapshots/%s -O %s"%(env.vm_download_url, vm_name, snapshot_file, os.path.join(vdi_snapshot_dir, snapshot_file)))
if os.path.exists(os.path.join(xml_dir, vm_xml_file)):
print "File %s already exists. No need to re-download" % os.path.join(xml_dir, vm_xml_file)
else:
@ -59,7 +49,7 @@ def create_fresh_os(os_version, os_arch):
vdi_snapshot_dir = os.path.expanduser('~/tmp/vms/%s/Snapshots'%vm_name)
xml_dir = os.path.expanduser('~/.VirtualBox')
downloaded = download_if_needed(vdi_dir, vdi_snapshot_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file)
downloaded = download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file)
if downloaded:
local("VBoxManage registervm %s"%os.path.join(xml_dir, vm_xml_file), capture=True)
@ -81,9 +71,6 @@ def create_fresh_os(os_version, os_arch):
print "Address found %s"%ip_addr
env.hosts.append(ip_addr)
env.host_string = ip_addr
time.sleep(5)
def ubuntu_lucid_32(fresh_os=True):
if (fresh_os):
@ -153,6 +140,12 @@ def airtime_194_tar():
run('wget http://downloads.sourceforge.net/project/airtime/1.9.4/airtime-1.9.4.tar.gz')
run('tar xfz airtime-1.9.4.tar.gz')
sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
def airtime_devel():
sudo('apt-get update')
sudo('apt-get install -y git-core')
run('git clone https://github.com/sourcefabric/Airtime.git ~/airtime')
sudo('cd ~/airtime && git checkout devel && install_full/ubuntu/airtime-full-install || true')
def airtime_200():

3
install_full/ubuntu/airtime-full-install
View File

@ -27,7 +27,8 @@ apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \
php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \
libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 icecast2 libportaudio2 libsamplerate0 rabbitmq-server patch \
php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data
php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
libvorbis-ocaml
#possibly remove?
#libvorbis-ocaml-dev