Commit Graph

938 Commits

Author SHA1 Message Date
Martin Konecny d997047f5e CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
-fixed
2012-05-07 14:25:49 -04:00
Martin Konecny 91d1dfbbfa CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
-fixed
2012-05-07 13:54:39 -04:00
Martin Konecny 240756f98b CC-3767: Pypo push crashed 2012-05-04 19:50:16 -04:00
Martin Konecny 0685148c10 CC-3749: Media Monitor should not load files pypo cannot read
-incorrect variable name
2012-05-04 18:05:02 -04:00
Martin Konecny b1611f5b86 CC-3749: Media Monitor should not load files pypo cannot read
-incorrect variable name
2012-05-04 18:01:49 -04:00
Martin Konecny 4d7d17fe55 fix invalid file variable name 2012-05-04 17:25:59 -04:00
Martin Konecny 676205bb00 CC-3750Media Library->Edit Metadata: media-monitor throw exception when trying to edit metadata with non-ascii characters
-Improved save metadata function
2012-05-04 15:49:33 -04:00
Martin Konecny 906b6e8bd0 CC-3749: Media Monitor should not load files pypo cannot read
-logic error
2012-05-04 15:22:54 -04:00
Martin Konecny d98d23d483 CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 15:04:54 -04:00
Martin Konecny 7e9d1a3308 CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:50:38 -04:00
Martin Konecny e13d06df45 CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:45:43 -04:00
Martin Konecny d6a12053eb CC-3752: Media Monitor DB sync
-forgot to exit
2012-05-04 13:39:48 -04:00
Martin Konecny fa373a683e CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:37:43 -04:00
Martin Konecny 08217d59fc CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:23:46 -04:00
Martin Konecny ebc8af0863 CC-3749: Media Monitor should not load files pypo cannot read 2012-05-04 13:03:05 -04:00
Martin Konecny 6f3b1bc7c2 Remove 2 second sleep after pushing to Liquidsoap queue 2012-04-30 21:06:26 -04:00
Martin Konecny 39a3382157 CC-3736: Full Install fail at Ubuntu 12.04: virtualenv problem
-should be fixed
2012-04-30 17:53:28 -04:00
Martin Konecny f59bae4246 CC-3736: Full Install fail at Ubuntu 12.04
-Fix logger format
2012-04-30 17:26:04 -04:00
Martin Konecny 234ee0f696 CC-3736: Full Install fail at Ubuntu 12.04 2012-04-30 17:13:52 -04:00
Martin Konecny c84acdfea6 CC-3736: Full Install fail at Ubuntu 12.04
-Forgot some imports
2012-04-30 17:10:12 -04:00
Martin Konecny 141d27bf27 CC-3736: Full Install fail at Ubuntu 12.04
-various fixes
2012-04-30 17:06:35 -04:00
Martin Konecny db2ccb1859 CC-3736: Full Install fail at Ubuntu 12.04: virtualenv problem
-pip no longer supports and we don't need the -E (environment) option
2012-04-30 15:48:36 -04:00
Martin Konecny cf1e9e7615 configure locale for pypo 2012-04-27 17:25:12 -04:00
Martin Konecny 47051c460e -syntax error in api_client 2012-04-27 16:20:40 -04:00
Martin Konecny 763d1918d9 fix pypo refusing to start 2012-04-27 16:18:23 -04:00
Martin Konecny d7b6146ef9 locales for media-monitor 2012-04-27 16:08:51 -04:00
Martin Konecny 41aeec8a21 replace deprecated urllib with urllib2, and automatic reconnection attempts 2012-04-27 16:05:26 -04:00
Martin Konecny 0e32b5586f make sure we create tmp directory for media-monitor if it doesn't exist. 2012-04-27 16:04:19 -04:00
Martin Konecny da7b87866c -check whether getdefaultlocale actually returns a value before attempting to use it. 2012-04-26 17:59:25 -04:00
Martin Konecny 773206ab22 http://www.python.org/dev/peps/pep-0008/#package-and-module-names 2012-04-26 17:50:35 -04:00
Martin Konecny b3816061b9 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
-fixed
2012-04-26 14:46:29 -04:00
James 83a8c301d7 CC-3708: Recorded file has no creator in metadata, not being associated with
a rebroadcast show.

- the propel db integration was changing str value to int for int columns in DB
2012-04-25 12:14:13 -04:00
Martin Konecny ec8115828a CC-3673: media monitor encoding problem
-made media-monitor not start if non UTF-8 encoding detected.
2012-04-24 16:24:54 -04:00
Martin Konecny 7c49fc77d5 CC-3700: media-monitor- Surround all accesses to external resources with try/except
-fixed
2012-04-22 13:42:45 -04:00
Martin Konecny 86282a8d8a CC-3699: Calls to system() function from our Liquidsoap script are blocking
-fixed
2012-04-22 12:01:40 -04:00
Martin Konecny dae8682e51 CC-3691: Pypo needs to write stderr + stdout to the log file
-fixed
2012-04-20 19:12:36 -04:00
James c1a6202da8 CC-3630: Deleting files from organize folder if they don't have
correct Meta data

- done
2012-04-20 10:56:51 -04:00
paul.baranowski 96b010e7f0 CC-1927 Remove PEAR DB
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
  even when it cant connect to the database.  Also fixed return value to
  be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
Martin Konecny 9c9838b35c CC-3664: setting of pypo.cfg -> cache_for does not take effect
-these options are deprecated. Have been removed.
2012-04-17 10:23:15 -04:00
Martin Konecny 5bc720fd4c CC-3657: Watch Folders -> mp3 files could not be loaded
-fixed
2012-04-16 15:11:05 -04:00
Martin Konecny 31303d26e4 CC-3651: tmp file does not copy to Pypo cache
-fixed
2012-04-16 11:45:48 -04:00
Martin Konecny 26be52c459 CC-3462: If destination file already exists in pypo cache, double check if it's the correct file size
-had two copy functions :S
2012-04-13 15:23:01 -04:00
James 7a983b52ed CC-3641: Stream Transition: When a song is added to the for the first time
, the transition fade effects fade in

- fixed
2012-04-13 13:25:40 -04:00
Martin Konecny 169a4827e4 -cleanup unused variables.
-use lambda functions instead of littering class with small functions
2012-04-12 23:14:02 -04:00
Martin Konecny f96b990275 Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
2012-04-12 19:10:17 -04:00
Martin Konecny 6c17cf6e24 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:23:03 -04:00
Martin Konecny fe3dfb6b0c CC-3635: Pypo needs subsecond accuracy for start time
-Done
2012-04-12 17:21:42 -04:00
James 86718cc58e CC-3628: Media Monitor not sending a delete message to Airtime
- fixed
2012-04-12 17:20:31 -04:00
Martin Konecny a594569ddc CC-3625: "Now Playing->delete the current playing items" will stop output of pypo-liquidsoap
-fixed
2012-04-12 17:09:54 -04:00
Naomi Aro e2adaff5cf CC-3630 : Deleting files from organize folder if they don't have correct Meta data 2012-04-12 18:07:16 +02:00
denise d06b3573e9 CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
-fixed
2012-04-11 19:22:47 -04:00
James 0ec58f0bc3 CC-3250: UI design for mount monitor for media monitor
( Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -04:00
James 1f5f5057bf CC-3430: Live Stream: Admin should be able to kick out the source connection
- fixed
2012-04-11 16:20:27 -04:00
James 92f0f11047 CC-3475: Pypo does not handles the case of RabbitMQ being restarted
- added the other exception as well
2012-04-11 16:12:06 -04:00
James 268ba66194 CC-3566: Preferences->"Fade In" is not respected when Show starts
- adding some comments
2012-04-11 13:44:24 -04:00
James 13502b4c08 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 12:27:54 -04:00
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
Martin Konecny 92f057593e CC-3428: liquidsoap seems to have troubles with this file
-need to escape double quotes not single :P
2012-04-11 11:21:51 -04:00
Martin Konecny a09a31bc88 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
-pypo side fixed
2012-04-10 23:13:52 -04:00
Martin Konecny bc6e911673 CC-3615: AddMedia,Add Watched Folders-> Uploading of certain playable media fails
-fixed
2012-04-10 21:52:54 -04:00
Martin Konecny 1344c27d30 CC-3615: AddMedia,Add Watched Folders-> Uploading of certain playable media fails
-fixed
2012-04-10 19:55:53 -04:00
James 21f8ed2578 CC-3475: Pypo does not handles the case of RabbitMQ being restarted
- pypomsghandler catches such execption and handles the case by calling
init_rabbit_mq()
2012-04-10 17:36:59 -04:00
Martin Konecny c71fb37c74 CC-3428: liquidsoap seems to have troubles with this file
-update path so that media-monitor finds our liquidsoap first instead
 of system's
2012-04-09 11:52:37 -04:00
Martin Konecny 6e471c0060 CC-3428liquidsoap seems to have troubles with this file
-check file integrity before adding to library.
2012-04-08 20:16:53 -04:00
Martin Konecny b9e840552b -cleaned up some WTF!?!??! code 2012-04-08 19:29:55 -04:00
Martin Konecny e549e997ae CC-3525: Pypo needs to look at end time of each track when receiving a new schedule 2012-04-07 22:33:32 -04:00
Martin Konecny 60d521a88a CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly
-done
2012-04-05 20:42:15 -04:00
Martin Konecny 788aef2f03 CC-3604: Clear Pypo cache dir on upgrade/reinstall
-done
2012-04-05 15:31:20 -04:00
Martin Konecny 3611f1071d CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly
-fixed
2012-04-05 15:09:20 -04:00
Martin Konecny b00e74e831 -remove "disable_auto_start_services" install option 2012-04-05 14:56:11 -04:00
Martin Konecny d9d8211a3b CC-3601: Pypo schedule needs to be sorted before pushing
-fixed
2012-04-04 15:25:57 -04:00
Martin Konecny 162c35419d CC-3572: pypo user should have shell set to /bin/false
-done
2012-04-02 19:04:16 -04:00
Martin Konecny 57f782d3c2 CC-3520: Change default password of monit
-fixed
2012-04-01 00:20:47 -04:00
Martin Konecny e1fd58198c CC-3572: pypo user should have shell set to /bin/false
-fixed
2012-03-31 22:11:12 -04:00
James 4d9abb5f7c CC-3533: "On the fly" Stream Rebroadcasting-> interruption problem
while pause in-between DJ stream tracks

- fixed by wrapping all the input.harbor source with mksafe()
2012-03-30 16:30:17 -04:00
Martin Konecny 7045a4bd95 CC-3564: Sometimes Airtime output stream goes silent when it is playing and we are shuffling tracks around.
-fixed
2012-03-30 15:15:34 -04:00
James 7325d51ada CC-3449: Live Stream: Kick out live dj at the end of the show
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
Martin Konecny 9a4efd3faf CC-3493: Create submodule git repository for Liquidsoap binaries
-done
2012-03-29 11:31:50 -04:00
Martin Konecny 41b9ea1c14 -more detailed message if pypo-install can't find liquidsoap file 2012-03-28 23:50:49 -04:00
Martin Konecny 29afb6e191 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/pypo/pypopush.py
2012-03-28 22:49:57 -04:00
Martin Konecny fe0f72c8f4 -remove liquidsoap binaries 2012-03-28 22:47:45 -04:00
Martin Konecny ffdc009290 CC-3485: Liquidsoap annotation is missing liq_fade_in and liq_fade_out
-fixed
2012-03-28 17:08:11 -04:00
James 4f5d7efaa1 CC-3449: Live Stream: Kick out live dj at the end of the show
- done
2012-03-28 15:12:01 -04:00
james f4b9774b08 CC-3535: PypoFetch: make disconnect_source() and switch_source() static method
- done
2012-03-28 09:39:46 -04:00
Martin Konecny f8a71a3923 CC-3531: When importing watched directory, correcting a file's permissions does not work correctly.
-fixed
2012-03-27 16:59:26 -04:00
Martin Konecny 24262d5ed5 cc-3521: remove 2 second delay 2012-03-27 15:34:56 -04:00
Martin Konecny 654ff76ea4 CC-3399: Use VBR instead of CBR for Vorbis (OGG) audio streams
-Done
2012-03-27 15:33:44 -04:00
Martin Konecny d83267e6dc -remove crossfade function from ls scripts since it wasn't doing anything. 2012-03-27 15:16:58 -04:00
James f41ebbe7a7 CC-3521: Live Stream: Remove 2 second scilence when transition happens
- reduced the blank duration to 0.1 sec
2012-03-26 18:56:28 -04:00
James 0bdfa74566 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 18:39:24 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit
-done
2012-03-26 17:59:44 -04:00
James ef801c7a10 CC-3484: Pypo: On bootup, it should grab station name and stream label
for liquidsoap

- fixed
2012-03-26 17:44:07 -04:00
James aba89824f0 CC-3490: liquidsoap_prepare_terminate.py is not using python virtual env
- fixed
2012-03-26 15:42:00 -04:00
Martin Konecny 269096b9e8 cc-3476: detect if Liquidsoap is not playing something when it should and fix it 2012-03-26 14:33:33 -04:00
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny 2070de03ce cc-3476-dynamic-timeout
-finally found a way to make this simple
2012-03-26 14:33:33 -04:00
Martin Konecny a013e3b4d0 cc-3476: use dynamic timeouts in pypo 2012-03-26 14:33:33 -04:00
Martin Konecny 4f5b9a0c91 -decoding exec_command from UTF-8 multiple times (bad) 2012-03-26 10:57:56 -04:00
James b4e9f9699c CC-3483: Live Stream: default fade in/out for live stream transition
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
James d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
Martin Konecny 6166d1d590 -updated comment in pypofetch 2012-03-18 00:38:39 -04:00
Martin Konecny d35332e0ba CC-3371: Don't pause 2 seconds between checking queue in pypo-push
-Done
2012-03-18 00:33:22 -04:00
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
-done
2012-03-17 23:51:58 -04:00
Martin Konecny 73eb691be2 -some cases where pypo-notify is still writing to pypo.log instead of notify.log 2012-03-17 14:16:54 -04:00
Martin Konecny 7a7eb02de5 -fix errors pointed out by pydev code completion 2012-03-17 14:16:11 -04:00
Martin Konecny db4c916d9a -add support for PyDev code analysis (need to make pypo directory a package) 2012-03-17 13:56:41 -04:00
Martin Konecny 903698efc5 CC-3470: Smarter way for pypo to recover when it should be playing something.
-fixed
2012-03-17 13:55:56 -04:00
Martin Konecny 6634e9f663 cc-3447: synchronize access to liquidsoap via telnet
-add another critical section
2012-03-16 20:47:46 -04:00
Martin Konecny c8c9e46228 cc-3447: pypo telnet class 2012-03-16 20:41:50 -04:00
Martin Konecny 4d96a16cbe -comment out unused function in pypo-fetch 2012-03-16 20:39:49 -04:00
Martin Konecny 067cd1280a -remove some annoying logging info from pypopush 2012-03-16 00:49:08 -04:00
Martin Konecny 79964186ed CC-3462: If destination file already exists in pypo cache, double...
-done
2012-03-16 00:48:39 -04:00
Martin Konecny 0716e0425c -Media monitor not handling unicode incorrectly or comparing UTF-8 with unicode 2012-03-15 23:28:47 -04:00
Martin Konecny cca3995dba cc-2675: edit ongoing show
-almost there?
2012-03-14 15:37:04 -04:00
Martin Konecny 217be89766 cc-2675: Edit ongoing show
-progress being made
2012-03-14 15:37:04 -04:00
Martin Konecny 1d1405f7fd CC-2675: Edit ongoing show
-initial commit
2012-03-14 15:37:04 -04:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and
able to see kick out button

- done
2012-03-14 14:43:11 -04:00
James 3c6aff093e CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch status
when it restarts.

- Pypo contacts airtime on bootup and ask what the last switch status was
2012-03-14 14:43:10 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play
- done
2012-03-14 14:43:10 -04:00
James 68fa46f017 CC-3415: Live Stream: Disconnect all input.harbor connections before
terminating the process

- call prepare termiate on monit-restart()
2012-03-14 14:43:10 -04:00
James cde6db812f CC-3415: Live Stream: Disconnect all input.harbor connections before
terminating the process

- Modified init.d script. init.d script calls liquidsoap_prepare_terminate.py
2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting
- testing lisquidsoap
2012-03-14 14:41:00 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James 96c4462adc - delete unnecessary part from config files 2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
James ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting
- Form in preference section
2012-03-14 14:41:00 -04:00
Martin Konecny 1dc9f51c47 CC-3411: pypo-notify should write to its own log
-done
2012-03-13 16:53:10 -04:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Naomi Aro b58e948825 CC-733 : adding extra error messages 2012-03-09 11:28:43 +01:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete
-Done
2012-03-05 19:02:46 -05:00
Martin Konecny 249b743dd1 CC-3384: Pypo On-Air is off and streaming is not playing on every other songs in a show.
-temporary solution to make sure we don't push same song multiple times.
2012-03-05 16:09:17 -05:00
Martin Konecny a4f528021f CC-3384: Pypo On-Air is off and streaming is not playing on every other songs in a show.
-fixed, but there is another small problem
2012-03-05 16:01:58 -05:00
Martin Konecny c353009d39 CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10
-user binary_path var
2012-03-02 18:41:03 -05:00
Martin Konecny 82812e15a5 CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10
-should be fixed
2012-03-02 11:45:27 -05:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them
-done
2012-03-01 18:00:46 -05:00
Martin Konecny 92f19139b9 CC-3336: Refactor schedule API used by pypo
-done
2012-02-29 21:27:42 -05:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Martin Konecny b572b26b68 CC-3336: Refactor schedule API used by pypo
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny 1d02c56874 CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 15:04:24 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
James d8f7cce56e CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 14:45:33 -05:00
James d4cdac505a CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-28 14:45:18 -05:00
James 5aabe89069 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py

Conflicts:

	python_apps/pypo/pypofetch.py
2012-02-28 14:44:39 -05:00
james 91ef7f7669 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-28 14:42:43 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Martin Konecny 39fac2f88a CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 11:06:31 -05:00
James ba828a28bc CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 10:00:43 -05:00
James 33b6c2a390 CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-27 18:09:07 -05:00
James f030cf4f67 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
2012-02-27 16:18:10 -05:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
james 38c16df138 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-25 09:44:33 -05:00
James 4e72c1150d CC-3346: Recorder: Merge recorder with pypo
- Upgrade for 2.0.2
2012-02-24 16:24:12 -05:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James f92c425890 CC-3345: Enter unusable state when liquidsoap value has an '='
character in it.

- fixed
2012-02-24 14:14:42 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
James 06c825479b CC-3345: Enter unusable state when liquidsoap value has an '='
character in it.

- fixed
2012-02-24 14:10:27 -05:00
James 695535ae64 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 13:12:50 -05:00
Paul Baranowski ca535ea763 Removed OBP refs and code. 2012-02-23 16:08:16 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
Martin Konecny 54f81ca5de CC-3342: Pypo: if a user doesn't update anything on calendar for 24 hrs, it could cause a problem.
-make it so that we cannot use all CPU if spinning in while loop
-remove Message Acknowledge exception
2012-02-22 19:23:48 -05:00
Martin Konecny d5a8f63d36 CC-3342: Pypo: if a user doesn't update anything on calendar for 24 hrs, it could cause a problem.
-fixed
2012-02-22 17:56:17 -05:00
Martin Konecny 443b55302c -update version strings from 2.0.1 -> 2.1.0 2012-02-14 15:52:52 -05:00
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Martin Konecny 5862324da9 CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading!
-fixed
2012-02-14 09:37:20 -05:00
Martin Konecny 0424a7f1d1 -We don't want any of our python services running at install time. Disable them early on. 2012-02-12 11:44:23 -05:00
Martin Konecny 885572b36d CC-3321: Multiple messages are sent to Pypo via RabbitMq at one time, causing multiple telnet connections to Liquidsoap.
-Fixed
2012-02-11 23:53:43 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-fixed
2012-02-10 18:43:40 -05:00
Martin Konecny 33b594c39a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-syntax error
2012-02-10 14:58:48 -05:00
Martin Konecny ccb942838a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-initial commit
2012-02-10 14:53:22 -05:00
James 9ae0bed01a CC-3299: Media monitor should not change the owner of watched files
- Media Monitor will try to set files to world readable upon adding
2012-02-08 17:43:32 -05:00
James 86150a5fba CC-3299: Media monitor should not change the owner of watched files
- Media Monitor will try to set files to world readable upon adding
2012-02-08 17:42:42 -05:00
James 860a5e4f7e - version string change for 2.0.1 2012-02-08 16:23:01 -05:00
James af305fce47 CC-3299: Media monitor should not change the owner of watched files
- it sets dir permission 02777 and file permission to 0666 if the path
is under "stor" dir, else it tries add world readable bit.
2012-02-08 15:16:11 -05:00
James 5b47402ed0 CC-3299: Media monitor should not change the owner of watched files
- it sets dir permission 02777 and file permission to 0666 if the path
is under "stor" dir, else it tries add world readable bit.
2012-02-08 15:14:58 -05:00
james b08e7787d3 CC-3299: Media monitor should not change the owner of watched files
- bug fix
- better logging
2012-02-07 13:37:42 -05:00
james 22a53dd250 CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues

Conflicts:

	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-02-07 13:37:27 -05:00
james 951f90adc0 CC-3299: Media monitor should not change the owner of watched files
- bug fix
- better logging
2012-02-07 13:35:55 -05:00
james e5a8d65576 CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues
2012-02-07 13:35:46 -05:00
Martin Konecny da2ab1caa9 Merge branch 'cc-3297-php-db-and-zendframework-external' into 2.0.x 2012-02-06 20:29:12 -05:00
Martin Konecny 58b4576ae1 CC-3297: Depend on zendframework and php-pear as external packages
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
James 94aaf5b70e CC-3299: Media monitor changes the owner of watched files?
- bug fixed
2012-02-06 12:33:24 -05:00
James 3689d229d1 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-06 12:32:40 -05:00
James 4b7272a173 CC-3299: Media monitor changes the owner of watched files?
- bug fixed
2012-02-06 12:32:21 -05:00
Martin Konecny 62d1d56fd2 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-06 12:28:49 -05:00
Martin Konecny e8afd086bd -fix annoying issue where media-monitor refuses to start if tmp directory
/var/tmp/airtime does not exist. Just create it.
2012-02-06 12:28:39 -05:00
James 4043f011b5 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-06 12:28:31 -05:00
James 084214b6c8 CC-3299: Media monitor changes the owner of watched files?
- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
2012-02-06 12:28:16 -05:00
James a79dd4fe04 CC-3299: Media monitor changes the owner of watched files?
- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
2012-02-06 12:26:20 -05:00
Martin Konecny 214c6e85cc -remove unneeded check of "if file_info is not None:"
-remove undefined variable fomr phone_home_stat.php
2012-02-02 16:14:13 -05:00
James 6812f69962 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:59:03 -05:00
James 1df1388602 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- bug fix
2012-02-01 10:59:03 -05:00
James 25ab4d39b2 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:59:03 -05:00
James 47eacd1165 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:33:03 -05:00
James da89b9fa74 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- bug fix
2012-02-01 10:33:03 -05:00
James 47acb16e20 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:33:03 -05:00
James 3b64da7f4e CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-01-31 15:28:57 -05:00
James 4874eb4f34 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- bug fix
2012-01-31 11:37:12 -05:00
James 733b23e7fc CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-01-31 11:22:30 -05:00
Martin Konecny 6215eb0dba -fix upgrade for large result sets. 2012-01-25 05:01:56 -05:00
James 438340ff9a CC-3266: Pypo: pypopush will perfom better if it only process the
lastest msg from the rabbitMQ queue

- done
2012-01-18 17:52:09 -05:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
James ecdd957525 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
2012-01-13 16:25:56 -05:00
James a24310e690 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
2012-01-13 16:24:16 -05:00
James 08a09e4096 CC-2977: Never delete files from the database
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
James 09d50e7e25 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 16:38:21 -05:00
James 04b592b831 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- fixed
2012-01-12 16:36:14 -05:00
James 04b48d47cc CC-2977: Never delete files from the database
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
Martin Konecny b2a9abe3ef CC-3231: Tracks are still playing after a show ends
-fixed
2012-01-09 17:46:42 -05:00
james 9216da7f03 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-24 11:03:02 -05:00
james c9c6a08a1c CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
changed and click save

- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
Martin Konecny 00a05e146b CC-3222: Add option to disable auto starting Airtime services (after install and after system restart)
-Done
2011-12-23 15:53:30 -05:00
James 579484a91c Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-15 16:10:42 -05:00
James 22b2b466e5 CC-3207: Exception 'latin-1' codec can't encode character u'\u2013' in
position 32: ordinal not in range(256)

- fixed
2011-12-15 16:09:58 -05:00
Martin Konecny 7d60530312 CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap
-done
2011-12-15 11:22:22 -05:00
Martin Konecny e7ad7f4b79 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-15 11:16:35 -05:00
Martin Konecny 76fac6fbef CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap
-done
2011-12-15 11:16:14 -05:00
Naomi Aro 6d9e9f3459 CC-2268 : Make MP3 optional for show recorder to remove dependency on lame 2011-12-14 18:07:06 +01:00
Naomi Aro 7a607ba98f CC-2268 : Make MP3 optional for show recorder to remove dependency on lame
have changed to default ogg option/choice between mp3|ogg recording in config.
haven't removed any packages from install just incase they affect liquidsoap.
2011-12-14 17:59:40 +01:00
Martin Konecny 695073c116 -SAAS release 2011-12-07 12:06:31 -05:00
Martin Konecny 60299ff789 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-07 11:51:41 -05:00
Martin Konecny 257824c411 -preparation for beta2 release 2011-12-07 11:51:28 -05:00
James 8463262190 CC-3169: Default liquidsoap.cfg file is missing sX_user
- fixed
2011-12-07 11:31:21 -05:00
Martin Konecny 21643a3734 SAAS-56: RabbitMQ virtual host support
-Add support for specifying vhost in config files
2011-12-05 21:05:28 -05:00
Martin Konecny b8e1884583 CC-3155: Show doesn't resume playback on system crash / restarting pypo
-fixed
2011-12-02 17:28:57 -05:00
Martin Konecny f0342e9329 -remove some commented out code 2011-12-02 16:57:18 -05:00
Martin Konecny cbc2ba660f CC-3074: Give users the choice of which hardware sound API they wish to use (instead of hardcoded to ALSA)
-done
2011-12-02 13:39:16 -05:00
Martin Konecny 6bcd96db88 CC-3133: Enabling hardware audio output causes all playout to fail with Portaudio error in write_stream: Output underflowed
-should be fixed
2011-12-02 13:39:16 -05:00
James 043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
Martin Konecny c48154ef2f SAAS-83: Add ability to install Airtime components separately
-fixed
2011-11-30 17:59:00 -05:00
James 48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05:00
James 9c65bfeba7 CC-3131: Latency of stream authentication warning in Stream Settings page
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
Yuchen Wang 53aecd1c00 CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.

Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
Martin Konecny 757b2cac4f CC-3041: Module virtualenv was already imported
-hid the error message.
2011-11-25 18:02:56 -05:00
Martin Konecny 15a27526f9 SAAS-83: Add ability to install Airtime components separately
-fixed
2011-11-24 18:10:06 -05:00
Martin Konecny 07b2ed2caf CC-3107: Recorded show file doesn't appear in the playlist builder
-fixed
2011-11-24 16:03:12 -05:00
martin 4c388f0a1a CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-compiled all liquidsoap binaries
2011-11-18 18:45:37 -05:00
Martin Konecny 34252d680a CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-use absolute paths since the testing scripts need this.
2011-11-18 15:50:21 -05:00
Martin Konecny 7b872fa89b CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-better messages at install time
2011-11-18 15:17:30 -05:00
James 6b7d7646c9 CC-3062: Stream Setting: Status box is not working for shoutcast
- fixed. added on_error and on_connect callback to shoutcast()
2011-11-18 11:18:35 -05:00
Martin Konecny 84e2fff36e CC-3058: Extranenous string during install process
-fixed
2011-11-17 18:15:27 -05:00