Commit Graph

470 Commits

Author SHA1 Message Date
Martin Konecny 63aae4d9b5 pypocli.py cleanup 2012-06-27 14:37:40 -04:00
Martin Konecny a0723b7007 CC-4030: POLL interval should be 1/2 of the schedule being sent
-fixed
2012-06-27 14:37:16 -04:00
Martin Konecny d6a5200d58 CC-4029: Pypo Notify script incorrectly attempts to use pypo.log log file (should use notify log file)
-fixed
2012-06-27 12:42:38 -04:00
Martin Konecny 0a3c9c7351 clean up indentation + imports for python apps 2012-06-26 22:41:11 -04:00
Martin Konecny 4061059d3a CC-3938: Mono sources don't work for stream rebroadcasting
-fixed
2012-06-26 18:04:05 -04:00
Martin Konecny 43c4b943f2 CC-4017: Run airtime-playour process as root user
fixed world readable permissions when caching file
2012-06-26 17:50:26 -04:00
Martin Konecny a6eb74b1fd CC-4017: Run airtime-playour process as root user
-Done
2012-06-26 17:00:14 -04:00
Martin Konecny 7e7f8147da CC-4017: Run airtime-playour process as root user
-done
2012-06-26 14:55:19 -04:00
denise f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
Martin Konecny 27a6326c58 Merge branch '2.1.2' into 2.1.x
Conflicts:
	python_apps/pypo/pypofetch.py
2012-06-18 14:57:22 -04:00
denise ad978c7843 Merge branch '2.1.x' into devel 2012-06-18 11:23:42 -04:00
Martin Konecny ff35322ae9 CC-3988: Pypo: pypo doesn't update last schedule update time when pyp… 2012-06-17 23:24:15 -04:00
James 53af1928cf CC-3988: Pypo: pypo doesn't update last schedule update time when pypo pulls
schedule from the server

- fixed
2012-06-15 21:31:08 -04:00
denise 3f0a06ee2b CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done
2012-06-13 12:23:00 -04:00
denise f27fbc14f7 CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done (falls back to stream name)
2012-06-12 17:40:00 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined
-done
2012-06-12 17:08:36 -04:00
James 67c90ae3d6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-08 14:58:48 -04:00
James 0040f29fd2 CC-3953: Airtime will not auto query for new schedule after 1 hour if it
received new messages unrelated to schedule in the meantime

- fixed
2012-06-08 14:57:59 -04:00
Martin Konecny 2d78f58d42 CC-3947: Pypo log history is too brief
-increased history by 10x
2012-06-08 11:43:55 -04:00
Martin Konecny b128050cc2 CC-3889: Add line "export TERM=xterm" to pypo bash script startup file
-fixed
2012-06-05 13:07:59 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem
-fixed
2012-06-04 11:43:41 -04:00
Martin Konecny 3f481309b8 fix cache not being removed 2012-05-30 18:26:49 -04:00
Martin Konecny 8f214c2ae6 make sure pypo user can write /etc/airtime/liquidsoap.cfg 2012-05-29 11:23:42 -04:00
Martin Konecny 11b52905df CC-3892: Pypopush can be executed before Pypofile copying file
-temp solution
2012-05-29 11:10:48 -04:00
Martin Konecny d8ae8002d2 -make sure to autogenerate liquidsoap.cfg before liquidsoap starts 2012-05-28 18:48:40 -04:00
Martin Konecny b9c6eab39c make sure we explicitly need to tell Airtime services to start 2012-05-28 17:42:48 -04:00
Martin Konecny 41efd93628 pypo-initialize syntax cleanup 2012-05-28 14:28:07 -04:00
Martin Konecny 34523e8ec9 don't start liquidsoap if liquidsoap.cfg DNE 2012-05-28 14:27:44 -04:00
Martin Konecny fb715b135c regenerate liquidsoap.cfg if it doesn't exist 2012-05-28 14:27:30 -04:00
Martin Konecny 3d23d5102b make sure /usr/bin/airtime-liquidsoap symlink is gone 2012-05-28 13:36:49 -04:00
Martin Konecny 7299704ed0 remove airtime-liquidsoap symbolic link on uninstall 2012-05-23 12:38:37 -04:00
Martin Konecny dc789b808d CC-3852: Liquidsoap source.skip just skip current item in the queue instead of all the items in the queue
-replace queue.ignore with queue.remove
2012-05-18 18:11:51 -04:00
Martin Konecny b2c63544a9 CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-17 16:30:40 -04:00
Martin Konecny 105d752ada CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-16 17:12:47 -04:00
Martin Konecny 97df2ee6c7 CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-16 16:27:38 -04:00
denise 1629f41a8d CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
-fixed
2012-05-16 12:54:02 -04:00
Martin Konecny fd70768910 fix bug with pypo crashing 2012-05-16 10:28:30 -04:00
Martin Konecny 4fd7cd75e9 CC-3828: Pypo push crashed
-fixed
2012-05-15 17:35:44 -04:00
Martin Konecny cadf0acac7 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-fix utf-8 check
2012-05-14 19:53:07 -04:00
Martin Konecny c397a6f797 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-move utf-8 locale check to bash
2012-05-14 19:46:53 -04:00
Martin Konecny c1d33e9f72 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-syntax errors
2012-05-14 19:31:50 -04:00
Martin Konecny b79f02ab88 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder 2012-05-14 19:19:42 -04:00
Martin Konecny 08c20cff10 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-add UTF-8 header everywhere...
2012-05-14 16:09:49 -04:00
Naomi Aro 4165bf6289 CC-3812 : Recorder needs to sleep using microseconds 2012-05-11 18:50:56 +02:00
Martin Konecny 9bb8e2ad8e CC-3792: Record show's file cannot be saved
-fixed
2012-05-10 00:12:14 -04:00
Martin Konecny ee52d2e36e CC-3792: Record show's file cannot be saved
-fixed
2012-05-09 23:24:15 -04:00
Martin Konecny aeb9db95f0 CC-3794: Liquidsoap isn't in media monitor's path 2012-05-09 14:18:17 -04:00
Martin Konecny 22c1e67d58 CC-3779: Make Airtime more resilient to Ubuntu upgrades
undo this change for now
2012-05-07 18:12:59 -04:00
Martin Konecny 95a130bd90 CC-3779: Make Airtime more resilient to Ubuntu upgrades 2012-05-07 16:46:53 -04:00
Martin Konecny 8de8a0be33 replace many Popen calls with more modern subprocess.call 2012-05-07 15:46:49 -04:00
Martin Konecny 240756f98b CC-3767: Pypo push crashed 2012-05-04 19:50:16 -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 cf1e9e7615 configure locale for pypo 2012-04-27 17:25:12 -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 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
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 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 fe3dfb6b0c CC-3635: Pypo needs subsecond accuracy for start time
-Done
2012-04-12 17:21:42 -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
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 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 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
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 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 57f782d3c2 CC-3520: Change default password of monit
-fixed
2012-04-01 00:20:47 -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 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
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 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 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